Using a new version of SWIG

A few minor fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/wxPython/README.txt b/utils/wxPython/README.txt
index 02eb7b28d6fa4e1bade8b2e9a6fbc014ae9eb872..8c6c4919f86811f00d618007023c56a1ee3a30e0 100644 (file)
--- a/utils/wxPython/README.txt
+++ b/utils/wxPython/README.txt
@@ -45,6 +45,16 @@ Or you can send mail directly to the list using this address:
 
 ----------------------------------------------------------------------
 
 
 ----------------------------------------------------------------------
 

+What's new in 2.1b3
+--------------------
+
+Switched to using SWIG from CVS (see http://swig.cs.uchicago.edu/cvs.html)
+for some of the new features and such.  Also they have encorporated my
+patches so there is really no reason to stick with the current (very
+old) release...
+
+
+

 What's new in 2.1b2
 --------------------
 
 What's new in 2.1b2
 --------------------
 

diff --git a/utils/wxPython/src/controls.i b/utils/wxPython/src/controls.i
index 3d894ebd21ed4bde541354ec0caf209bbddbc3f2..86727f10e2b8e048474b7262132aa6e152a373ac 100644 (file)
--- a/utils/wxPython/src/controls.i
+++ b/utils/wxPython/src/controls.i
@@ -182,7 +182,7 @@ public:
     // TODO:    void SetClientData(const int n, char* data);
     void SetInsertionPoint(long pos);
     void SetInsertionPointEnd();
     // TODO:    void SetClientData(const int n, char* data);
     void SetInsertionPoint(long pos);
     void SetInsertionPointEnd();

-    //void SetSelection(int n, int select = TRUE);  **** Just use the one in wxChoice
+    void SetSelection(int n);

     %name(SetMark)void SetSelection(long from, long to);
     void SetValue(const wxString& text);
 };
     %name(SetMark)void SetSelection(long from, long to);
     void SetValue(const wxString& text);
 };


@@ -524,7 +524,13 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$

+// Revision 1.17  1999/08/18 07:41:28  RD
+// Using a new version of SWIG
+//
+// A few minor fixes
+//

 // Revision 1.16  1999/07/31 07:54:35  RD
 // Revision 1.16  1999/07/31 07:54:35  RD

+//

 // wxPython 2.1b1:
 //
 //     Added the missing wxWindow.GetUpdateRegion() method.
 // wxPython 2.1b1:
 //
 //     Added the missing wxWindow.GetUpdateRegion() method.

diff --git a/utils/wxPython/src/libptr.c b/utils/wxPython/src/libptr.c
deleted file mode 100644 (file)
index 5fad186..0000000
--- a/utils/wxPython/src/libptr.c
+++ /dev/null
@@ -1,321 +0,0 @@
-/*****************************************************************************
- * $Header$
- *
- * swigptr.swg
- *
- * This file contains supporting code for the SWIG run-time type checking
- * mechanism.  The following functions are available :
- *
- * SWIG_RegisterMapping(char *origtype, char *newtype, void *(*cast)(void *));
- *
- *      Registers a new type-mapping with the type-checker.  origtype is the
- *      original datatype and newtype is an equivalent type.  cast is optional
- *      pointer to a function to cast pointer values between types (this
- *      is typically used to cast pointers from derived classes to base classes in C++)
- *      
- * SWIG_MakePtr(char *buffer, void *ptr, char *typestring);
- *     
- *      Makes a pointer string from a pointer and typestring.  The result is returned
- *      in buffer which is assumed to hold enough space for the result.
- *
- * char * SWIG_GetPtr(char *buffer, void **ptr, char *type)
- *
- *      Gets a pointer value from a string.  If there is a type-mismatch, returns
- *      a character string to the received type.  On success, returns NULL.
- *
- *
- * You can remap these functions by making a file called "swigptr.swg" in
- * your the same directory as the interface file you are wrapping.
- *
- * These functions are normally declared static, but this file can be
- * can be used in a multi-module environment by redefining the symbol
- * SWIGSTATIC.
- *****************************************************************************/
-
-#include <stdlib.h>
-
-#ifdef SWIG_GLOBAL
-#ifdef __cplusplus
-#define SWIGSTATIC extern "C"
-#else
-#define SWIGSTATIC
-#endif
-#endif
-
-#ifndef SWIGSTATIC
-#define SWIGSTATIC static
-#endif
-
-
-/* SWIG pointer structure */
-
-typedef struct SwigPtrType {
-  char               *name;               /* Datatype name                  */
-  int                 len;                /* Length (used for optimization) */
-  void               *(*cast)(void *);    /* Pointer casting function       */
-  struct SwigPtrType *next;               /* Linked list pointer            */
-} SwigPtrType;
-
-/* Pointer cache structure */
-
-typedef struct {
-  int                 stat;               /* Status (valid) bit             */
-  SwigPtrType        *tp;                 /* Pointer to type structure      */
-  char                name[256];          /* Given datatype name            */
-  char                mapped[256];        /* Equivalent name                */
-} SwigCacheType;
-
-/* Some variables  */
-
-static int SwigPtrMax  = 64;           /* Max entries that can be currently held */
-                                       /* This value may be adjusted dynamically */
-static int SwigPtrN    = 0;            /* Current number of entries              */
-static int SwigPtrSort = 0;            /* Status flag indicating sort            */
-static int SwigStart[256];             /* Starting positions of types            */
-
-/* Pointer table */
-static SwigPtrType *SwigPtrTable = 0;  /* Table containing pointer equivalences  */
-
-/* Cached values */
-
-#define SWIG_CACHESIZE  8
-#define SWIG_CACHEMASK  0x7
-static SwigCacheType SwigCache[SWIG_CACHESIZE];  
-static int SwigCacheIndex = 0;
-static int SwigLastCache = 0;
-
-/* Sort comparison function */
-static int swigsort(const void *data1, const void *data2) {
-       SwigPtrType *d1 = (SwigPtrType *) data1;
-       SwigPtrType *d2 = (SwigPtrType *) data2;
-       return strcmp(d1->name,d2->name);
-}
-
-/* Binary Search function */
-static int swigcmp(const void *key, const void *data) {
-  char *k = (char *) key;
-  SwigPtrType *d = (SwigPtrType *) data;
-  return strncmp(k,d->name,d->len);
-}
-
-/* Register a new datatype with the type-checker */
-
-SWIGSTATIC 
-void SWIG_RegisterMapping(char *origtype, char *newtype, void *(*cast)(void *)) {
-
-  int i;
-  SwigPtrType *t = 0,*t1;
-
-  /* Allocate the pointer table if necessary */
-
-  if (!SwigPtrTable) {     
-    SwigPtrTable = (SwigPtrType *) malloc(SwigPtrMax*sizeof(SwigPtrType));
-    SwigPtrN = 0;
-  }
-  /* Grow the table */
-  if (SwigPtrN >= SwigPtrMax) {
-    SwigPtrMax = 2*SwigPtrMax;
-    SwigPtrTable = (SwigPtrType *) realloc((char *) SwigPtrTable,SwigPtrMax*sizeof(SwigPtrType));
-  }
-  for (i = 0; i < SwigPtrN; i++)
-    if (strcmp(SwigPtrTable[i].name,origtype) == 0) {
-      t = &SwigPtrTable[i];
-      break;
-    }
-  if (!t) {
-    t = &SwigPtrTable[SwigPtrN];
-    t->name = origtype;
-    t->len = strlen(t->name);
-    t->cast = 0;
-    t->next = 0;
-    SwigPtrN++;
-  }
-
-  /* Check for existing entry */
-
-  while (t->next) {
-    if ((strcmp(t->name,newtype) == 0)) {
-      if (cast) t->cast = cast;
-      return;
-    }
-    t = t->next;
-  }
-  
-  /* Now place entry (in sorted order) */
-
-  t1 = (SwigPtrType *) malloc(sizeof(SwigPtrType));
-  t1->name = newtype;
-  t1->len = strlen(t1->name);
-  t1->cast = cast;
-  t1->next = 0;            
-  t->next = t1;           
-  SwigPtrSort = 0;
-}
-
-/* Make a pointer value string */
-
-SWIGSTATIC 
-void SWIG_MakePtr(char *_c, const void *_ptr, char *type) {
-  static char _hex[16] =
-  {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-   'a', 'b', 'c', 'd', 'e', 'f'};
-  unsigned long _p, _s;
-  char _result[20], *_r;    /* Note : a 64-bit hex number = 16 digits */
-  _r = _result;
-  _p = (unsigned long) _ptr;
-  if (_p > 0) {
-    while (_p > 0) {
-      _s = _p & 0xf;
-      *(_r++) = _hex[_s];
-      _p = _p >> 4;
-    }
-    *_r = '_';
-    while (_r >= _result)
-      *(_c++) = *(_r--);
-  } else {
-    strcpy (_c, "NULL");
-  }
-  if (_ptr)
-    strcpy (_c, type);
-}
-
-/* Define for backwards compatibility */
-
-#define _swig_make_hex   SWIG_MakePtr 
-
-/* Function for getting a pointer value */
-
-SWIGSTATIC 
-char *SWIG_GetPtr(char *_c, void **ptr, char *_t)
-{
-  unsigned long _p;
-  char temp_type[256];
-  char *name;
-  int  i, len;
-  SwigPtrType *sp,*tp;
-  SwigCacheType *cache;
-  int  start, end;
-  _p = 0;
-
-  /* Pointer values must start with leading underscore */
-  if (*_c == '_') {
-      _c++;
-      /* Extract hex value from pointer */
-      while (*_c) {
-         if ((*_c >= '0') && (*_c <= '9'))
-           _p = (_p << 4) + (*_c - '0');
-         else if ((*_c >= 'a') && (*_c <= 'f'))
-           _p = (_p << 4) + ((*_c - 'a') + 10);
-         else
-           break;
-         _c++;
-      }
-
-      if (_t) {
-       if (strcmp(_t,_c)) { 
-         if (!SwigPtrSort) {
-           qsort((void *) SwigPtrTable, SwigPtrN, sizeof(SwigPtrType), swigsort); 
-           for (i = 0; i < 256; i++) {
-             SwigStart[i] = SwigPtrN;
-           }
-           for (i = SwigPtrN-1; i >= 0; i--) {
-             SwigStart[(int) (SwigPtrTable[i].name[1])] = i;
-           }
-           for (i = 255; i >= 1; i--) {
-             if (SwigStart[i-1] > SwigStart[i])
-               SwigStart[i-1] = SwigStart[i];
-           }
-           SwigPtrSort = 1;
-           for (i = 0; i < SWIG_CACHESIZE; i++)  
-             SwigCache[i].stat = 0;
-         }
-         
-         /* First check cache for matches.  Uses last cache value as starting point */
-         cache = &SwigCache[SwigLastCache];
-         for (i = 0; i < SWIG_CACHESIZE; i++) {
-           if (cache->stat) {
-             if (strcmp(_t,cache->name) == 0) {
-               if (strcmp(_c,cache->mapped) == 0) {
-                 cache->stat++;
-                 *ptr = (void *) _p;
-                 if (cache->tp->cast) *ptr = (*(cache->tp->cast))(*ptr);
-                 return (char *) 0;
-               }
-             }
-           }
-           SwigLastCache = (SwigLastCache+1) & SWIG_CACHEMASK;
-           if (!SwigLastCache) cache = SwigCache;
-           else cache++;
-         }
-         /* We have a type mismatch.  Will have to look through our type
-            mapping table to figure out whether or not we can accept this datatype */
-
-         start = SwigStart[(int) _t[1]];
-         end = SwigStart[(int) _t[1]+1];
-         sp = &SwigPtrTable[start];
-         while (start < end) {
-           if (swigcmp(_t,sp) == 0) break;
-           sp++;
-           start++;
-         }
-         if (start >= end) sp = 0;
-         /* Try to find a match for this */
-         if (sp) {
-           while (swigcmp(_t,sp) == 0) {
-             name = sp->name;
-             len = sp->len;
-             tp = sp->next;
-             /* Try to find entry for our given datatype */
-             while(tp) {
-               if (tp->len >= 255) {
-                 return _c;
-               }
-               strcpy(temp_type,tp->name);
-               strncat(temp_type,_t+len,255-tp->len);
-               if (strcmp(_c,temp_type) == 0) {
-                 
-                 strcpy(SwigCache[SwigCacheIndex].mapped,_c);
-                 strcpy(SwigCache[SwigCacheIndex].name,_t);
-                 SwigCache[SwigCacheIndex].stat = 1;
-                 SwigCache[SwigCacheIndex].tp = tp;
-                 SwigCacheIndex = SwigCacheIndex & SWIG_CACHEMASK;
-                 
-                 /* Get pointer value */
-                 *ptr = (void *) _p;
-                 if (tp->cast) *ptr = (*(tp->cast))(*ptr);
-                 return (char *) 0;
-               }
-               tp = tp->next;
-             }
-             sp++;
-             /* Hmmm. Didn't find it this time */
-           }
-         }
-         /* Didn't find any sort of match for this data.  
-            Get the pointer value and return the received type */
-         *ptr = (void *) _p;
-         return _c;
-       } else {
-         /* Found a match on the first try.  Return pointer value */
-         *ptr = (void *) _p;
-         return (char *) 0;
-       }
-      } else {
-       /* No type specified.  Good luck */
-       *ptr = (void *) _p;
-       return (char *) 0;
-      }
-  } else {
-    if (strcmp (_c, "NULL") == 0) {
-       *ptr = (void *) 0;
-       return (char *) 0;
-    }
-    *ptr = (void *) 0; 
-    return _c;
-  }
-}
-
-/* Compatibility mode */
-
-#define _swig_get_hex  SWIG_GetPtr
-

diff --git a/utils/wxPython/src/libpy.c b/utils/wxPython/src/libpy.c
index 5a00870ff8d112374ffc9df310e8719b136fc76d..59aa8fae2f8d2be4c41a2a234d643924fbbb70a3 100644 (file)
--- a/utils/wxPython/src/libpy.c
+++ b/utils/wxPython/src/libpy.c
@@ -2,58 +2,33 @@
  * $Header$
  * swig_lib/python/python.cfg
  *
  * $Header$
  * swig_lib/python/python.cfg
  *

- * This file contains coded needed to add variable linking to the
- * Python interpreter.   C variables are added as a new kind of Python
- * datatype.
- *
- * Also contains supporting code for building python under Windows
- * and things like that.
- *
- * $Log$
- * Revision 1.1  1999/08/04 05:25:58  RD
- * New Makefile/Setup files supporting multiple dynamic extension modules
- * for unix systems.
- *
- * Fixes for the wxGLCanvas demo to work around a strange bug in gtk.
- *
- * SWIG support routines now compiled separately instead of being bundled
- * in wx.cpp.
- *
+ * Contains variable linking and pointer type-checking code.

  ************************************************************************/
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 #include "Python.h"
  ************************************************************************/
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 #include "Python.h"

-#ifdef __cplusplus
-}
-#endif

 
 /* Definitions for Windows/Unix exporting */
 
 /* Definitions for Windows/Unix exporting */

-#if defined(__WIN32__)
+#if defined(_WIN32) || defined(__WIN32__)

 #   if defined(_MSC_VER)
 #   if defined(_MSC_VER)

-#      define SWIGEXPORT(a,b) __declspec(dllexport) a b
+#      define SWIGEXPORT(a) __declspec(dllexport) a

 #   else
 #      if defined(__BORLANDC__)
 #   else
 #      if defined(__BORLANDC__)

-#          define SWIGEXPORT(a,b) a _export b
+#          define SWIGEXPORT(a) a _export

 #      else
 #      else

-#          define SWIGEXPORT(a,b) a b
+#          define SWIGEXPORT(a) a

 #      endif
 #   endif
 #else
 #      endif
 #   endif
 #else

-#   define SWIGEXPORT(a,b) a b
+#   define SWIGEXPORT(a) a

 #endif
 
 #ifdef SWIG_GLOBAL
 #endif
 
 #ifdef SWIG_GLOBAL

-#ifdef __cplusplus
-#define SWIGSTATIC extern "C"
+#define SWIGSTATICRUNTIME(a) SWIGEXPORT(a)

 #else
 #else

-#define SWIGSTATIC
-#endif
-#endif
-
-#ifndef SWIGSTATIC
-#define SWIGSTATIC static
+#define SWIGSTATICRUNTIME(a) static a

 #endif
 
 typedef struct {
 #endif
 
 typedef struct {


@@ -171,7 +146,7 @@ statichere PyTypeObject varlinktype = {
 
 /* Create a variable linking object for use later */
 
 
 /* Create a variable linking object for use later */
 

-SWIGSTATIC PyObject *
+SWIGSTATICRUNTIME(PyObject *)

 SWIG_newvarlink(void)
 {
   swig_varlinkobject *result = 0;
 SWIG_newvarlink(void)
 {
   swig_varlinkobject *result = 0;


@@ -188,7 +163,7 @@ SWIG_newvarlink(void)
   return ((PyObject*) result);
 }
 
   return ((PyObject*) result);
 }
 

-SWIGSTATIC void
+SWIGSTATICRUNTIME(void)

 SWIG_addvarlink(PyObject *p, char *name,
           PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p))
 {
 SWIG_addvarlink(PyObject *p, char *name,
           PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p))
 {


@@ -212,5 +187,227 @@ SWIG_addvarlink(PyObject *p, char *name,
   v->vars[v->nvars] = 0;
 }
 
   v->vars[v->nvars] = 0;
 }
 

+/* -----------------------------------------------------------------------------
+ * Pointer type-checking
+ * ----------------------------------------------------------------------------- */
+
+/* SWIG pointer structure */
+typedef struct SwigPtrType {
+  char               *name;               /* Datatype name                  */
+  int                 len;                /* Length (used for optimization) */
+  void               *(*cast)(void *);    /* Pointer casting function       */
+  struct SwigPtrType *next;               /* Linked list pointer            */
+} SwigPtrType;
+
+/* Pointer cache structure */
+typedef struct {
+  int                 stat;               /* Status (valid) bit             */
+  SwigPtrType        *tp;                 /* Pointer to type structure      */
+  char                name[256];          /* Given datatype name            */
+  char                mapped[256];        /* Equivalent name                */
+} SwigCacheType;
+
+static int SwigPtrMax  = 64;           /* Max entries that can be currently held */
+static int SwigPtrN    = 0;            /* Current number of entries              */
+static int SwigPtrSort = 0;            /* Status flag indicating sort            */
+static int SwigStart[256];             /* Starting positions of types            */
+static SwigPtrType *SwigPtrTable = 0;  /* Table containing pointer equivalences  */
+
+/* Cached values */
+#define SWIG_CACHESIZE  8
+#define SWIG_CACHEMASK  0x7
+static SwigCacheType SwigCache[SWIG_CACHESIZE];  
+static int SwigCacheIndex = 0;
+static int SwigLastCache = 0;
+
+/* Sort comparison function */
+static int swigsort(const void *data1, const void *data2) {
+       SwigPtrType *d1 = (SwigPtrType *) data1;
+       SwigPtrType *d2 = (SwigPtrType *) data2;
+       return strcmp(d1->name,d2->name);
+}
+
+/* Register a new datatype with the type-checker */
+SWIGSTATICRUNTIME(void) 
+SWIG_RegisterMapping(char *origtype, char *newtype, void *(*cast)(void *)) {
+  int i;
+  SwigPtrType *t = 0,*t1;
+
+  /* Allocate the pointer table if necessary */
+  if (!SwigPtrTable) {     
+    SwigPtrTable = (SwigPtrType *) malloc(SwigPtrMax*sizeof(SwigPtrType));
+  }
+
+  /* Grow the table */
+  if (SwigPtrN >= SwigPtrMax) {
+    SwigPtrMax = 2*SwigPtrMax;
+    SwigPtrTable = (SwigPtrType *) realloc((char *) SwigPtrTable,SwigPtrMax*sizeof(SwigPtrType));
+  }
+  for (i = 0; i < SwigPtrN; i++) {
+    if (strcmp(SwigPtrTable[i].name,origtype) == 0) {
+      t = &SwigPtrTable[i];
+      break;
+    }
+  }
+  if (!t) {
+    t = &SwigPtrTable[SwigPtrN++];
+    t->name = origtype;
+    t->len = strlen(t->name);
+    t->cast = 0;
+    t->next = 0;
+  }
+
+  /* Check for existing entries */
+  while (t->next) {
+    if ((strcmp(t->name,newtype) == 0)) {
+      if (cast) t->cast = cast;
+      return;
+    }
+    t = t->next;
+  }
+  t1 = (SwigPtrType *) malloc(sizeof(SwigPtrType));
+  t1->name = newtype;
+  t1->len = strlen(t1->name);
+  t1->cast = cast;
+  t1->next = 0;            
+  t->next = t1;           
+  SwigPtrSort = 0;
+}
+
+/* Make a pointer value string */
+SWIGSTATICRUNTIME(void) 
+SWIG_MakePtr(char *c, const void *ptr, char *type) {
+  static char hex[17] = "0123456789abcdef";
+  unsigned long p, s;
+  char result[24], *r; 
+  r = result;
+  p = (unsigned long) ptr;
+  if (p > 0) {
+    while (p > 0) {
+      s = p & 0xf;
+      *(r++) = hex[s];
+      p = p >> 4;
+    }
+    *r = '_';
+    while (r >= result)
+      *(c++) = *(r--);
+    strcpy (c, type);
+  } else {
+    strcpy (c, "NULL");
+  }
+}
+
+/* Function for getting a pointer value */
+SWIGSTATICRUNTIME(char *) 
+SWIG_GetPtr(char *c, void **ptr, char *t)
+{
+  unsigned long p;
+  char temp_type[256], *name;
+  int  i, len, start, end;
+  SwigPtrType *sp,*tp;
+  SwigCacheType *cache;
+  register int d;
+
+  p = 0;
+  /* Pointer values must start with leading underscore */
+  if (*c != '_') {
+    *ptr = (void *) 0;
+    if (strcmp(c,"NULL") == 0) return (char *) 0;
+    else c;
+  }
+  c++;
+  /* Extract hex value from pointer */
+  while (d = *c) {
+    if ((d >= '0') && (d <= '9'))
+      p = (p << 4) + (d - '0');
+    else if ((d >= 'a') && (d <= 'f'))
+      p = (p << 4) + (d - ('a'-10));
+    else
+      break; 
+    c++;
+  }
+  *ptr = (void *) p;
+  if ((!t) || (strcmp(t,c)==0)) return (char *) 0;
+
+  if (!SwigPtrSort) {
+    qsort((void *) SwigPtrTable, SwigPtrN, sizeof(SwigPtrType), swigsort); 
+    for (i = 0; i < 256; i++) SwigStart[i] = SwigPtrN;
+    for (i = SwigPtrN-1; i >= 0; i--) SwigStart[(int) (SwigPtrTable[i].name[1])] = i;
+    for (i = 255; i >= 1; i--) {
+      if (SwigStart[i-1] > SwigStart[i])
+       SwigStart[i-1] = SwigStart[i];
+    }
+    SwigPtrSort = 1;
+    for (i = 0; i < SWIG_CACHESIZE; i++) SwigCache[i].stat = 0;
+  }
+  /* First check cache for matches.  Uses last cache value as starting point */
+  cache = &SwigCache[SwigLastCache];
+  for (i = 0; i < SWIG_CACHESIZE; i++) {
+    if (cache->stat && (strcmp(t,cache->name) == 0) && (strcmp(c,cache->mapped) == 0)) {
+      cache->stat++;
+      if (cache->tp->cast) *ptr = (*(cache->tp->cast))(*ptr);
+      return (char *) 0;
+    }
+    SwigLastCache = (SwigLastCache+1) & SWIG_CACHEMASK;
+    if (!SwigLastCache) cache = SwigCache;
+    else cache++;
+  }
+  /* Type mismatch.  Look through type-mapping table */
+  start = SwigStart[(int) t[1]];
+  end = SwigStart[(int) t[1]+1];
+  sp = &SwigPtrTable[start];
+
+  /* Try to find a match */
+  while (start <= end) {
+    if (strncmp(t,sp->name,sp->len) == 0) {
+      name = sp->name;
+      len = sp->len;
+      tp = sp->next;
+      /* Try to find entry for our given datatype */
+      while(tp) {
+       if (tp->len >= 255) {
+         return c;
+       }
+       strcpy(temp_type,tp->name);
+       strncat(temp_type,t+len,255-tp->len);
+       if (strcmp(c,temp_type) == 0) {
+         strcpy(SwigCache[SwigCacheIndex].mapped,c);
+         strcpy(SwigCache[SwigCacheIndex].name,t);
+         SwigCache[SwigCacheIndex].stat = 1;
+         SwigCache[SwigCacheIndex].tp = tp;
+         SwigCacheIndex = SwigCacheIndex & SWIG_CACHEMASK;
+         /* Get pointer value */
+         *ptr = (void *) p;
+         if (tp->cast) *ptr = (*(tp->cast))(*ptr);
+         return (char *) 0;
+       }
+       tp = tp->next;
+      }
+    }
+    sp++;
+    start++;
+  }
+  return c;
+} 
+
+/* New object-based GetPointer function. This uses the Python abstract
+ * object interface to automatically dereference the 'this' attribute
+ * of shadow objects. */
+
+SWIGSTATICRUNTIME(char *)
+SWIG_GetPtrObj(PyObject *obj, void **ptr, char *type) {
+  PyObject *sobj = obj;
+  char     *str;
+  if (!PyString_Check(obj)) {
+    sobj = PyObject_GetAttrString(obj,"this");
+    if (!sobj) return "";
+  }
+  str = PyString_AsString(sobj);
+  return SWIG_GetPtr(str,ptr,type);
+}
+
+#ifdef __cplusplus
+}
+#endif

 
 
 
 

diff --git a/utils/wxPython/src/makefile.vc b/utils/wxPython/src/makefile.vc
index 0b7aaa20e3471a825aefad66109b9c7c346c1218..4835d5064825961f16688eb9662f99400b298d24 100644 (file)
--- a/utils/wxPython/src/makefile.vc
+++ b/utils/wxPython/src/makefile.vc
@@ -10,7 +10,7 @@
 # Copyright:    (c) 1998 by Total Control Software
 # Licence:      wxWindows license
 #----------------------------------------------------------------------------
 # Copyright:    (c) 1998 by Total Control Software
 # Licence:      wxWindows license
 #----------------------------------------------------------------------------

-VERSION=2.1b2
+VERSION=2.1b3

 
 # Set WXDIR to the root wxWindows directory for your system
 WXDIR = $(WXWIN)
 
 # Set WXDIR to the root wxWindows directory for your system
 WXDIR = $(WXWIN)


@@ -81,7 +81,7 @@ GENCODEDIR=msw
 
 TARGET = wxc
 
 
 TARGET = wxc
 

-OBJECTS = helpers.obj    libptr.obj     libpy.obj      \
+OBJECTS = helpers.obj    libpy.obj      \

           wx.obj         windows.obj    events.obj     \
          misc.obj       gdi.obj        mdi.obj        controls.obj   \
          controls2.obj  windows2.obj   cmndlgs.obj    stattool.obj   \
           wx.obj         windows.obj    events.obj     \
          misc.obj       gdi.obj        mdi.obj        controls.obj   \
          controls2.obj  windows2.obj   cmndlgs.obj    stattool.obj   \

diff --git a/utils/wxPython/src/msw/cmndlgs.cpp b/utils/wxPython/src/msw/cmndlgs.cpp
index f5a35172ff7afc13de6859b670dfffeecf552fe2..c7ab22e788b0ef350440b4a0ef7f07217dbf1249 100644 (file)
--- a/utils/wxPython/src/msw/cmndlgs.cpp
+++ b/utils/wxPython/src/msw/cmndlgs.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)

- * Version 1.1 (Patch 5)
+ * Version 1.1 (Patch 6)

  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.


@@ -24,16 +24,16 @@
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)

-#      define SWIGEXPORT(a,b) __declspec(dllexport) a b
+#      define SWIGEXPORT(a) __declspec(dllexport) a

 #   else
 #      if defined(__BORLANDC__)
 #   else
 #      if defined(__BORLANDC__)

-#          define SWIGEXPORT(a,b) a _export b
+#          define SWIGEXPORT(a) a _export 

 #      else
 #      else

-#          define SWIGEXPORT(a,b) a b
+#          define SWIGEXPORT(a) a 

 #      endif
 #   endif
 #else
 #      endif
 #   endif
 #else

-#   define SWIGEXPORT(a,b) a b
+#   define SWIGEXPORT(a) a 

 #endif
 
 #ifdef __cplusplus
 #endif
 
 #ifdef __cplusplus


@@ -43,12 +43,12 @@ extern "C" {
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);

+extern char *SWIG_GetPtrObj(PyObject *, void **, char *);

 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif
 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif

-

 #define SWIG_init    initcmndlgsc
 
 #define SWIG_name    "cmndlgsc"
 #define SWIG_init    initcmndlgsc
 
 #define SWIG_name    "cmndlgsc"


@@ -61,12 +61,13 @@ extern PyObject *SWIG_newvarlink(void);
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;

-    if (!target) {
+    PyObject*   o3;
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);
         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);


@@ -83,23 +84,23 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
     PyObject*   o3;
 
     PyObject*   o2;
     PyObject*   o3;
 

-    if (!target) {
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }
         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }

-        o3 = PyTuple_New(1);
-        PyTuple_SetItem(o3, 0, o);
+        o3 = PyTuple_New(1);            
+        PyTuple_SetItem(o3, 0, o);      

 
         o2 = target;
 
         o2 = target;

-        target = PySequence_Concat(o2, o3);
-        Py_DECREF(o2);
+        target = PySequence_Concat(o2, o3); 
+        Py_DECREF(o2);                      

         Py_DECREF(o3);
     }
     return target;
         Py_DECREF(o3);
     }
     return target;


@@ -117,6 +118,9 @@ extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
 
 
 static char* wxStringErrorMsg = "string type is required for parameter";
 
 
 static char* wxStringErrorMsg = "string type is required for parameter";

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

 #define new_wxColourData() (new wxColourData())
 static PyObject *_wrap_new_wxColourData(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define new_wxColourData() (new wxColourData())
 static PyObject *_wrap_new_wxColourData(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -131,8 +135,13 @@ static PyObject *_wrap_new_wxColourData(PyObject *self, PyObject *args) {
         _result = (wxColourData *)new_wxColourData();
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxColourData *)new_wxColourData();
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxColourData_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColourData_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -140,13 +149,14 @@ static PyObject *_wrap_new_wxColourData(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxColourData(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxColourData * _arg0;
 static PyObject *_wrap_delete_wxColourData(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxColourData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:delete_wxColourData",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxColourData",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColourData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColourData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxColourData. Expected _wxColourData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxColourData. Expected _wxColourData_p.");
         return NULL;
         }


@@ -166,13 +176,14 @@ static PyObject *_wrap_wxColourData_GetChooseFull(PyObject *self, PyObject *args
     PyObject * _resultobj;
     bool  _result;
     wxColourData * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxColourData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxColourData_GetChooseFull",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxColourData_GetChooseFull",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColourData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColourData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColourData_GetChooseFull. Expected _wxColourData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColourData_GetChooseFull. Expected _wxColourData_p.");
         return NULL;
         }


@@ -191,14 +202,15 @@ static PyObject *_wrap_wxColourData_GetColour(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxColour * _result;
     wxColourData * _arg0;
     PyObject * _resultobj;
     wxColour * _result;
     wxColourData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxColourData_GetColour",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxColourData_GetColour",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColourData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColourData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColourData_GetColour. Expected _wxColourData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColourData_GetColour. Expected _wxColourData_p.");
         return NULL;
         }


@@ -209,8 +221,13 @@ static PyObject *_wrap_wxColourData_GetColour(PyObject *self, PyObject *args) {
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -220,14 +237,15 @@ static PyObject *_wrap_wxColourData_GetCustomColour(PyObject *self, PyObject *ar
     wxColour * _result;
     wxColourData * _arg0;
     int  _arg1;
     wxColour * _result;
     wxColourData * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxColourData_GetCustomColour",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxColourData_GetCustomColour",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColourData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColourData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColourData_GetCustomColour. Expected _wxColourData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColourData_GetCustomColour. Expected _wxColourData_p.");
         return NULL;
         }


@@ -247,13 +265,14 @@ static PyObject *_wrap_wxColourData_SetChooseFull(PyObject *self, PyObject *args
     PyObject * _resultobj;
     wxColourData * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxColourData * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxColourData_SetChooseFull",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxColourData_SetChooseFull",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColourData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColourData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColourData_SetChooseFull. Expected _wxColourData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColourData_SetChooseFull. Expected _wxColourData_p.");
         return NULL;
         }


@@ -273,20 +292,22 @@ static PyObject *_wrap_wxColourData_SetColour(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxColourData * _arg0;
     wxColour * _arg1;
     PyObject * _resultobj;
     wxColourData * _arg0;
     wxColour * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxColourData_SetColour",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxColourData_SetColour",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColourData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColourData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColourData_SetColour. Expected _wxColourData_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColourData_SetColour. Expected _wxColourData_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxColour_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxColourData_SetColour. Expected _wxColour_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxColourData_SetColour. Expected _wxColour_p.");
         return NULL;
         }


@@ -307,20 +328,22 @@ static PyObject *_wrap_wxColourData_SetCustomColour(PyObject *self, PyObject *ar
     wxColourData * _arg0;
     int  _arg1;
     wxColour * _arg2;
     wxColourData * _arg0;
     int  _arg1;
     wxColour * _arg2;

-    char * _argc0 = 0;
-    char * _argc2 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sis:wxColourData_SetCustomColour",&_argc0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"OiO:wxColourData_SetCustomColour",&_argo0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColourData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColourData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColourData_SetCustomColour. Expected _wxColourData_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColourData_SetCustomColour. Expected _wxColourData_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxColour_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxColourData_SetCustomColour. Expected _wxColour_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxColourData_SetCustomColour. Expected _wxColour_p.");
         return NULL;
         }


@@ -372,22 +395,24 @@ static PyObject *_wrap_new_wxColourDialog(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxColourDialog * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxColourDialog * _result;
     wxWindow * _arg0;

-    wxColourData * _arg1 = NULL;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    wxColourData * _arg1 = (wxColourData *) NULL;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|s:new_wxColourDialog",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"O|O:new_wxColourDialog",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxColourDialog. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxColourDialog. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxColourData_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColourData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of new_wxColourDialog. Expected _wxColourData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of new_wxColourDialog. Expected _wxColourData_p.");
         return NULL;
         }


@@ -397,8 +422,13 @@ static PyObject *_wrap_new_wxColourDialog(PyObject *self, PyObject *args) {
         _result = (wxColourDialog *)new_wxColourDialog(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxColourDialog *)new_wxColourDialog(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxColourDialog_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColourDialog_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -407,14 +437,15 @@ static PyObject *_wrap_wxColourDialog_GetColourData(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     wxColourData * _result;
     wxColourDialog * _arg0;
     PyObject * _resultobj;
     wxColourData * _result;
     wxColourDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxColourDialog_GetColourData",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxColourDialog_GetColourData",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColourDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColourDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColourDialog_GetColourData. Expected _wxColourDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColourDialog_GetColourData. Expected _wxColourDialog_p.");
         return NULL;
         }


@@ -425,8 +456,13 @@ static PyObject *_wrap_wxColourDialog_GetColourData(PyObject *self, PyObject *ar
     _result = (wxColourData *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxColourData *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxColourData_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColourData_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -435,13 +471,14 @@ static PyObject *_wrap_wxColourDialog_ShowModal(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     int  _result;
     wxColourDialog * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxColourDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxColourDialog_ShowModal",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxColourDialog_ShowModal",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColourDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColourDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColourDialog_ShowModal. Expected _wxColourDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColourDialog_ShowModal. Expected _wxColourDialog_p.");
         return NULL;
         }


@@ -492,25 +529,27 @@ static PyObject *_wrap_new_wxDirDialog(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDirDialog * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxDirDialog * _result;
     wxWindow * _arg0;

-    char * _arg1 = "Choose a directory";
-    char * _arg2 = "";
-    long  _arg3 = 0;
-    wxPoint * _arg4 = &wxPyDefaultPosition;
-    char * _argc0 = 0;
-    char * _argc4 = 0;
+    char * _arg1 = (char *) "Choose a directory";
+    char * _arg2 = (char *) "";
+    long  _arg3 = (long ) 0;
+    wxPoint * _arg4 = (wxPoint *) &wxPyDefaultPosition;
+    PyObject * _argo0 = 0;
+    PyObject * _argo4 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|ssls:new_wxDirDialog",&_argc0,&_arg1,&_arg2,&_arg3,&_argc4)) 
+    if(!PyArg_ParseTuple(args,"O|sslO:new_wxDirDialog",&_argo0,&_arg1,&_arg2,&_arg3,&_argo4)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxDirDialog. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxDirDialog. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_wxPoint_p")) {
+    if (_argo4) {
+        if (_argo4 == Py_None) { _arg4 = NULL; }
+        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxDirDialog. Expected _wxPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxDirDialog. Expected _wxPoint_p.");
         return NULL;
         }


@@ -520,8 +559,13 @@ static PyObject *_wrap_new_wxDirDialog(PyObject *self, PyObject *args) {
         _result = (wxDirDialog *)new_wxDirDialog(_arg0,_arg1,_arg2,_arg3,*_arg4);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxDirDialog *)new_wxDirDialog(_arg0,_arg1,_arg2,_arg3,*_arg4);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxDirDialog_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxDirDialog_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -530,13 +574,14 @@ static PyObject *_wrap_wxDirDialog_GetPath(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxDirDialog * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxDirDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDirDialog_GetPath",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDirDialog_GetPath",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDirDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDirDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDirDialog_GetPath. Expected _wxDirDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDirDialog_GetPath. Expected _wxDirDialog_p.");
         return NULL;
         }


@@ -560,13 +605,14 @@ static PyObject *_wrap_wxDirDialog_GetMessage(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxDirDialog * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxDirDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDirDialog_GetMessage",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDirDialog_GetMessage",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDirDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDirDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDirDialog_GetMessage. Expected _wxDirDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDirDialog_GetMessage. Expected _wxDirDialog_p.");
         return NULL;
         }


@@ -590,13 +636,14 @@ static PyObject *_wrap_wxDirDialog_GetStyle(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxDirDialog * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxDirDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDirDialog_GetStyle",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDirDialog_GetStyle",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDirDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDirDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDirDialog_GetStyle. Expected _wxDirDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDirDialog_GetStyle. Expected _wxDirDialog_p.");
         return NULL;
         }


@@ -615,14 +662,15 @@ static PyObject *_wrap_wxDirDialog_SetMessage(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDirDialog * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxDirDialog * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxDirDialog_SetMessage",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxDirDialog_SetMessage",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDirDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDirDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDirDialog_SetMessage. Expected _wxDirDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDirDialog_SetMessage. Expected _wxDirDialog_p.");
         return NULL;
         }


@@ -653,14 +701,15 @@ static PyObject *_wrap_wxDirDialog_SetPath(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDirDialog * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxDirDialog * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxDirDialog_SetPath",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxDirDialog_SetPath",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDirDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDirDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDirDialog_SetPath. Expected _wxDirDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDirDialog_SetPath. Expected _wxDirDialog_p.");
         return NULL;
         }


@@ -691,13 +740,14 @@ static PyObject *_wrap_wxDirDialog_ShowModal(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxDirDialog * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxDirDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDirDialog_ShowModal",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDirDialog_ShowModal",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDirDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDirDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDirDialog_ShowModal. Expected _wxDirDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDirDialog_ShowModal. Expected _wxDirDialog_p.");
         return NULL;
         }


@@ -748,27 +798,29 @@ static PyObject *_wrap_new_wxFileDialog(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFileDialog * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxFileDialog * _result;
     wxWindow * _arg0;

-    char * _arg1 = "Choose a file";
-    char * _arg2 = "";
-    char * _arg3 = "";
-    char * _arg4 = "*.*";
-    long  _arg5 = 0;
-    wxPoint * _arg6 = &wxPyDefaultPosition;
-    char * _argc0 = 0;
-    char * _argc6 = 0;
+    char * _arg1 = (char *) "Choose a file";
+    char * _arg2 = (char *) "";
+    char * _arg3 = (char *) "";
+    char * _arg4 = (char *) "*.*";
+    long  _arg5 = (long ) 0;
+    wxPoint * _arg6 = (wxPoint *) &wxPyDefaultPosition;
+    PyObject * _argo0 = 0;
+    PyObject * _argo6 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|ssssls:new_wxFileDialog",&_argc0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_argc6)) 
+    if(!PyArg_ParseTuple(args,"O|sssslO:new_wxFileDialog",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_argo6)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxFileDialog. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxFileDialog. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc6) {
-        if (SWIG_GetPtr(_argc6,(void **) &_arg6,"_wxPoint_p")) {
+    if (_argo6) {
+        if (_argo6 == Py_None) { _arg6 = NULL; }
+        else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of new_wxFileDialog. Expected _wxPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of new_wxFileDialog. Expected _wxPoint_p.");
         return NULL;
         }


@@ -778,8 +830,13 @@ static PyObject *_wrap_new_wxFileDialog(PyObject *self, PyObject *args) {
         _result = (wxFileDialog *)new_wxFileDialog(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,*_arg6);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxFileDialog *)new_wxFileDialog(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,*_arg6);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxFileDialog_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxFileDialog_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -788,13 +845,14 @@ static PyObject *_wrap_wxFileDialog_GetDirectory(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxString * _result;
     wxFileDialog * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxFileDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxFileDialog_GetDirectory",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxFileDialog_GetDirectory",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFileDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetDirectory. Expected _wxFileDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetDirectory. Expected _wxFileDialog_p.");
         return NULL;
         }


@@ -818,13 +876,14 @@ static PyObject *_wrap_wxFileDialog_GetFilename(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxString * _result;
     wxFileDialog * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxFileDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxFileDialog_GetFilename",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxFileDialog_GetFilename",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFileDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetFilename. Expected _wxFileDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetFilename. Expected _wxFileDialog_p.");
         return NULL;
         }


@@ -848,13 +907,14 @@ static PyObject *_wrap_wxFileDialog_GetFilterIndex(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     int  _result;
     wxFileDialog * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxFileDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxFileDialog_GetFilterIndex",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxFileDialog_GetFilterIndex",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFileDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetFilterIndex. Expected _wxFileDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetFilterIndex. Expected _wxFileDialog_p.");
         return NULL;
         }


@@ -873,13 +933,14 @@ static PyObject *_wrap_wxFileDialog_GetMessage(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxFileDialog * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxFileDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxFileDialog_GetMessage",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxFileDialog_GetMessage",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFileDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetMessage. Expected _wxFileDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetMessage. Expected _wxFileDialog_p.");
         return NULL;
         }


@@ -903,13 +964,14 @@ static PyObject *_wrap_wxFileDialog_GetPath(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxFileDialog * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxFileDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxFileDialog_GetPath",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxFileDialog_GetPath",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFileDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetPath. Expected _wxFileDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetPath. Expected _wxFileDialog_p.");
         return NULL;
         }


@@ -933,13 +995,14 @@ static PyObject *_wrap_wxFileDialog_GetStyle(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxFileDialog * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxFileDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxFileDialog_GetStyle",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxFileDialog_GetStyle",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFileDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetStyle. Expected _wxFileDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetStyle. Expected _wxFileDialog_p.");
         return NULL;
         }


@@ -958,13 +1021,14 @@ static PyObject *_wrap_wxFileDialog_GetWildcard(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxString * _result;
     wxFileDialog * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxFileDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxFileDialog_GetWildcard",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxFileDialog_GetWildcard",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFileDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetWildcard. Expected _wxFileDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetWildcard. Expected _wxFileDialog_p.");
         return NULL;
         }


@@ -988,14 +1052,15 @@ static PyObject *_wrap_wxFileDialog_SetDirectory(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxFileDialog * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxFileDialog * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxFileDialog_SetDirectory",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxFileDialog_SetDirectory",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFileDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetDirectory. Expected _wxFileDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetDirectory. Expected _wxFileDialog_p.");
         return NULL;
         }


@@ -1026,14 +1091,15 @@ static PyObject *_wrap_wxFileDialog_SetFilename(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxFileDialog * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxFileDialog * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxFileDialog_SetFilename",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxFileDialog_SetFilename",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFileDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetFilename. Expected _wxFileDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetFilename. Expected _wxFileDialog_p.");
         return NULL;
         }


@@ -1064,13 +1130,14 @@ static PyObject *_wrap_wxFileDialog_SetFilterIndex(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     wxFileDialog * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxFileDialog * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxFileDialog_SetFilterIndex",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxFileDialog_SetFilterIndex",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFileDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetFilterIndex. Expected _wxFileDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetFilterIndex. Expected _wxFileDialog_p.");
         return NULL;
         }


@@ -1090,14 +1157,15 @@ static PyObject *_wrap_wxFileDialog_SetMessage(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFileDialog * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxFileDialog * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxFileDialog_SetMessage",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxFileDialog_SetMessage",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFileDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetMessage. Expected _wxFileDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetMessage. Expected _wxFileDialog_p.");
         return NULL;
         }


@@ -1128,14 +1196,15 @@ static PyObject *_wrap_wxFileDialog_SetPath(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFileDialog * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxFileDialog * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxFileDialog_SetPath",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxFileDialog_SetPath",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFileDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetPath. Expected _wxFileDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetPath. Expected _wxFileDialog_p.");
         return NULL;
         }


@@ -1166,13 +1235,14 @@ static PyObject *_wrap_wxFileDialog_SetStyle(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFileDialog * _arg0;
     long  _arg1;
     PyObject * _resultobj;
     wxFileDialog * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxFileDialog_SetStyle",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxFileDialog_SetStyle",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFileDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetStyle. Expected _wxFileDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetStyle. Expected _wxFileDialog_p.");
         return NULL;
         }


@@ -1192,14 +1262,15 @@ static PyObject *_wrap_wxFileDialog_SetWildcard(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxFileDialog * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxFileDialog * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxFileDialog_SetWildcard",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxFileDialog_SetWildcard",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFileDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetWildcard. Expected _wxFileDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetWildcard. Expected _wxFileDialog_p.");
         return NULL;
         }


@@ -1230,13 +1301,14 @@ static PyObject *_wrap_wxFileDialog_ShowModal(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxFileDialog * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxFileDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxFileDialog_ShowModal",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxFileDialog_ShowModal",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFileDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_ShowModal. Expected _wxFileDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_ShowModal. Expected _wxFileDialog_p.");
         return NULL;
         }


@@ -1295,20 +1367,21 @@ static PyObject *_wrap_new_wxSingleChoiceDialog(PyObject *self, PyObject *args)
     wxString * _arg2;
     int  _arg3;
     wxString * _arg4;
     wxString * _arg2;
     int  _arg3;
     wxString * _arg4;

-    long  _arg5 = (wxOK)|(wxCANCEL)|(wxCENTRE);
-    wxPoint * _arg6 = &wxPyDefaultPosition;
-    char * _argc0 = 0;
+    long  _arg5 = (long ) wxOK|wxCANCEL|wxCENTRE;
+    wxPoint * _arg6 = (wxPoint *) &wxPyDefaultPosition;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;
     PyObject * _obj4 = 0;
     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;
     PyObject * _obj4 = 0;

-    char * _argc6 = 0;
+    PyObject * _argo6 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sOOO|ls:new_wxSingleChoiceDialog",&_argc0,&_obj1,&_obj2,&_obj4,&_arg5,&_argc6)) 
+    if(!PyArg_ParseTuple(args,"OOOO|lO:new_wxSingleChoiceDialog",&_argo0,&_obj1,&_obj2,&_obj4,&_arg5,&_argo6)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxSingleChoiceDialog. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxSingleChoiceDialog. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1334,8 +1407,9 @@ static PyObject *_wrap_new_wxSingleChoiceDialog(PyObject *self, PyObject *args)
         return NULL;
     }
 }
         return NULL;
     }
 }

-    if (_argc6) {
-        if (SWIG_GetPtr(_argc6,(void **) &_arg6,"_wxPoint_p")) {
+    if (_argo6) {
+        if (_argo6 == Py_None) { _arg6 = NULL; }
+        else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of new_wxSingleChoiceDialog. Expected _wxPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of new_wxSingleChoiceDialog. Expected _wxPoint_p.");
         return NULL;
         }


@@ -1353,8 +1427,13 @@ static PyObject *_wrap_new_wxSingleChoiceDialog(PyObject *self, PyObject *args)
         _result = (wxSingleChoiceDialog *)new_wxSingleChoiceDialog(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxSingleChoiceDialog *)new_wxSingleChoiceDialog(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxSingleChoiceDialog_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxSingleChoiceDialog_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     if (_obj1)
         delete _arg1;
 {
     if (_obj1)
         delete _arg1;


@@ -1374,13 +1453,14 @@ static PyObject *_wrap_wxSingleChoiceDialog_GetSelection(PyObject *self, PyObjec
     PyObject * _resultobj;
     int  _result;
     wxSingleChoiceDialog * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxSingleChoiceDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSingleChoiceDialog_GetSelection",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSingleChoiceDialog_GetSelection",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSingleChoiceDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSingleChoiceDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSingleChoiceDialog_GetSelection. Expected _wxSingleChoiceDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSingleChoiceDialog_GetSelection. Expected _wxSingleChoiceDialog_p.");
         return NULL;
         }


@@ -1399,13 +1479,14 @@ static PyObject *_wrap_wxSingleChoiceDialog_GetStringSelection(PyObject *self, P
     PyObject * _resultobj;
     wxString * _result;
     wxSingleChoiceDialog * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxSingleChoiceDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSingleChoiceDialog_GetStringSelection",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSingleChoiceDialog_GetStringSelection",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSingleChoiceDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSingleChoiceDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSingleChoiceDialog_GetStringSelection. Expected _wxSingleChoiceDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSingleChoiceDialog_GetStringSelection. Expected _wxSingleChoiceDialog_p.");
         return NULL;
         }


@@ -1429,13 +1510,14 @@ static PyObject *_wrap_wxSingleChoiceDialog_SetSelection(PyObject *self, PyObjec
     PyObject * _resultobj;
     wxSingleChoiceDialog * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxSingleChoiceDialog * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxSingleChoiceDialog_SetSelection",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxSingleChoiceDialog_SetSelection",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSingleChoiceDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSingleChoiceDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSingleChoiceDialog_SetSelection. Expected _wxSingleChoiceDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSingleChoiceDialog_SetSelection. Expected _wxSingleChoiceDialog_p.");
         return NULL;
         }


@@ -1455,13 +1537,14 @@ static PyObject *_wrap_wxSingleChoiceDialog_ShowModal(PyObject *self, PyObject *
     PyObject * _resultobj;
     int  _result;
     wxSingleChoiceDialog * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxSingleChoiceDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSingleChoiceDialog_ShowModal",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSingleChoiceDialog_ShowModal",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSingleChoiceDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSingleChoiceDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSingleChoiceDialog_ShowModal. Expected _wxSingleChoiceDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSingleChoiceDialog_ShowModal. Expected _wxSingleChoiceDialog_p.");
         return NULL;
         }


@@ -1513,25 +1596,27 @@ static PyObject *_wrap_new_wxTextEntryDialog(PyObject *self, PyObject *args) {
     wxTextEntryDialog * _result;
     wxWindow * _arg0;
     char * _arg1;
     wxTextEntryDialog * _result;
     wxWindow * _arg0;
     char * _arg1;

-    char * _arg2 = "Input Text";
-    char * _arg3 = "";
-    long  _arg4 = (wxOK)|(wxCANCEL)|(wxCENTRE);
-    wxPoint * _arg5 = &wxPyDefaultPosition;
-    char * _argc0 = 0;
-    char * _argc5 = 0;
+    char * _arg2 = (char *) "Input Text";
+    char * _arg3 = (char *) "";
+    long  _arg4 = (long ) wxOK|wxCANCEL|wxCENTRE;
+    wxPoint * _arg5 = (wxPoint *) &wxPyDefaultPosition;
+    PyObject * _argo0 = 0;
+    PyObject * _argo5 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss|ssls:new_wxTextEntryDialog",&_argc0,&_arg1,&_arg2,&_arg3,&_arg4,&_argc5)) 
+    if(!PyArg_ParseTuple(args,"Os|sslO:new_wxTextEntryDialog",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_argo5)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxTextEntryDialog. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxTextEntryDialog. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc5) {
-        if (SWIG_GetPtr(_argc5,(void **) &_arg5,"_wxPoint_p")) {
+    if (_argo5) {
+        if (_argo5 == Py_None) { _arg5 = NULL; }
+        else if (SWIG_GetPtrObj(_argo5,(void **) &_arg5,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of new_wxTextEntryDialog. Expected _wxPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of new_wxTextEntryDialog. Expected _wxPoint_p.");
         return NULL;
         }


@@ -1541,8 +1626,13 @@ static PyObject *_wrap_new_wxTextEntryDialog(PyObject *self, PyObject *args) {
         _result = (wxTextEntryDialog *)new_wxTextEntryDialog(_arg0,_arg1,_arg2,_arg3,_arg4,*_arg5);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxTextEntryDialog *)new_wxTextEntryDialog(_arg0,_arg1,_arg2,_arg3,_arg4,*_arg5);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxTextEntryDialog_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxTextEntryDialog_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1551,13 +1641,14 @@ static PyObject *_wrap_wxTextEntryDialog_GetValue(PyObject *self, PyObject *args
     PyObject * _resultobj;
     wxString * _result;
     wxTextEntryDialog * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxTextEntryDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTextEntryDialog_GetValue",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTextEntryDialog_GetValue",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextEntryDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextEntryDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextEntryDialog_GetValue. Expected _wxTextEntryDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextEntryDialog_GetValue. Expected _wxTextEntryDialog_p.");
         return NULL;
         }


@@ -1581,14 +1672,15 @@ static PyObject *_wrap_wxTextEntryDialog_SetValue(PyObject *self, PyObject *args
     PyObject * _resultobj;
     wxTextEntryDialog * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxTextEntryDialog * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxTextEntryDialog_SetValue",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTextEntryDialog_SetValue",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextEntryDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextEntryDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextEntryDialog_SetValue. Expected _wxTextEntryDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextEntryDialog_SetValue. Expected _wxTextEntryDialog_p.");
         return NULL;
         }


@@ -1619,13 +1711,14 @@ static PyObject *_wrap_wxTextEntryDialog_ShowModal(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     int  _result;
     wxTextEntryDialog * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxTextEntryDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTextEntryDialog_ShowModal",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTextEntryDialog_ShowModal",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextEntryDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextEntryDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextEntryDialog_ShowModal. Expected _wxTextEntryDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextEntryDialog_ShowModal. Expected _wxTextEntryDialog_p.");
         return NULL;
         }


@@ -1653,8 +1746,13 @@ static PyObject *_wrap_new_wxFontData(PyObject *self, PyObject *args) {
         _result = (wxFontData *)new_wxFontData();
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxFontData *)new_wxFontData();
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxFontData_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxFontData_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1662,13 +1760,14 @@ static PyObject *_wrap_new_wxFontData(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxFontData(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFontData * _arg0;
 static PyObject *_wrap_delete_wxFontData(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFontData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:delete_wxFontData",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxFontData",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFontData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxFontData. Expected _wxFontData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxFontData. Expected _wxFontData_p.");
         return NULL;
         }


@@ -1688,14 +1787,15 @@ static PyObject *_wrap_wxFontData_EnableEffects(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxFontData * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxFontData * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxFontData_EnableEffects",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxFontData_EnableEffects",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFontData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_EnableEffects. Expected _wxFontData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_EnableEffects. Expected _wxFontData_p.");
         return NULL;
         }


@@ -1716,13 +1816,14 @@ static PyObject *_wrap_wxFontData_GetAllowSymbols(PyObject *self, PyObject *args
     PyObject * _resultobj;
     bool  _result;
     wxFontData * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxFontData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxFontData_GetAllowSymbols",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxFontData_GetAllowSymbols",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFontData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_GetAllowSymbols. Expected _wxFontData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_GetAllowSymbols. Expected _wxFontData_p.");
         return NULL;
         }


@@ -1741,14 +1842,15 @@ static PyObject *_wrap_wxFontData_GetColour(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxColour * _result;
     wxFontData * _arg0;
     PyObject * _resultobj;
     wxColour * _result;
     wxFontData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxFontData_GetColour",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxFontData_GetColour",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFontData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_GetColour. Expected _wxFontData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_GetColour. Expected _wxFontData_p.");
         return NULL;
         }


@@ -1759,8 +1861,13 @@ static PyObject *_wrap_wxFontData_GetColour(PyObject *self, PyObject *args) {
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1769,14 +1876,15 @@ static PyObject *_wrap_wxFontData_GetChosenFont(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxFont * _result;
     wxFontData * _arg0;
     PyObject * _resultobj;
     wxFont * _result;
     wxFontData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxFontData_GetChosenFont",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxFontData_GetChosenFont",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFontData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_GetChosenFont. Expected _wxFontData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_GetChosenFont. Expected _wxFontData_p.");
         return NULL;
         }


@@ -1796,13 +1904,14 @@ static PyObject *_wrap_wxFontData_GetEnableEffects(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     bool  _result;
     wxFontData * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxFontData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxFontData_GetEnableEffects",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxFontData_GetEnableEffects",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFontData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_GetEnableEffects. Expected _wxFontData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_GetEnableEffects. Expected _wxFontData_p.");
         return NULL;
         }


@@ -1821,14 +1930,15 @@ static PyObject *_wrap_wxFontData_GetInitialFont(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxFont * _result;
     wxFontData * _arg0;
     PyObject * _resultobj;
     wxFont * _result;
     wxFontData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxFontData_GetInitialFont",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxFontData_GetInitialFont",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFontData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_GetInitialFont. Expected _wxFontData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_GetInitialFont. Expected _wxFontData_p.");
         return NULL;
         }


@@ -1848,13 +1958,14 @@ static PyObject *_wrap_wxFontData_GetShowHelp(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxFontData * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxFontData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxFontData_GetShowHelp",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxFontData_GetShowHelp",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFontData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_GetShowHelp. Expected _wxFontData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_GetShowHelp. Expected _wxFontData_p.");
         return NULL;
         }


@@ -1873,14 +1984,15 @@ static PyObject *_wrap_wxFontData_SetAllowSymbols(PyObject *self, PyObject *args
     PyObject * _resultobj;
     wxFontData * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxFontData * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxFontData_SetAllowSymbols",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxFontData_SetAllowSymbols",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFontData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_SetAllowSymbols. Expected _wxFontData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_SetAllowSymbols. Expected _wxFontData_p.");
         return NULL;
         }


@@ -1901,20 +2013,22 @@ static PyObject *_wrap_wxFontData_SetChosenFont(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxFontData * _arg0;
     wxFont * _arg1;
     PyObject * _resultobj;
     wxFontData * _arg0;
     wxFont * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxFontData_SetChosenFont",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxFontData_SetChosenFont",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFontData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_SetChosenFont. Expected _wxFontData_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_SetChosenFont. Expected _wxFontData_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxFont_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxFont_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFontData_SetChosenFont. Expected _wxFont_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFontData_SetChosenFont. Expected _wxFont_p.");
         return NULL;
         }


@@ -1934,20 +2048,22 @@ static PyObject *_wrap_wxFontData_SetColour(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFontData * _arg0;
     wxColour * _arg1;
     PyObject * _resultobj;
     wxFontData * _arg0;
     wxColour * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxFontData_SetColour",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxFontData_SetColour",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFontData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_SetColour. Expected _wxFontData_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_SetColour. Expected _wxFontData_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxColour_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFontData_SetColour. Expected _wxColour_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFontData_SetColour. Expected _wxColour_p.");
         return NULL;
         }


@@ -1967,20 +2083,22 @@ static PyObject *_wrap_wxFontData_SetInitialFont(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxFontData * _arg0;
     wxFont * _arg1;
     PyObject * _resultobj;
     wxFontData * _arg0;
     wxFont * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxFontData_SetInitialFont",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxFontData_SetInitialFont",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFontData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_SetInitialFont. Expected _wxFontData_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_SetInitialFont. Expected _wxFontData_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxFont_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxFont_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFontData_SetInitialFont. Expected _wxFont_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFontData_SetInitialFont. Expected _wxFont_p.");
         return NULL;
         }


@@ -2001,13 +2119,14 @@ static PyObject *_wrap_wxFontData_SetRange(PyObject *self, PyObject *args) {
     wxFontData * _arg0;
     int  _arg1;
     int  _arg2;
     wxFontData * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxFontData_SetRange",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxFontData_SetRange",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFontData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_SetRange. Expected _wxFontData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_SetRange. Expected _wxFontData_p.");
         return NULL;
         }


@@ -2027,14 +2146,15 @@ static PyObject *_wrap_wxFontData_SetShowHelp(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFontData * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxFontData * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxFontData_SetShowHelp",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxFontData_SetShowHelp",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFontData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_SetShowHelp. Expected _wxFontData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_SetShowHelp. Expected _wxFontData_p.");
         return NULL;
         }


@@ -2087,22 +2207,24 @@ static PyObject *_wrap_new_wxFontDialog(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFontDialog * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxFontDialog * _result;
     wxWindow * _arg0;

-    wxFontData * _arg1 = NULL;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    wxFontData * _arg1 = (wxFontData *) NULL;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|s:new_wxFontDialog",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"O|O:new_wxFontDialog",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxFontDialog. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxFontDialog. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxFontData_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxFontData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of new_wxFontDialog. Expected _wxFontData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of new_wxFontDialog. Expected _wxFontData_p.");
         return NULL;
         }


@@ -2112,8 +2234,13 @@ static PyObject *_wrap_new_wxFontDialog(PyObject *self, PyObject *args) {
         _result = (wxFontDialog *)new_wxFontDialog(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxFontDialog *)new_wxFontDialog(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxFontDialog_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxFontDialog_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -2122,14 +2249,15 @@ static PyObject *_wrap_wxFontDialog_GetFontData(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxFontData * _result;
     wxFontDialog * _arg0;
     PyObject * _resultobj;
     wxFontData * _result;
     wxFontDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxFontDialog_GetFontData",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxFontDialog_GetFontData",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFontDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontDialog_GetFontData. Expected _wxFontDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontDialog_GetFontData. Expected _wxFontDialog_p.");
         return NULL;
         }


@@ -2140,8 +2268,13 @@ static PyObject *_wrap_wxFontDialog_GetFontData(PyObject *self, PyObject *args)
     _result = (wxFontData *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxFontData *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxFontData_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxFontData_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -2150,13 +2283,14 @@ static PyObject *_wrap_wxFontDialog_ShowModal(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxFontDialog * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxFontDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxFontDialog_ShowModal",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxFontDialog_ShowModal",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFontDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontDialog_ShowModal. Expected _wxFontDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontDialog_ShowModal. Expected _wxFontDialog_p.");
         return NULL;
         }


@@ -2208,24 +2342,26 @@ static PyObject *_wrap_new_wxMessageDialog(PyObject *self, PyObject *args) {
     wxMessageDialog * _result;
     wxWindow * _arg0;
     char * _arg1;
     wxMessageDialog * _result;
     wxWindow * _arg0;
     char * _arg1;

-    char * _arg2 = "Message box";
-    long  _arg3 = (wxOK)|(wxCANCEL)|(wxCENTRE);
-    wxPoint * _arg4 = &wxPyDefaultPosition;
-    char * _argc0 = 0;
-    char * _argc4 = 0;
+    char * _arg2 = (char *) "Message box";
+    long  _arg3 = (long ) wxOK|wxCANCEL|wxCENTRE;
+    wxPoint * _arg4 = (wxPoint *) &wxPyDefaultPosition;
+    PyObject * _argo0 = 0;
+    PyObject * _argo4 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss|sls:new_wxMessageDialog",&_argc0,&_arg1,&_arg2,&_arg3,&_argc4)) 
+    if(!PyArg_ParseTuple(args,"Os|slO:new_wxMessageDialog",&_argo0,&_arg1,&_arg2,&_arg3,&_argo4)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxMessageDialog. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxMessageDialog. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_wxPoint_p")) {
+    if (_argo4) {
+        if (_argo4 == Py_None) { _arg4 = NULL; }
+        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxMessageDialog. Expected _wxPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxMessageDialog. Expected _wxPoint_p.");
         return NULL;
         }


@@ -2235,8 +2371,13 @@ static PyObject *_wrap_new_wxMessageDialog(PyObject *self, PyObject *args) {
         _result = (wxMessageDialog *)new_wxMessageDialog(_arg0,_arg1,_arg2,_arg3,*_arg4);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxMessageDialog *)new_wxMessageDialog(_arg0,_arg1,_arg2,_arg3,*_arg4);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMessageDialog_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMessageDialog_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -2245,13 +2386,14 @@ static PyObject *_wrap_wxMessageDialog_ShowModal(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     int  _result;
     wxMessageDialog * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxMessageDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMessageDialog_ShowModal",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMessageDialog_ShowModal",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMessageDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMessageDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMessageDialog_ShowModal. Expected _wxMessageDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMessageDialog_ShowModal. Expected _wxMessageDialog_p.");
         return NULL;
         }


@@ -2295,16 +2437,16 @@ static PyObject *_wrap_new_wxProgressDialog(PyObject *self, PyObject *args) {
     wxProgressDialog * _result;
     wxString * _arg0;
     wxString * _arg1;
     wxProgressDialog * _result;
     wxString * _arg0;
     wxString * _arg1;

-    int  _arg2 = 100;
-    wxWindow * _arg3 = NULL;
-    int  _arg4 = (wxPD_AUTO_HIDE)|(wxPD_APP_MODAL);
+    int  _arg2 = (int ) 100;
+    wxWindow * _arg3 = (wxWindow *) NULL;
+    int  _arg4 = (int ) wxPD_AUTO_HIDE|wxPD_APP_MODAL;

     PyObject * _obj0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _obj0 = 0;
     PyObject * _obj1 = 0;

-    char * _argc3 = 0;
+    PyObject * _argo3 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"OO|isi:new_wxProgressDialog",&_obj0,&_obj1,&_arg2,&_argc3,&_arg4)) 
+    if(!PyArg_ParseTuple(args,"OO|iOi:new_wxProgressDialog",&_obj0,&_obj1,&_arg2,&_argo3,&_arg4)) 

         return NULL;
 {
     if (!PyString_Check(_obj0)) {
         return NULL;
 {
     if (!PyString_Check(_obj0)) {


@@ -2320,8 +2462,9 @@ static PyObject *_wrap_new_wxProgressDialog(PyObject *self, PyObject *args) {
     }
     _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }
     }
     _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxWindow_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxProgressDialog. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxProgressDialog. Expected _wxWindow_p.");
         return NULL;
         }


@@ -2331,8 +2474,13 @@ static PyObject *_wrap_new_wxProgressDialog(PyObject *self, PyObject *args) {
         _result = (wxProgressDialog *)new_wxProgressDialog(*_arg0,*_arg1,_arg2,_arg3,_arg4);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxProgressDialog *)new_wxProgressDialog(*_arg0,*_arg1,_arg2,_arg3,_arg4);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxProgressDialog_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxProgressDialog_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     if (_obj0)
         delete _arg0;
 {
     if (_obj0)
         delete _arg0;


@@ -2349,15 +2497,16 @@ static PyObject *_wrap_wxProgressDialog_Update(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxProgressDialog * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxProgressDialog * _arg0;

-    int  _arg1 = -1;
-    char * _arg2 = NULL;
-    char * _argc0 = 0;
+    int  _arg1 = (int ) -1;
+    char * _arg2 = (char *) NULL;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|is:wxProgressDialog_Update",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"O|is:wxProgressDialog_Update",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxProgressDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxProgressDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxProgressDialog_Update. Expected _wxProgressDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxProgressDialog_Update. Expected _wxProgressDialog_p.");
         return NULL;
         }


@@ -2375,13 +2524,14 @@ static PyObject *_wrap_wxProgressDialog_Update(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxProgressDialog_Resume(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxProgressDialog * _arg0;
 static PyObject *_wrap_wxProgressDialog_Resume(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxProgressDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxProgressDialog_Resume",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxProgressDialog_Resume",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxProgressDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxProgressDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxProgressDialog_Resume. Expected _wxProgressDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxProgressDialog_Resume. Expected _wxProgressDialog_p.");
         return NULL;
         }


@@ -2397,465 +2547,475 @@ static PyObject *_wrap_wxProgressDialog_Resume(PyObject *self, PyObject *args) {
 }
 
 static PyMethodDef cmndlgscMethods[] = {
 }
 
 static PyMethodDef cmndlgscMethods[] = {

-        { "wxProgressDialog_Resume", _wrap_wxProgressDialog_Resume, 1 },
-        { "wxProgressDialog_Update", _wrap_wxProgressDialog_Update, 1 },
-        { "new_wxProgressDialog", _wrap_new_wxProgressDialog, 1 },
-        { "wxMessageDialog_ShowModal", _wrap_wxMessageDialog_ShowModal, 1 },
-        { "new_wxMessageDialog", _wrap_new_wxMessageDialog, 1 },
-        { "wxFontDialog_ShowModal", _wrap_wxFontDialog_ShowModal, 1 },
-        { "wxFontDialog_GetFontData", _wrap_wxFontDialog_GetFontData, 1 },
-        { "new_wxFontDialog", _wrap_new_wxFontDialog, 1 },
-        { "wxFontData_SetShowHelp", _wrap_wxFontData_SetShowHelp, 1 },
-        { "wxFontData_SetRange", _wrap_wxFontData_SetRange, 1 },
-        { "wxFontData_SetInitialFont", _wrap_wxFontData_SetInitialFont, 1 },
-        { "wxFontData_SetColour", _wrap_wxFontData_SetColour, 1 },
-        { "wxFontData_SetChosenFont", _wrap_wxFontData_SetChosenFont, 1 },
-        { "wxFontData_SetAllowSymbols", _wrap_wxFontData_SetAllowSymbols, 1 },
-        { "wxFontData_GetShowHelp", _wrap_wxFontData_GetShowHelp, 1 },
-        { "wxFontData_GetInitialFont", _wrap_wxFontData_GetInitialFont, 1 },
-        { "wxFontData_GetEnableEffects", _wrap_wxFontData_GetEnableEffects, 1 },
-        { "wxFontData_GetChosenFont", _wrap_wxFontData_GetChosenFont, 1 },
-        { "wxFontData_GetColour", _wrap_wxFontData_GetColour, 1 },
-        { "wxFontData_GetAllowSymbols", _wrap_wxFontData_GetAllowSymbols, 1 },
-        { "wxFontData_EnableEffects", _wrap_wxFontData_EnableEffects, 1 },
-        { "delete_wxFontData", _wrap_delete_wxFontData, 1 },
-        { "new_wxFontData", _wrap_new_wxFontData, 1 },
-        { "wxTextEntryDialog_ShowModal", _wrap_wxTextEntryDialog_ShowModal, 1 },
-        { "wxTextEntryDialog_SetValue", _wrap_wxTextEntryDialog_SetValue, 1 },
-        { "wxTextEntryDialog_GetValue", _wrap_wxTextEntryDialog_GetValue, 1 },
-        { "new_wxTextEntryDialog", _wrap_new_wxTextEntryDialog, 1 },
-        { "wxSingleChoiceDialog_ShowModal", _wrap_wxSingleChoiceDialog_ShowModal, 1 },
-        { "wxSingleChoiceDialog_SetSelection", _wrap_wxSingleChoiceDialog_SetSelection, 1 },
-        { "wxSingleChoiceDialog_GetStringSelection", _wrap_wxSingleChoiceDialog_GetStringSelection, 1 },
-        { "wxSingleChoiceDialog_GetSelection", _wrap_wxSingleChoiceDialog_GetSelection, 1 },
-        { "new_wxSingleChoiceDialog", _wrap_new_wxSingleChoiceDialog, 1 },
-        { "wxFileDialog_ShowModal", _wrap_wxFileDialog_ShowModal, 1 },
-        { "wxFileDialog_SetWildcard", _wrap_wxFileDialog_SetWildcard, 1 },
-        { "wxFileDialog_SetStyle", _wrap_wxFileDialog_SetStyle, 1 },
-        { "wxFileDialog_SetPath", _wrap_wxFileDialog_SetPath, 1 },
-        { "wxFileDialog_SetMessage", _wrap_wxFileDialog_SetMessage, 1 },
-        { "wxFileDialog_SetFilterIndex", _wrap_wxFileDialog_SetFilterIndex, 1 },
-        { "wxFileDialog_SetFilename", _wrap_wxFileDialog_SetFilename, 1 },
-        { "wxFileDialog_SetDirectory", _wrap_wxFileDialog_SetDirectory, 1 },
-        { "wxFileDialog_GetWildcard", _wrap_wxFileDialog_GetWildcard, 1 },
-        { "wxFileDialog_GetStyle", _wrap_wxFileDialog_GetStyle, 1 },
-        { "wxFileDialog_GetPath", _wrap_wxFileDialog_GetPath, 1 },
-        { "wxFileDialog_GetMessage", _wrap_wxFileDialog_GetMessage, 1 },
-        { "wxFileDialog_GetFilterIndex", _wrap_wxFileDialog_GetFilterIndex, 1 },
-        { "wxFileDialog_GetFilename", _wrap_wxFileDialog_GetFilename, 1 },
-        { "wxFileDialog_GetDirectory", _wrap_wxFileDialog_GetDirectory, 1 },
-        { "new_wxFileDialog", _wrap_new_wxFileDialog, 1 },
-        { "wxDirDialog_ShowModal", _wrap_wxDirDialog_ShowModal, 1 },
-        { "wxDirDialog_SetPath", _wrap_wxDirDialog_SetPath, 1 },
-        { "wxDirDialog_SetMessage", _wrap_wxDirDialog_SetMessage, 1 },
-        { "wxDirDialog_GetStyle", _wrap_wxDirDialog_GetStyle, 1 },
-        { "wxDirDialog_GetMessage", _wrap_wxDirDialog_GetMessage, 1 },
-        { "wxDirDialog_GetPath", _wrap_wxDirDialog_GetPath, 1 },
-        { "new_wxDirDialog", _wrap_new_wxDirDialog, 1 },
-        { "wxColourDialog_ShowModal", _wrap_wxColourDialog_ShowModal, 1 },
-        { "wxColourDialog_GetColourData", _wrap_wxColourDialog_GetColourData, 1 },
-        { "new_wxColourDialog", _wrap_new_wxColourDialog, 1 },
-        { "wxColourData_SetCustomColour", _wrap_wxColourData_SetCustomColour, 1 },
-        { "wxColourData_SetColour", _wrap_wxColourData_SetColour, 1 },
-        { "wxColourData_SetChooseFull", _wrap_wxColourData_SetChooseFull, 1 },
-        { "wxColourData_GetCustomColour", _wrap_wxColourData_GetCustomColour, 1 },
-        { "wxColourData_GetColour", _wrap_wxColourData_GetColour, 1 },
-        { "wxColourData_GetChooseFull", _wrap_wxColourData_GetChooseFull, 1 },
-        { "delete_wxColourData", _wrap_delete_wxColourData, 1 },
-        { "new_wxColourData", _wrap_new_wxColourData, 1 },
+        { "wxProgressDialog_Resume", _wrap_wxProgressDialog_Resume, METH_VARARGS },
+        { "wxProgressDialog_Update", _wrap_wxProgressDialog_Update, METH_VARARGS },
+        { "new_wxProgressDialog", _wrap_new_wxProgressDialog, METH_VARARGS },
+        { "wxMessageDialog_ShowModal", _wrap_wxMessageDialog_ShowModal, METH_VARARGS },
+        { "new_wxMessageDialog", _wrap_new_wxMessageDialog, METH_VARARGS },
+        { "wxFontDialog_ShowModal", _wrap_wxFontDialog_ShowModal, METH_VARARGS },
+        { "wxFontDialog_GetFontData", _wrap_wxFontDialog_GetFontData, METH_VARARGS },
+        { "new_wxFontDialog", _wrap_new_wxFontDialog, METH_VARARGS },
+        { "wxFontData_SetShowHelp", _wrap_wxFontData_SetShowHelp, METH_VARARGS },
+        { "wxFontData_SetRange", _wrap_wxFontData_SetRange, METH_VARARGS },
+        { "wxFontData_SetInitialFont", _wrap_wxFontData_SetInitialFont, METH_VARARGS },
+        { "wxFontData_SetColour", _wrap_wxFontData_SetColour, METH_VARARGS },
+        { "wxFontData_SetChosenFont", _wrap_wxFontData_SetChosenFont, METH_VARARGS },
+        { "wxFontData_SetAllowSymbols", _wrap_wxFontData_SetAllowSymbols, METH_VARARGS },
+        { "wxFontData_GetShowHelp", _wrap_wxFontData_GetShowHelp, METH_VARARGS },
+        { "wxFontData_GetInitialFont", _wrap_wxFontData_GetInitialFont, METH_VARARGS },
+        { "wxFontData_GetEnableEffects", _wrap_wxFontData_GetEnableEffects, METH_VARARGS },
+        { "wxFontData_GetChosenFont", _wrap_wxFontData_GetChosenFont, METH_VARARGS },
+        { "wxFontData_GetColour", _wrap_wxFontData_GetColour, METH_VARARGS },
+        { "wxFontData_GetAllowSymbols", _wrap_wxFontData_GetAllowSymbols, METH_VARARGS },
+        { "wxFontData_EnableEffects", _wrap_wxFontData_EnableEffects, METH_VARARGS },
+        { "delete_wxFontData", _wrap_delete_wxFontData, METH_VARARGS },
+        { "new_wxFontData", _wrap_new_wxFontData, METH_VARARGS },
+        { "wxTextEntryDialog_ShowModal", _wrap_wxTextEntryDialog_ShowModal, METH_VARARGS },
+        { "wxTextEntryDialog_SetValue", _wrap_wxTextEntryDialog_SetValue, METH_VARARGS },
+        { "wxTextEntryDialog_GetValue", _wrap_wxTextEntryDialog_GetValue, METH_VARARGS },
+        { "new_wxTextEntryDialog", _wrap_new_wxTextEntryDialog, METH_VARARGS },
+        { "wxSingleChoiceDialog_ShowModal", _wrap_wxSingleChoiceDialog_ShowModal, METH_VARARGS },
+        { "wxSingleChoiceDialog_SetSelection", _wrap_wxSingleChoiceDialog_SetSelection, METH_VARARGS },
+        { "wxSingleChoiceDialog_GetStringSelection", _wrap_wxSingleChoiceDialog_GetStringSelection, METH_VARARGS },
+        { "wxSingleChoiceDialog_GetSelection", _wrap_wxSingleChoiceDialog_GetSelection, METH_VARARGS },
+        { "new_wxSingleChoiceDialog", _wrap_new_wxSingleChoiceDialog, METH_VARARGS },
+        { "wxFileDialog_ShowModal", _wrap_wxFileDialog_ShowModal, METH_VARARGS },
+        { "wxFileDialog_SetWildcard", _wrap_wxFileDialog_SetWildcard, METH_VARARGS },
+        { "wxFileDialog_SetStyle", _wrap_wxFileDialog_SetStyle, METH_VARARGS },
+        { "wxFileDialog_SetPath", _wrap_wxFileDialog_SetPath, METH_VARARGS },
+        { "wxFileDialog_SetMessage", _wrap_wxFileDialog_SetMessage, METH_VARARGS },
+        { "wxFileDialog_SetFilterIndex", _wrap_wxFileDialog_SetFilterIndex, METH_VARARGS },
+        { "wxFileDialog_SetFilename", _wrap_wxFileDialog_SetFilename, METH_VARARGS },
+        { "wxFileDialog_SetDirectory", _wrap_wxFileDialog_SetDirectory, METH_VARARGS },
+        { "wxFileDialog_GetWildcard", _wrap_wxFileDialog_GetWildcard, METH_VARARGS },
+        { "wxFileDialog_GetStyle", _wrap_wxFileDialog_GetStyle, METH_VARARGS },
+        { "wxFileDialog_GetPath", _wrap_wxFileDialog_GetPath, METH_VARARGS },
+        { "wxFileDialog_GetMessage", _wrap_wxFileDialog_GetMessage, METH_VARARGS },
+        { "wxFileDialog_GetFilterIndex", _wrap_wxFileDialog_GetFilterIndex, METH_VARARGS },
+        { "wxFileDialog_GetFilename", _wrap_wxFileDialog_GetFilename, METH_VARARGS },
+        { "wxFileDialog_GetDirectory", _wrap_wxFileDialog_GetDirectory, METH_VARARGS },
+        { "new_wxFileDialog", _wrap_new_wxFileDialog, METH_VARARGS },
+        { "wxDirDialog_ShowModal", _wrap_wxDirDialog_ShowModal, METH_VARARGS },
+        { "wxDirDialog_SetPath", _wrap_wxDirDialog_SetPath, METH_VARARGS },
+        { "wxDirDialog_SetMessage", _wrap_wxDirDialog_SetMessage, METH_VARARGS },
+        { "wxDirDialog_GetStyle", _wrap_wxDirDialog_GetStyle, METH_VARARGS },
+        { "wxDirDialog_GetMessage", _wrap_wxDirDialog_GetMessage, METH_VARARGS },
+        { "wxDirDialog_GetPath", _wrap_wxDirDialog_GetPath, METH_VARARGS },
+        { "new_wxDirDialog", _wrap_new_wxDirDialog, METH_VARARGS },
+        { "wxColourDialog_ShowModal", _wrap_wxColourDialog_ShowModal, METH_VARARGS },
+        { "wxColourDialog_GetColourData", _wrap_wxColourDialog_GetColourData, METH_VARARGS },
+        { "new_wxColourDialog", _wrap_new_wxColourDialog, METH_VARARGS },
+        { "wxColourData_SetCustomColour", _wrap_wxColourData_SetCustomColour, METH_VARARGS },
+        { "wxColourData_SetColour", _wrap_wxColourData_SetColour, METH_VARARGS },
+        { "wxColourData_SetChooseFull", _wrap_wxColourData_SetChooseFull, METH_VARARGS },
+        { "wxColourData_GetCustomColour", _wrap_wxColourData_GetCustomColour, METH_VARARGS },
+        { "wxColourData_GetColour", _wrap_wxColourData_GetColour, METH_VARARGS },
+        { "wxColourData_GetChooseFull", _wrap_wxColourData_GetChooseFull, METH_VARARGS },
+        { "delete_wxColourData", _wrap_delete_wxColourData, METH_VARARGS },
+        { "new_wxColourData", _wrap_new_wxColourData, METH_VARARGS },

         { NULL, NULL }
 };
         { NULL, NULL }
 };

+#ifdef __cplusplus
+}
+#endif
+/*
+ * This table is used by the pointer type-checker
+ */
+static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
+    { "_wxAcceleratorTable","_class_wxAcceleratorTable",0},
+    { "_wxEvent","_class_wxEvent",0},
+    { "_class_wxActivateEvent","_wxActivateEvent",0},
+    { "_signed_long","_long",0},
+    { "_wxMenuEvent","_class_wxMenuEvent",0},
+    { "_wxPrintQuality","_int",0},
+    { "_wxPrintQuality","_signed_int",0},
+    { "_wxPrintQuality","_unsigned_int",0},
+    { "_wxPrintQuality","_wxWindowID",0},
+    { "_wxPrintQuality","_uint",0},
+    { "_wxPrintQuality","_EBool",0},
+    { "_wxPrintQuality","_size_t",0},
+    { "_wxFontData","_class_wxFontData",0},
+    { "_class_wxRegionIterator","_wxRegionIterator",0},
+    { "_class_wxMenuBar","_wxMenuBar",0},
+    { "_class_wxEvtHandler","_class_wxProgressDialog",SwigwxProgressDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxProgressDialog",SwigwxProgressDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxMessageDialog",SwigwxMessageDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxMessageDialog",SwigwxMessageDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxFontDialog",SwigwxFontDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxFontDialog",SwigwxFontDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxTextEntryDialog",SwigwxTextEntryDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxFileDialog",SwigwxFileDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxFileDialog",SwigwxFileDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxDirDialog",SwigwxDirDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxDirDialog",SwigwxDirDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxColourDialog",SwigwxColourDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxColourDialog",SwigwxColourDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxEvtHandler",0},
+    { "_wxPaintEvent","_class_wxPaintEvent",0},
+    { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
+    { "_wxCursor","_class_wxCursor",0},
+    { "_wxNotifyEvent","_class_wxNotifyEvent",0},
+    { "_wxMask","_class_wxMask",0},
+    { "_class_wxColourData","_wxColourData",0},
+    { "_wxPen","_class_wxPen",0},
+    { "_wxUpdateUIEvent","_class_wxUpdateUIEvent",0},
+    { "_byte","_unsigned_char",0},
+    { "_wxStaticBox","_class_wxStaticBox",0},
+    { "_wxChoice","_class_wxChoice",0},
+    { "_wxSlider","_class_wxSlider",0},
+    { "_long","_wxDash",0},
+    { "_long","_unsigned_long",0},
+    { "_long","_signed_long",0},
+    { "_wxImageList","_class_wxImageList",0},
+    { "_wxDropFilesEvent","_class_wxDropFilesEvent",0},
+    { "_wxBitmapButton","_class_wxBitmapButton",0},
+    { "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
+    { "_class_wxGauge","_wxGauge",0},
+    { "_wxDC","_class_wxDC",0},
+    { "_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0},
+    { "_wxProgressDialog","_class_wxProgressDialog",0},
+    { "_wxSpinEvent","_class_wxSpinEvent",0},
+    { "_size_t","_wxPrintQuality",0},
+    { "_size_t","_unsigned_int",0},
+    { "_size_t","_int",0},
+    { "_size_t","_wxWindowID",0},
+    { "_size_t","_uint",0},
+    { "_class_wxRealPoint","_wxRealPoint",0},
+    { "_wxPrinterDC","_class_wxPrinterDC",0},
+    { "_class_wxMenuItem","_wxMenuItem",0},
+    { "_class_wxPaintEvent","_wxPaintEvent",0},
+    { "_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0},
+    { "_class_wxStatusBar","_wxStatusBar",0},
+    { "_wxPanel","_class_wxMessageDialog",SwigwxMessageDialogTowxPanel},
+    { "_wxPanel","_wxMessageDialog",SwigwxMessageDialogTowxPanel},
+    { "_wxPanel","_class_wxFontDialog",SwigwxFontDialogTowxPanel},
+    { "_wxPanel","_wxFontDialog",SwigwxFontDialogTowxPanel},
+    { "_wxPanel","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxPanel},
+    { "_wxPanel","_wxTextEntryDialog",SwigwxTextEntryDialogTowxPanel},
+    { "_wxPanel","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxPanel},
+    { "_wxPanel","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxPanel},
+    { "_wxPanel","_class_wxFileDialog",SwigwxFileDialogTowxPanel},
+    { "_wxPanel","_wxFileDialog",SwigwxFileDialogTowxPanel},
+    { "_wxPanel","_class_wxDirDialog",SwigwxDirDialogTowxPanel},
+    { "_wxPanel","_wxDirDialog",SwigwxDirDialogTowxPanel},
+    { "_wxPanel","_class_wxColourDialog",SwigwxColourDialogTowxPanel},
+    { "_wxPanel","_wxColourDialog",SwigwxColourDialogTowxPanel},
+    { "_wxPanel","_class_wxPanel",0},
+    { "_wxInitDialogEvent","_class_wxInitDialogEvent",0},
+    { "_wxCheckBox","_class_wxCheckBox",0},
+    { "_wxPyEvent","_class_wxPyEvent",0},
+    { "_wxTextCtrl","_class_wxTextCtrl",0},
+    { "_class_wxMask","_wxMask",0},
+    { "_class_wxKeyEvent","_wxKeyEvent",0},
+    { "_wxColour","_class_wxColour",0},
+    { "_class_wxDialog","_class_wxMessageDialog",SwigwxMessageDialogTowxDialog},
+    { "_class_wxDialog","_wxMessageDialog",SwigwxMessageDialogTowxDialog},
+    { "_class_wxDialog","_class_wxFontDialog",SwigwxFontDialogTowxDialog},
+    { "_class_wxDialog","_wxFontDialog",SwigwxFontDialogTowxDialog},
+    { "_class_wxDialog","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxDialog},
+    { "_class_wxDialog","_wxTextEntryDialog",SwigwxTextEntryDialogTowxDialog},
+    { "_class_wxDialog","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxDialog},
+    { "_class_wxDialog","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxDialog},
+    { "_class_wxDialog","_class_wxFileDialog",SwigwxFileDialogTowxDialog},
+    { "_class_wxDialog","_wxFileDialog",SwigwxFileDialogTowxDialog},
+    { "_class_wxDialog","_class_wxDirDialog",SwigwxDirDialogTowxDialog},
+    { "_class_wxDialog","_wxDirDialog",SwigwxDirDialogTowxDialog},
+    { "_class_wxDialog","_class_wxColourDialog",SwigwxColourDialogTowxDialog},
+    { "_class_wxDialog","_wxColourDialog",SwigwxColourDialogTowxDialog},
+    { "_class_wxDialog","_wxDialog",0},
+    { "_wxIdleEvent","_class_wxIdleEvent",0},
+    { "_class_wxUpdateUIEvent","_wxUpdateUIEvent",0},
+    { "_wxToolBar","_class_wxToolBar",0},
+    { "_wxStaticLine","_class_wxStaticLine",0},
+    { "_wxBrush","_class_wxBrush",0},
+    { "_wxMiniFrame","_class_wxMiniFrame",0},
+    { "_wxShowEvent","_class_wxShowEvent",0},
+    { "_uint","_wxPrintQuality",0},
+    { "_uint","_size_t",0},
+    { "_uint","_unsigned_int",0},
+    { "_uint","_int",0},
+    { "_uint","_wxWindowID",0},
+    { "_class_wxEvent","_wxEvent",0},
+    { "_wxCheckListBox","_class_wxCheckListBox",0},
+    { "_wxRect","_class_wxRect",0},
+    { "_wxCommandEvent","_class_wxCommandEvent",0},
+    { "_wxSizeEvent","_class_wxSizeEvent",0},
+    { "_wxPoint","_class_wxPoint",0},
+    { "_class_wxButton","_wxButton",0},
+    { "_wxRadioBox","_class_wxRadioBox",0},
+    { "_class_wxFontData","_wxFontData",0},
+    { "_wxBitmap","_class_wxBitmap",0},
+    { "_wxPyTimer","_class_wxPyTimer",0},
+    { "_wxWindowDC","_class_wxWindowDC",0},
+    { "_wxScrollBar","_class_wxScrollBar",0},
+    { "_wxSpinButton","_class_wxSpinButton",0},
+    { "_wxToolBarTool","_class_wxToolBarTool",0},
+    { "_wxColourDialog","_class_wxColourDialog",0},
+    { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
+    { "_class_wxNotifyEvent","_wxNotifyEvent",0},
+    { "_wxMessageDialog","_class_wxMessageDialog",0},
+    { "_class_wxPyEvent","_wxPyEvent",0},
+    { "_wxTextEntryDialog","_class_wxTextEntryDialog",0},
+    { "_class_wxIconizeEvent","_wxIconizeEvent",0},
+    { "_class_wxStaticBitmap","_wxStaticBitmap",0},
+    { "_class_wxToolBar","_wxToolBar",0},
+    { "_class_wxStaticLine","_wxStaticLine",0},
+    { "_wxScrollEvent","_class_wxScrollEvent",0},
+    { "_EBool","_wxPrintQuality",0},
+    { "_EBool","_signed_int",0},
+    { "_EBool","_int",0},
+    { "_EBool","_wxWindowID",0},
+    { "_class_wxRegion","_wxRegion",0},
+    { "_class_wxDropFilesEvent","_wxDropFilesEvent",0},
+    { "_wxStaticText","_class_wxStaticText",0},
+    { "_wxFont","_class_wxFont",0},
+    { "_wxCloseEvent","_class_wxCloseEvent",0},
+    { "_unsigned_long","_wxDash",0},
+    { "_unsigned_long","_long",0},
+    { "_class_wxRect","_wxRect",0},
+    { "_class_wxDC","_wxDC",0},
+    { "_class_wxProgressDialog","_wxProgressDialog",0},
+    { "_class_wxDirDialog","_wxDirDialog",0},
+    { "_class_wxPyTimer","_wxPyTimer",0},
+    { "_wxFocusEvent","_class_wxFocusEvent",0},
+    { "_wxMaximizeEvent","_class_wxMaximizeEvent",0},
+    { "_class_wxSpinButton","_wxSpinButton",0},
+    { "_wxAcceleratorEntry","_class_wxAcceleratorEntry",0},
+    { "_class_wxPanel","_class_wxMessageDialog",SwigwxMessageDialogTowxPanel},
+    { "_class_wxPanel","_wxMessageDialog",SwigwxMessageDialogTowxPanel},
+    { "_class_wxPanel","_class_wxFontDialog",SwigwxFontDialogTowxPanel},
+    { "_class_wxPanel","_wxFontDialog",SwigwxFontDialogTowxPanel},
+    { "_class_wxPanel","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxPanel},
+    { "_class_wxPanel","_wxTextEntryDialog",SwigwxTextEntryDialogTowxPanel},
+    { "_class_wxPanel","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxPanel},
+    { "_class_wxPanel","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxPanel},
+    { "_class_wxPanel","_class_wxFileDialog",SwigwxFileDialogTowxPanel},
+    { "_class_wxPanel","_wxFileDialog",SwigwxFileDialogTowxPanel},
+    { "_class_wxPanel","_class_wxDirDialog",SwigwxDirDialogTowxPanel},
+    { "_class_wxPanel","_wxDirDialog",SwigwxDirDialogTowxPanel},
+    { "_class_wxPanel","_class_wxColourDialog",SwigwxColourDialogTowxPanel},
+    { "_class_wxPanel","_wxColourDialog",SwigwxColourDialogTowxPanel},
+    { "_class_wxPanel","_wxPanel",0},
+    { "_class_wxCheckBox","_wxCheckBox",0},
+    { "_wxComboBox","_class_wxComboBox",0},
+    { "_wxRadioButton","_class_wxRadioButton",0},
+    { "_class_wxMessageDialog","_wxMessageDialog",0},
+    { "_signed_int","_wxPrintQuality",0},
+    { "_signed_int","_EBool",0},
+    { "_signed_int","_wxWindowID",0},
+    { "_signed_int","_int",0},
+    { "_class_wxTextCtrl","_wxTextCtrl",0},
+    { "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
+    { "_wxMetaFileDC","_class_wxMetaFileDC",0},
+    { "_wxMenu","_class_wxMenu",0},
+    { "_class_wxMoveEvent","_wxMoveEvent",0},
+    { "_wxListBox","_class_wxListBox",0},
+    { "_wxScreenDC","_class_wxScreenDC",0},
+    { "_WXTYPE","_short",0},
+    { "_WXTYPE","_signed_short",0},
+    { "_WXTYPE","_unsigned_short",0},
+    { "_wxFileDialog","_class_wxFileDialog",0},
+    { "_class_wxBrush","_wxBrush",0},
+    { "_unsigned_short","_WXTYPE",0},
+    { "_unsigned_short","_short",0},
+    { "_class_wxWindow","_class_wxProgressDialog",SwigwxProgressDialogTowxWindow},
+    { "_class_wxWindow","_wxProgressDialog",SwigwxProgressDialogTowxWindow},
+    { "_class_wxWindow","_class_wxMessageDialog",SwigwxMessageDialogTowxWindow},
+    { "_class_wxWindow","_wxMessageDialog",SwigwxMessageDialogTowxWindow},
+    { "_class_wxWindow","_class_wxFontDialog",SwigwxFontDialogTowxWindow},
+    { "_class_wxWindow","_wxFontDialog",SwigwxFontDialogTowxWindow},
+    { "_class_wxWindow","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxWindow},
+    { "_class_wxWindow","_wxTextEntryDialog",SwigwxTextEntryDialogTowxWindow},
+    { "_class_wxWindow","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxWindow},
+    { "_class_wxWindow","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxWindow},
+    { "_class_wxWindow","_class_wxFileDialog",SwigwxFileDialogTowxWindow},
+    { "_class_wxWindow","_wxFileDialog",SwigwxFileDialogTowxWindow},
+    { "_class_wxWindow","_class_wxDirDialog",SwigwxDirDialogTowxWindow},
+    { "_class_wxWindow","_wxDirDialog",SwigwxDirDialogTowxWindow},
+    { "_class_wxWindow","_class_wxColourDialog",SwigwxColourDialogTowxWindow},
+    { "_class_wxWindow","_wxColourDialog",SwigwxColourDialogTowxWindow},
+    { "_class_wxWindow","_wxWindow",0},
+    { "_class_wxStaticText","_wxStaticText",0},
+    { "_class_wxFont","_wxFont",0},
+    { "_class_wxCloseEvent","_wxCloseEvent",0},
+    { "_class_wxMenuEvent","_wxMenuEvent",0},
+    { "_wxClientDC","_class_wxClientDC",0},
+    { "_wxMouseEvent","_class_wxMouseEvent",0},
+    { "_wxSingleChoiceDialog","_class_wxSingleChoiceDialog",0},
+    { "_class_wxPoint","_wxPoint",0},
+    { "_wxRealPoint","_class_wxRealPoint",0},
+    { "_class_wxRadioBox","_wxRadioBox",0},
+    { "_signed_short","_WXTYPE",0},
+    { "_signed_short","_short",0},
+    { "_wxMemoryDC","_class_wxMemoryDC",0},
+    { "_wxPaintDC","_class_wxPaintDC",0},
+    { "_class_wxWindowDC","_wxWindowDC",0},
+    { "_class_wxFocusEvent","_wxFocusEvent",0},
+    { "_class_wxMaximizeEvent","_wxMaximizeEvent",0},
+    { "_wxStatusBar","_class_wxStatusBar",0},
+    { "_class_wxToolBarTool","_wxToolBarTool",0},
+    { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
+    { "_class_wxCursor","_wxCursor",0},
+    { "_wxScrolledWindow","_class_wxScrolledWindow",0},
+    { "_unsigned_char","_byte",0},
+    { "_class_wxMetaFileDC","_wxMetaFileDC",0},
+    { "_class_wxMenu","_wxMenu",0},
+    { "_wxControl","_class_wxControl",0},
+    { "_class_wxListBox","_wxListBox",0},
+    { "_unsigned_int","_wxPrintQuality",0},
+    { "_unsigned_int","_size_t",0},
+    { "_unsigned_int","_uint",0},
+    { "_unsigned_int","_wxWindowID",0},
+    { "_unsigned_int","_int",0},
+    { "_wxIcon","_class_wxIcon",0},
+    { "_wxDialog","_class_wxMessageDialog",SwigwxMessageDialogTowxDialog},
+    { "_wxDialog","_wxMessageDialog",SwigwxMessageDialogTowxDialog},
+    { "_wxDialog","_class_wxFontDialog",SwigwxFontDialogTowxDialog},
+    { "_wxDialog","_wxFontDialog",SwigwxFontDialogTowxDialog},
+    { "_wxDialog","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxDialog},
+    { "_wxDialog","_wxTextEntryDialog",SwigwxTextEntryDialogTowxDialog},
+    { "_wxDialog","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxDialog},
+    { "_wxDialog","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxDialog},
+    { "_wxDialog","_class_wxFileDialog",SwigwxFileDialogTowxDialog},
+    { "_wxDialog","_wxFileDialog",SwigwxFileDialogTowxDialog},
+    { "_wxDialog","_class_wxDirDialog",SwigwxDirDialogTowxDialog},
+    { "_wxDialog","_wxDirDialog",SwigwxDirDialogTowxDialog},
+    { "_wxDialog","_class_wxColourDialog",SwigwxColourDialogTowxDialog},
+    { "_wxDialog","_wxColourDialog",SwigwxColourDialogTowxDialog},
+    { "_wxDialog","_class_wxDialog",0},
+    { "_class_wxPen","_wxPen",0},
+    { "_class_wxFileDialog","_wxFileDialog",0},
+    { "_short","_WXTYPE",0},
+    { "_short","_unsigned_short",0},
+    { "_short","_signed_short",0},
+    { "_class_wxStaticBox","_wxStaticBox",0},
+    { "_class_wxScrollEvent","_wxScrollEvent",0},
+    { "_wxJoystickEvent","_class_wxJoystickEvent",0},
+    { "_class_wxChoice","_wxChoice",0},
+    { "_class_wxSlider","_wxSlider",0},
+    { "_class_wxImageList","_wxImageList",0},
+    { "_class_wxBitmapButton","_wxBitmapButton",0},
+    { "_wxFrame","_class_wxProgressDialog",SwigwxProgressDialogTowxFrame},
+    { "_wxFrame","_wxProgressDialog",SwigwxProgressDialogTowxFrame},
+    { "_wxFrame","_class_wxFrame",0},
+    { "_wxWindowID","_wxPrintQuality",0},
+    { "_wxWindowID","_size_t",0},
+    { "_wxWindowID","_EBool",0},
+    { "_wxWindowID","_uint",0},
+    { "_wxWindowID","_int",0},
+    { "_wxWindowID","_signed_int",0},
+    { "_wxWindowID","_unsigned_int",0},
+    { "_int","_wxPrintQuality",0},
+    { "_int","_size_t",0},
+    { "_int","_EBool",0},
+    { "_int","_uint",0},
+    { "_int","_wxWindowID",0},
+    { "_int","_unsigned_int",0},
+    { "_int","_signed_int",0},
+    { "_class_wxMouseEvent","_wxMouseEvent",0},
+    { "_class_wxSpinEvent","_wxSpinEvent",0},
+    { "_wxButton","_class_wxButton",0},
+    { "_wxSize","_class_wxSize",0},
+    { "_wxRegionIterator","_class_wxRegionIterator",0},
+    { "_class_wxPrinterDC","_wxPrinterDC",0},
+    { "_class_wxPaintDC","_wxPaintDC",0},
+    { "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0},
+    { "_class_wxInitDialogEvent","_wxInitDialogEvent",0},
+    { "_class_wxComboBox","_wxComboBox",0},
+    { "_class_wxRadioButton","_wxRadioButton",0},
+    { "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
+    { "_wxIconizeEvent","_class_wxIconizeEvent",0},
+    { "_class_wxControl","_wxControl",0},
+    { "_wxStaticBitmap","_class_wxStaticBitmap",0},
+    { "_class_wxIcon","_wxIcon",0},
+    { "_class_wxColour","_wxColour",0},
+    { "_class_wxScreenDC","_wxScreenDC",0},
+    { "_wxPalette","_class_wxPalette",0},
+    { "_class_wxIdleEvent","_wxIdleEvent",0},
+    { "_wxEraseEvent","_class_wxEraseEvent",0},
+    { "_class_wxJoystickEvent","_wxJoystickEvent",0},
+    { "_class_wxMiniFrame","_wxMiniFrame",0},
+    { "_wxFontDialog","_class_wxFontDialog",0},
+    { "_wxRegion","_class_wxRegion",0},
+    { "_class_wxShowEvent","_wxShowEvent",0},
+    { "_wxActivateEvent","_class_wxActivateEvent",0},
+    { "_wxGauge","_class_wxGauge",0},
+    { "_class_wxCheckListBox","_wxCheckListBox",0},
+    { "_class_wxCommandEvent","_wxCommandEvent",0},
+    { "_class_wxClientDC","_wxClientDC",0},
+    { "_class_wxSizeEvent","_wxSizeEvent",0},
+    { "_class_wxSize","_wxSize",0},
+    { "_class_wxBitmap","_wxBitmap",0},
+    { "_class_wxMemoryDC","_wxMemoryDC",0},
+    { "_wxMenuBar","_class_wxMenuBar",0},
+    { "_wxDirDialog","_class_wxDirDialog",0},
+    { "_wxEvtHandler","_class_wxProgressDialog",SwigwxProgressDialogTowxEvtHandler},
+    { "_wxEvtHandler","_wxProgressDialog",SwigwxProgressDialogTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxMessageDialog",SwigwxMessageDialogTowxEvtHandler},
+    { "_wxEvtHandler","_wxMessageDialog",SwigwxMessageDialogTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxFontDialog",SwigwxFontDialogTowxEvtHandler},
+    { "_wxEvtHandler","_wxFontDialog",SwigwxFontDialogTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxEvtHandler},
+    { "_wxEvtHandler","_wxTextEntryDialog",SwigwxTextEntryDialogTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxEvtHandler},
+    { "_wxEvtHandler","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxFileDialog",SwigwxFileDialogTowxEvtHandler},
+    { "_wxEvtHandler","_wxFileDialog",SwigwxFileDialogTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxDirDialog",SwigwxDirDialogTowxEvtHandler},
+    { "_wxEvtHandler","_wxDirDialog",SwigwxDirDialogTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxColourDialog",SwigwxColourDialogTowxEvtHandler},
+    { "_wxEvtHandler","_wxColourDialog",SwigwxColourDialogTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxEvtHandler",0},
+    { "_wxMenuItem","_class_wxMenuItem",0},
+    { "_class_wxScrollBar","_wxScrollBar",0},
+    { "_class_wxColourDialog","_wxColourDialog",0},
+    { "_wxDash","_unsigned_long",0},
+    { "_wxDash","_long",0},
+    { "_class_wxScrolledWindow","_wxScrolledWindow",0},
+    { "_class_wxTextEntryDialog","_wxTextEntryDialog",0},
+    { "_wxKeyEvent","_class_wxKeyEvent",0},
+    { "_wxMoveEvent","_class_wxMoveEvent",0},
+    { "_wxColourData","_class_wxColourData",0},
+    { "_class_wxPalette","_wxPalette",0},
+    { "_class_wxEraseEvent","_wxEraseEvent",0},
+    { "_class_wxFontDialog","_wxFontDialog",0},
+    { "_wxWindow","_class_wxProgressDialog",SwigwxProgressDialogTowxWindow},
+    { "_wxWindow","_wxProgressDialog",SwigwxProgressDialogTowxWindow},
+    { "_wxWindow","_class_wxMessageDialog",SwigwxMessageDialogTowxWindow},
+    { "_wxWindow","_wxMessageDialog",SwigwxMessageDialogTowxWindow},
+    { "_wxWindow","_class_wxFontDialog",SwigwxFontDialogTowxWindow},
+    { "_wxWindow","_wxFontDialog",SwigwxFontDialogTowxWindow},
+    { "_wxWindow","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxWindow},
+    { "_wxWindow","_wxTextEntryDialog",SwigwxTextEntryDialogTowxWindow},
+    { "_wxWindow","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxWindow},
+    { "_wxWindow","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxWindow},
+    { "_wxWindow","_class_wxFileDialog",SwigwxFileDialogTowxWindow},
+    { "_wxWindow","_wxFileDialog",SwigwxFileDialogTowxWindow},
+    { "_wxWindow","_class_wxDirDialog",SwigwxDirDialogTowxWindow},
+    { "_wxWindow","_wxDirDialog",SwigwxDirDialogTowxWindow},
+    { "_wxWindow","_class_wxColourDialog",SwigwxColourDialogTowxWindow},
+    { "_wxWindow","_wxColourDialog",SwigwxColourDialogTowxWindow},
+    { "_wxWindow","_class_wxWindow",0},
+    { "_class_wxFrame","_class_wxProgressDialog",SwigwxProgressDialogTowxFrame},
+    { "_class_wxFrame","_wxProgressDialog",SwigwxProgressDialogTowxFrame},
+    { "_class_wxFrame","_wxFrame",0},
+{0,0,0}};
+

 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif
 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif

-SWIGEXPORT(void,initcmndlgsc)() {
+SWIGEXPORT(void) initcmndlgsc() {

         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("cmndlgsc", cmndlgscMethods);
         d = PyModule_GetDict(m);
         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("cmndlgsc", cmndlgscMethods);
         d = PyModule_GetDict(m);

-/*
- * These are the pointer type-equivalency mappings. 
- * (Used by the SWIG pointer type-checker).
- */
-        SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_wxEvent","_class_wxEvent",0);
-        SWIG_RegisterMapping("_class_wxActivateEvent","_wxActivateEvent",0);
-        SWIG_RegisterMapping("_signed_long","_long",0);
-        SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_signed_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_unsigned_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_wxWindowID",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_uint",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_EBool",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_size_t",0);
-        SWIG_RegisterMapping("_wxFontData","_class_wxFontData",0);
-        SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
-        SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxProgressDialog",SwigwxProgressDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxProgressDialog",SwigwxProgressDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxMessageDialog",SwigwxMessageDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxMessageDialog",SwigwxMessageDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxFontDialog",SwigwxFontDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxFontDialog",SwigwxFontDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxTextEntryDialog",SwigwxTextEntryDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxFileDialog",SwigwxFileDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxFileDialog",SwigwxFileDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxDirDialog",SwigwxDirDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxDirDialog",SwigwxDirDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxColourDialog",SwigwxColourDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxColourDialog",SwigwxColourDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxEvtHandler",0);
-        SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
-        SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
-        SWIG_RegisterMapping("_wxNotifyEvent","_class_wxNotifyEvent",0);
-        SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
-        SWIG_RegisterMapping("_class_wxColourData","_wxColourData",0);
-        SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
-        SWIG_RegisterMapping("_wxUpdateUIEvent","_class_wxUpdateUIEvent",0);
-        SWIG_RegisterMapping("_byte","_unsigned_char",0);
-        SWIG_RegisterMapping("_wxStaticBox","_class_wxStaticBox",0);
-        SWIG_RegisterMapping("_wxChoice","_class_wxChoice",0);
-        SWIG_RegisterMapping("_wxSlider","_class_wxSlider",0);
-        SWIG_RegisterMapping("_long","_wxDash",0);
-        SWIG_RegisterMapping("_long","_unsigned_long",0);
-        SWIG_RegisterMapping("_long","_signed_long",0);
-        SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0);
-        SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0);
-        SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_class_wxGauge","_wxGauge",0);
-        SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
-        SWIG_RegisterMapping("_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0);
-        SWIG_RegisterMapping("_wxProgressDialog","_class_wxProgressDialog",0);
-        SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0);
-        SWIG_RegisterMapping("_size_t","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_size_t","_unsigned_int",0);
-        SWIG_RegisterMapping("_size_t","_int",0);
-        SWIG_RegisterMapping("_size_t","_wxWindowID",0);
-        SWIG_RegisterMapping("_size_t","_uint",0);
-        SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
-        SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0);
-        SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0);
-        SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0);
-        SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0);
-        SWIG_RegisterMapping("_class_wxStatusBar","_wxStatusBar",0);
-        SWIG_RegisterMapping("_wxPanel","_class_wxMessageDialog",SwigwxMessageDialogTowxPanel);
-        SWIG_RegisterMapping("_wxPanel","_wxMessageDialog",SwigwxMessageDialogTowxPanel);
-        SWIG_RegisterMapping("_wxPanel","_class_wxFontDialog",SwigwxFontDialogTowxPanel);
-        SWIG_RegisterMapping("_wxPanel","_wxFontDialog",SwigwxFontDialogTowxPanel);
-        SWIG_RegisterMapping("_wxPanel","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxPanel);
-        SWIG_RegisterMapping("_wxPanel","_wxTextEntryDialog",SwigwxTextEntryDialogTowxPanel);
-        SWIG_RegisterMapping("_wxPanel","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxPanel);
-        SWIG_RegisterMapping("_wxPanel","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxPanel);
-        SWIG_RegisterMapping("_wxPanel","_class_wxFileDialog",SwigwxFileDialogTowxPanel);
-        SWIG_RegisterMapping("_wxPanel","_wxFileDialog",SwigwxFileDialogTowxPanel);
-        SWIG_RegisterMapping("_wxPanel","_class_wxDirDialog",SwigwxDirDialogTowxPanel);
-        SWIG_RegisterMapping("_wxPanel","_wxDirDialog",SwigwxDirDialogTowxPanel);
-        SWIG_RegisterMapping("_wxPanel","_class_wxColourDialog",SwigwxColourDialogTowxPanel);
-        SWIG_RegisterMapping("_wxPanel","_wxColourDialog",SwigwxColourDialogTowxPanel);
-        SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);
-        SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
-        SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
-        SWIG_RegisterMapping("_wxPyEvent","_class_wxPyEvent",0);
-        SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);
-        SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
-        SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0);
-        SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
-        SWIG_RegisterMapping("_class_wxDialog","_class_wxMessageDialog",SwigwxMessageDialogTowxDialog);
-        SWIG_RegisterMapping("_class_wxDialog","_wxMessageDialog",SwigwxMessageDialogTowxDialog);
-        SWIG_RegisterMapping("_class_wxDialog","_class_wxFontDialog",SwigwxFontDialogTowxDialog);
-        SWIG_RegisterMapping("_class_wxDialog","_wxFontDialog",SwigwxFontDialogTowxDialog);
-        SWIG_RegisterMapping("_class_wxDialog","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxDialog);
-        SWIG_RegisterMapping("_class_wxDialog","_wxTextEntryDialog",SwigwxTextEntryDialogTowxDialog);
-        SWIG_RegisterMapping("_class_wxDialog","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxDialog);
-        SWIG_RegisterMapping("_class_wxDialog","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxDialog);
-        SWIG_RegisterMapping("_class_wxDialog","_class_wxFileDialog",SwigwxFileDialogTowxDialog);
-        SWIG_RegisterMapping("_class_wxDialog","_wxFileDialog",SwigwxFileDialogTowxDialog);
-        SWIG_RegisterMapping("_class_wxDialog","_class_wxDirDialog",SwigwxDirDialogTowxDialog);
-        SWIG_RegisterMapping("_class_wxDialog","_wxDirDialog",SwigwxDirDialogTowxDialog);
-        SWIG_RegisterMapping("_class_wxDialog","_class_wxColourDialog",SwigwxColourDialogTowxDialog);
-        SWIG_RegisterMapping("_class_wxDialog","_wxColourDialog",SwigwxColourDialogTowxDialog);
-        SWIG_RegisterMapping("_class_wxDialog","_wxDialog",0);
-        SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0);
-        SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0);
-        SWIG_RegisterMapping("_wxToolBar","_class_wxToolBar",0);
-        SWIG_RegisterMapping("_wxStaticLine","_class_wxStaticLine",0);
-        SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
-        SWIG_RegisterMapping("_wxMiniFrame","_class_wxMiniFrame",0);
-        SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0);
-        SWIG_RegisterMapping("_uint","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_uint","_size_t",0);
-        SWIG_RegisterMapping("_uint","_unsigned_int",0);
-        SWIG_RegisterMapping("_uint","_int",0);
-        SWIG_RegisterMapping("_uint","_wxWindowID",0);
-        SWIG_RegisterMapping("_class_wxEvent","_wxEvent",0);
-        SWIG_RegisterMapping("_wxCheckListBox","_class_wxCheckListBox",0);
-        SWIG_RegisterMapping("_wxRect","_class_wxRect",0);
-        SWIG_RegisterMapping("_wxCommandEvent","_class_wxCommandEvent",0);
-        SWIG_RegisterMapping("_wxSizeEvent","_class_wxSizeEvent",0);
-        SWIG_RegisterMapping("_wxPoint","_class_wxPoint",0);
-        SWIG_RegisterMapping("_class_wxButton","_wxButton",0);
-        SWIG_RegisterMapping("_wxRadioBox","_class_wxRadioBox",0);
-        SWIG_RegisterMapping("_class_wxFontData","_wxFontData",0);
-        SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
-        SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0);
-        SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0);
-        SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0);
-        SWIG_RegisterMapping("_wxToolBarTool","_class_wxToolBarTool",0);
-        SWIG_RegisterMapping("_wxColourDialog","_class_wxColourDialog",0);
-        SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_class_wxNotifyEvent","_wxNotifyEvent",0);
-        SWIG_RegisterMapping("_wxMessageDialog","_class_wxMessageDialog",0);
-        SWIG_RegisterMapping("_class_wxPyEvent","_wxPyEvent",0);
-        SWIG_RegisterMapping("_wxTextEntryDialog","_class_wxTextEntryDialog",0);
-        SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
-        SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
-        SWIG_RegisterMapping("_class_wxToolBar","_wxToolBar",0);
-        SWIG_RegisterMapping("_class_wxStaticLine","_wxStaticLine",0);
-        SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0);
-        SWIG_RegisterMapping("_EBool","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_EBool","_signed_int",0);
-        SWIG_RegisterMapping("_EBool","_int",0);
-        SWIG_RegisterMapping("_EBool","_wxWindowID",0);
-        SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
-        SWIG_RegisterMapping("_class_wxDropFilesEvent","_wxDropFilesEvent",0);
-        SWIG_RegisterMapping("_wxStaticText","_class_wxStaticText",0);
-        SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
-        SWIG_RegisterMapping("_wxCloseEvent","_class_wxCloseEvent",0);
-        SWIG_RegisterMapping("_unsigned_long","_wxDash",0);
-        SWIG_RegisterMapping("_unsigned_long","_long",0);
-        SWIG_RegisterMapping("_class_wxRect","_wxRect",0);
-        SWIG_RegisterMapping("_class_wxDC","_wxDC",0);
-        SWIG_RegisterMapping("_class_wxProgressDialog","_wxProgressDialog",0);
-        SWIG_RegisterMapping("_class_wxDirDialog","_wxDirDialog",0);
-        SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxFocusEvent","_class_wxFocusEvent",0);
-        SWIG_RegisterMapping("_wxMaximizeEvent","_class_wxMaximizeEvent",0);
-        SWIG_RegisterMapping("_class_wxSpinButton","_wxSpinButton",0);
-        SWIG_RegisterMapping("_wxAcceleratorEntry","_class_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_class_wxPanel","_class_wxMessageDialog",SwigwxMessageDialogTowxPanel);
-        SWIG_RegisterMapping("_class_wxPanel","_wxMessageDialog",SwigwxMessageDialogTowxPanel);
-        SWIG_RegisterMapping("_class_wxPanel","_class_wxFontDialog",SwigwxFontDialogTowxPanel);
-        SWIG_RegisterMapping("_class_wxPanel","_wxFontDialog",SwigwxFontDialogTowxPanel);
-        SWIG_RegisterMapping("_class_wxPanel","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxPanel);
-        SWIG_RegisterMapping("_class_wxPanel","_wxTextEntryDialog",SwigwxTextEntryDialogTowxPanel);
-        SWIG_RegisterMapping("_class_wxPanel","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxPanel);
-        SWIG_RegisterMapping("_class_wxPanel","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxPanel);
-        SWIG_RegisterMapping("_class_wxPanel","_class_wxFileDialog",SwigwxFileDialogTowxPanel);
-        SWIG_RegisterMapping("_class_wxPanel","_wxFileDialog",SwigwxFileDialogTowxPanel);
-        SWIG_RegisterMapping("_class_wxPanel","_class_wxDirDialog",SwigwxDirDialogTowxPanel);
-        SWIG_RegisterMapping("_class_wxPanel","_wxDirDialog",SwigwxDirDialogTowxPanel);
-        SWIG_RegisterMapping("_class_wxPanel","_class_wxColourDialog",SwigwxColourDialogTowxPanel);
-        SWIG_RegisterMapping("_class_wxPanel","_wxColourDialog",SwigwxColourDialogTowxPanel);
-        SWIG_RegisterMapping("_class_wxPanel","_wxPanel",0);
-        SWIG_RegisterMapping("_class_wxCheckBox","_wxCheckBox",0);
-        SWIG_RegisterMapping("_wxComboBox","_class_wxComboBox",0);
-        SWIG_RegisterMapping("_wxRadioButton","_class_wxRadioButton",0);
-        SWIG_RegisterMapping("_class_wxMessageDialog","_wxMessageDialog",0);
-        SWIG_RegisterMapping("_signed_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_signed_int","_EBool",0);
-        SWIG_RegisterMapping("_signed_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_signed_int","_int",0);
-        SWIG_RegisterMapping("_class_wxTextCtrl","_wxTextCtrl",0);
-        SWIG_RegisterMapping("_wxLayoutConstraints","_class_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_wxMetaFileDC","_class_wxMetaFileDC",0);
-        SWIG_RegisterMapping("_wxMenu","_class_wxMenu",0);
-        SWIG_RegisterMapping("_class_wxMoveEvent","_wxMoveEvent",0);
-        SWIG_RegisterMapping("_wxListBox","_class_wxListBox",0);
-        SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0);
-        SWIG_RegisterMapping("_WXTYPE","_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_signed_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_unsigned_short",0);
-        SWIG_RegisterMapping("_wxFileDialog","_class_wxFileDialog",0);
-        SWIG_RegisterMapping("_class_wxBrush","_wxBrush",0);
-        SWIG_RegisterMapping("_unsigned_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_unsigned_short","_short",0);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxProgressDialog",SwigwxProgressDialogTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxProgressDialog",SwigwxProgressDialogTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxMessageDialog",SwigwxMessageDialogTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxMessageDialog",SwigwxMessageDialogTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxFontDialog",SwigwxFontDialogTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxFontDialog",SwigwxFontDialogTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxTextEntryDialog",SwigwxTextEntryDialogTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxFileDialog",SwigwxFileDialogTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxFileDialog",SwigwxFileDialogTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxDirDialog",SwigwxDirDialogTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxDirDialog",SwigwxDirDialogTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxColourDialog",SwigwxColourDialogTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxColourDialog",SwigwxColourDialogTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxWindow",0);
-        SWIG_RegisterMapping("_class_wxStaticText","_wxStaticText",0);
-        SWIG_RegisterMapping("_class_wxFont","_wxFont",0);
-        SWIG_RegisterMapping("_class_wxCloseEvent","_wxCloseEvent",0);
-        SWIG_RegisterMapping("_class_wxMenuEvent","_wxMenuEvent",0);
-        SWIG_RegisterMapping("_wxClientDC","_class_wxClientDC",0);
-        SWIG_RegisterMapping("_wxMouseEvent","_class_wxMouseEvent",0);
-        SWIG_RegisterMapping("_wxSingleChoiceDialog","_class_wxSingleChoiceDialog",0);
-        SWIG_RegisterMapping("_class_wxPoint","_wxPoint",0);
-        SWIG_RegisterMapping("_wxRealPoint","_class_wxRealPoint",0);
-        SWIG_RegisterMapping("_class_wxRadioBox","_wxRadioBox",0);
-        SWIG_RegisterMapping("_signed_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_signed_short","_short",0);
-        SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0);
-        SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
-        SWIG_RegisterMapping("_class_wxWindowDC","_wxWindowDC",0);
-        SWIG_RegisterMapping("_class_wxFocusEvent","_wxFocusEvent",0);
-        SWIG_RegisterMapping("_class_wxMaximizeEvent","_wxMaximizeEvent",0);
-        SWIG_RegisterMapping("_wxStatusBar","_class_wxStatusBar",0);
-        SWIG_RegisterMapping("_class_wxToolBarTool","_wxToolBarTool",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
-        SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0);
-        SWIG_RegisterMapping("_unsigned_char","_byte",0);
-        SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0);
-        SWIG_RegisterMapping("_class_wxMenu","_wxMenu",0);
-        SWIG_RegisterMapping("_wxControl","_class_wxControl",0);
-        SWIG_RegisterMapping("_class_wxListBox","_wxListBox",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_unsigned_int","_size_t",0);
-        SWIG_RegisterMapping("_unsigned_int","_uint",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_unsigned_int","_int",0);
-        SWIG_RegisterMapping("_wxIcon","_class_wxIcon",0);
-        SWIG_RegisterMapping("_wxDialog","_class_wxMessageDialog",SwigwxMessageDialogTowxDialog);
-        SWIG_RegisterMapping("_wxDialog","_wxMessageDialog",SwigwxMessageDialogTowxDialog);
-        SWIG_RegisterMapping("_wxDialog","_class_wxFontDialog",SwigwxFontDialogTowxDialog);
-        SWIG_RegisterMapping("_wxDialog","_wxFontDialog",SwigwxFontDialogTowxDialog);
-        SWIG_RegisterMapping("_wxDialog","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxDialog);
-        SWIG_RegisterMapping("_wxDialog","_wxTextEntryDialog",SwigwxTextEntryDialogTowxDialog);
-        SWIG_RegisterMapping("_wxDialog","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxDialog);
-        SWIG_RegisterMapping("_wxDialog","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxDialog);
-        SWIG_RegisterMapping("_wxDialog","_class_wxFileDialog",SwigwxFileDialogTowxDialog);
-        SWIG_RegisterMapping("_wxDialog","_wxFileDialog",SwigwxFileDialogTowxDialog);
-        SWIG_RegisterMapping("_wxDialog","_class_wxDirDialog",SwigwxDirDialogTowxDialog);
-        SWIG_RegisterMapping("_wxDialog","_wxDirDialog",SwigwxDirDialogTowxDialog);
-        SWIG_RegisterMapping("_wxDialog","_class_wxColourDialog",SwigwxColourDialogTowxDialog);
-        SWIG_RegisterMapping("_wxDialog","_wxColourDialog",SwigwxColourDialogTowxDialog);
-        SWIG_RegisterMapping("_wxDialog","_class_wxDialog",0);
-        SWIG_RegisterMapping("_class_wxPen","_wxPen",0);
-        SWIG_RegisterMapping("_class_wxFileDialog","_wxFileDialog",0);
-        SWIG_RegisterMapping("_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_short","_unsigned_short",0);
-        SWIG_RegisterMapping("_short","_signed_short",0);
-        SWIG_RegisterMapping("_class_wxStaticBox","_wxStaticBox",0);
-        SWIG_RegisterMapping("_class_wxScrollEvent","_wxScrollEvent",0);
-        SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0);
-        SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
-        SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);
-        SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0);
-        SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
-        SWIG_RegisterMapping("_wxFrame","_class_wxProgressDialog",SwigwxProgressDialogTowxFrame);
-        SWIG_RegisterMapping("_wxFrame","_wxProgressDialog",SwigwxProgressDialogTowxFrame);
-        SWIG_RegisterMapping("_wxFrame","_class_wxFrame",0);
-        SWIG_RegisterMapping("_wxWindowID","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_wxWindowID","_size_t",0);
-        SWIG_RegisterMapping("_wxWindowID","_EBool",0);
-        SWIG_RegisterMapping("_wxWindowID","_uint",0);
-        SWIG_RegisterMapping("_wxWindowID","_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_signed_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_int","_size_t",0);
-        SWIG_RegisterMapping("_int","_EBool",0);
-        SWIG_RegisterMapping("_int","_uint",0);
-        SWIG_RegisterMapping("_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_int","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_signed_int",0);
-        SWIG_RegisterMapping("_class_wxMouseEvent","_wxMouseEvent",0);
-        SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0);
-        SWIG_RegisterMapping("_wxButton","_class_wxButton",0);
-        SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
-        SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
-        SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
-        SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
-        SWIG_RegisterMapping("_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0);
-        SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0);
-        SWIG_RegisterMapping("_class_wxComboBox","_wxComboBox",0);
-        SWIG_RegisterMapping("_class_wxRadioButton","_wxRadioButton",0);
-        SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_wxIconizeEvent","_class_wxIconizeEvent",0);
-        SWIG_RegisterMapping("_class_wxControl","_wxControl",0);
-        SWIG_RegisterMapping("_wxStaticBitmap","_class_wxStaticBitmap",0);
-        SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
-        SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
-        SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
-        SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
-        SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0);
-        SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
-        SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
-        SWIG_RegisterMapping("_class_wxMiniFrame","_wxMiniFrame",0);
-        SWIG_RegisterMapping("_wxFontDialog","_class_wxFontDialog",0);
-        SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
-        SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
-        SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
-        SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0);
-        SWIG_RegisterMapping("_class_wxCheckListBox","_wxCheckListBox",0);
-        SWIG_RegisterMapping("_class_wxCommandEvent","_wxCommandEvent",0);
-        SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
-        SWIG_RegisterMapping("_class_wxSizeEvent","_wxSizeEvent",0);
-        SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
-        SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0);
-        SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0);
-        SWIG_RegisterMapping("_wxMenuBar","_class_wxMenuBar",0);
-        SWIG_RegisterMapping("_wxDirDialog","_class_wxDirDialog",0);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxProgressDialog",SwigwxProgressDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxProgressDialog",SwigwxProgressDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxMessageDialog",SwigwxMessageDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxMessageDialog",SwigwxMessageDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxFontDialog",SwigwxFontDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxFontDialog",SwigwxFontDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxTextEntryDialog",SwigwxTextEntryDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxFileDialog",SwigwxFileDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxFileDialog",SwigwxFileDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxDirDialog",SwigwxDirDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxDirDialog",SwigwxDirDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxColourDialog",SwigwxColourDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxColourDialog",SwigwxColourDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxEvtHandler",0);
-        SWIG_RegisterMapping("_wxMenuItem","_class_wxMenuItem",0);
-        SWIG_RegisterMapping("_class_wxScrollBar","_wxScrollBar",0);
-        SWIG_RegisterMapping("_class_wxColourDialog","_wxColourDialog",0);
-        SWIG_RegisterMapping("_wxDash","_unsigned_long",0);
-        SWIG_RegisterMapping("_wxDash","_long",0);
-        SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
-        SWIG_RegisterMapping("_class_wxTextEntryDialog","_wxTextEntryDialog",0);
-        SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0);
-        SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0);
-        SWIG_RegisterMapping("_wxColourData","_class_wxColourData",0);
-        SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
-        SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0);
-        SWIG_RegisterMapping("_class_wxFontDialog","_wxFontDialog",0);
-        SWIG_RegisterMapping("_wxWindow","_class_wxProgressDialog",SwigwxProgressDialogTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxProgressDialog",SwigwxProgressDialogTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxMessageDialog",SwigwxMessageDialogTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxMessageDialog",SwigwxMessageDialogTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxFontDialog",SwigwxFontDialogTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxFontDialog",SwigwxFontDialogTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxTextEntryDialog",SwigwxTextEntryDialogTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxFileDialog",SwigwxFileDialogTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxFileDialog",SwigwxFileDialogTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxDirDialog",SwigwxDirDialogTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxDirDialog",SwigwxDirDialogTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxColourDialog",SwigwxColourDialogTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxColourDialog",SwigwxColourDialogTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxWindow",0);
-        SWIG_RegisterMapping("_class_wxFrame","_class_wxProgressDialog",SwigwxProgressDialogTowxFrame);
-        SWIG_RegisterMapping("_class_wxFrame","_wxProgressDialog",SwigwxProgressDialogTowxFrame);
-        SWIG_RegisterMapping("_class_wxFrame","_wxFrame",0);
+{
+   int i;
+   for (i = 0; _swig_mapping[i].n1; i++)
+        SWIG_RegisterMapping(_swig_mapping[i].n1,_swig_mapping[i].n2,_swig_mapping[i].pcnv);
+}

 }
 }

diff --git a/utils/wxPython/src/msw/cmndlgs.py b/utils/wxPython/src/msw/cmndlgs.py
index beea9f3dd31c264e59421936430a2de822523c28..52e107501ad9015044f1adc2c79b40ce8286d55a 100644 (file)
--- a/utils/wxPython/src/msw/cmndlgs.py
+++ b/utils/wxPython/src/msw/cmndlgs.py
@@ -19,35 +19,34 @@ class wxColourDataPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self, cmndlgsc=cmndlgsc):
+    def __del__(self,cmndlgsc=cmndlgsc):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            cmndlgsc.delete_wxColourData(self.this)
-    def GetChooseFull(self):
-        val = cmndlgsc.wxColourData_GetChooseFull(self.this)
+            cmndlgsc.delete_wxColourData(self)
+    def GetChooseFull(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxColourData_GetChooseFull,(self,) + _args, _kwargs)

         return val
         return val

-    def GetColour(self):
-        val = cmndlgsc.wxColourData_GetColour(self.this)
-        val = wxColourPtr(val)
+    def GetColour(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxColourData_GetColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) 

         return val
         return val

-    def GetCustomColour(self,arg0):
-        val = cmndlgsc.wxColourData_GetCustomColour(self.this,arg0)
-        val = wxColourPtr(val)
-        val.thisown = 1
+    def GetCustomColour(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxColourData_GetCustomColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) ; val.thisown = 1

         return val
         return val

-    def SetChooseFull(self,arg0):
-        val = cmndlgsc.wxColourData_SetChooseFull(self.this,arg0)
+    def SetChooseFull(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxColourData_SetChooseFull,(self,) + _args, _kwargs)

         return val
         return val

-    def SetColour(self,arg0):
-        val = cmndlgsc.wxColourData_SetColour(self.this,arg0.this)
+    def SetColour(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxColourData_SetColour,(self,) + _args, _kwargs)

         return val
         return val

-    def SetCustomColour(self,arg0,arg1):
-        val = cmndlgsc.wxColourData_SetCustomColour(self.this,arg0,arg1.this)
+    def SetCustomColour(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxColourData_SetCustomColour,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxColourData instance>"
+        return "<C wxColourData instance at %s>" % (self.this,)

 class wxColourData(wxColourDataPtr):
 class wxColourData(wxColourDataPtr):

-    def __init__(self) :
-        self.this = cmndlgsc.new_wxColourData()
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(cmndlgsc.new_wxColourData,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -57,22 +56,18 @@ class wxColourDialogPtr(wxDialogPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetColourData(self):
-        val = cmndlgsc.wxColourDialog_GetColourData(self.this)
-        val = wxColourDataPtr(val)
+    def GetColourData(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxColourDialog_GetColourData,(self,) + _args, _kwargs)
+        if val: val = wxColourDataPtr(val) 

         return val
         return val

-    def ShowModal(self):
-        val = cmndlgsc.wxColourDialog_ShowModal(self.this)
+    def ShowModal(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxColourDialog_ShowModal,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxColourDialog instance>"
+        return "<C wxColourDialog instance at %s>" % (self.this,)

 class wxColourDialog(wxColourDialogPtr):
 class wxColourDialog(wxColourDialogPtr):

-    def __init__(self,arg0,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(cmndlgsc.new_wxColourDialog,(arg0.this,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(cmndlgsc.new_wxColourDialog,_args,_kwargs)

         self.thisown = 1
         wx._StdDialogCallbacks(self)
 
         self.thisown = 1
         wx._StdDialogCallbacks(self)
 


@@ -83,33 +78,29 @@ class wxDirDialogPtr(wxDialogPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetPath(self):
-        val = cmndlgsc.wxDirDialog_GetPath(self.this)
+    def GetPath(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxDirDialog_GetPath,(self,) + _args, _kwargs)

         return val
         return val

-    def GetMessage(self):
-        val = cmndlgsc.wxDirDialog_GetMessage(self.this)
+    def GetMessage(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxDirDialog_GetMessage,(self,) + _args, _kwargs)

         return val
         return val

-    def GetStyle(self):
-        val = cmndlgsc.wxDirDialog_GetStyle(self.this)
+    def GetStyle(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxDirDialog_GetStyle,(self,) + _args, _kwargs)

         return val
         return val

-    def SetMessage(self,arg0):
-        val = cmndlgsc.wxDirDialog_SetMessage(self.this,arg0)
+    def SetMessage(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxDirDialog_SetMessage,(self,) + _args, _kwargs)

         return val
         return val

-    def SetPath(self,arg0):
-        val = cmndlgsc.wxDirDialog_SetPath(self.this,arg0)
+    def SetPath(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxDirDialog_SetPath,(self,) + _args, _kwargs)

         return val
         return val

-    def ShowModal(self):
-        val = cmndlgsc.wxDirDialog_ShowModal(self.this)
+    def ShowModal(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxDirDialog_ShowModal,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxDirDialog instance>"
+        return "<C wxDirDialog instance at %s>" % (self.this,)

 class wxDirDialog(wxDirDialogPtr):
 class wxDirDialog(wxDirDialogPtr):

-    def __init__(self,arg0,*args) :
-        argl = map(None,args)
-        try: argl[3] = argl[3].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(cmndlgsc.new_wxDirDialog,(arg0.this,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(cmndlgsc.new_wxDirDialog,_args,_kwargs)

         self.thisown = 1
         wx._StdDialogCallbacks(self)
 
         self.thisown = 1
         wx._StdDialogCallbacks(self)
 


@@ -120,60 +111,56 @@ class wxFileDialogPtr(wxDialogPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetDirectory(self):
-        val = cmndlgsc.wxFileDialog_GetDirectory(self.this)
+    def GetDirectory(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxFileDialog_GetDirectory,(self,) + _args, _kwargs)

         return val
         return val

-    def GetFilename(self):
-        val = cmndlgsc.wxFileDialog_GetFilename(self.this)
+    def GetFilename(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxFileDialog_GetFilename,(self,) + _args, _kwargs)

         return val
         return val

-    def GetFilterIndex(self):
-        val = cmndlgsc.wxFileDialog_GetFilterIndex(self.this)
+    def GetFilterIndex(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxFileDialog_GetFilterIndex,(self,) + _args, _kwargs)

         return val
         return val

-    def GetMessage(self):
-        val = cmndlgsc.wxFileDialog_GetMessage(self.this)
+    def GetMessage(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxFileDialog_GetMessage,(self,) + _args, _kwargs)

         return val
         return val

-    def GetPath(self):
-        val = cmndlgsc.wxFileDialog_GetPath(self.this)
+    def GetPath(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxFileDialog_GetPath,(self,) + _args, _kwargs)

         return val
         return val

-    def GetStyle(self):
-        val = cmndlgsc.wxFileDialog_GetStyle(self.this)
+    def GetStyle(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxFileDialog_GetStyle,(self,) + _args, _kwargs)

         return val
         return val

-    def GetWildcard(self):
-        val = cmndlgsc.wxFileDialog_GetWildcard(self.this)
+    def GetWildcard(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxFileDialog_GetWildcard,(self,) + _args, _kwargs)

         return val
         return val

-    def SetDirectory(self,arg0):
-        val = cmndlgsc.wxFileDialog_SetDirectory(self.this,arg0)
+    def SetDirectory(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxFileDialog_SetDirectory,(self,) + _args, _kwargs)

         return val
         return val

-    def SetFilename(self,arg0):
-        val = cmndlgsc.wxFileDialog_SetFilename(self.this,arg0)
+    def SetFilename(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxFileDialog_SetFilename,(self,) + _args, _kwargs)

         return val
         return val

-    def SetFilterIndex(self,arg0):
-        val = cmndlgsc.wxFileDialog_SetFilterIndex(self.this,arg0)
+    def SetFilterIndex(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxFileDialog_SetFilterIndex,(self,) + _args, _kwargs)

         return val
         return val

-    def SetMessage(self,arg0):
-        val = cmndlgsc.wxFileDialog_SetMessage(self.this,arg0)
+    def SetMessage(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxFileDialog_SetMessage,(self,) + _args, _kwargs)

         return val
         return val

-    def SetPath(self,arg0):
-        val = cmndlgsc.wxFileDialog_SetPath(self.this,arg0)
+    def SetPath(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxFileDialog_SetPath,(self,) + _args, _kwargs)

         return val
         return val

-    def SetStyle(self,arg0):
-        val = cmndlgsc.wxFileDialog_SetStyle(self.this,arg0)
+    def SetStyle(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxFileDialog_SetStyle,(self,) + _args, _kwargs)

         return val
         return val

-    def SetWildcard(self,arg0):
-        val = cmndlgsc.wxFileDialog_SetWildcard(self.this,arg0)
+    def SetWildcard(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxFileDialog_SetWildcard,(self,) + _args, _kwargs)

         return val
         return val

-    def ShowModal(self):
-        val = cmndlgsc.wxFileDialog_ShowModal(self.this)
+    def ShowModal(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxFileDialog_ShowModal,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxFileDialog instance>"
+        return "<C wxFileDialog instance at %s>" % (self.this,)

 class wxFileDialog(wxFileDialogPtr):
 class wxFileDialog(wxFileDialogPtr):

-    def __init__(self,arg0,*args) :
-        argl = map(None,args)
-        try: argl[5] = argl[5].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(cmndlgsc.new_wxFileDialog,(arg0.this,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(cmndlgsc.new_wxFileDialog,_args,_kwargs)

         self.thisown = 1
         wx._StdDialogCallbacks(self)
 
         self.thisown = 1
         wx._StdDialogCallbacks(self)
 


@@ -184,27 +171,23 @@ class wxSingleChoiceDialogPtr(wxDialogPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetSelection(self):
-        val = cmndlgsc.wxSingleChoiceDialog_GetSelection(self.this)
+    def GetSelection(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxSingleChoiceDialog_GetSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def GetStringSelection(self):
-        val = cmndlgsc.wxSingleChoiceDialog_GetStringSelection(self.this)
+    def GetStringSelection(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxSingleChoiceDialog_GetStringSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def SetSelection(self,arg0):
-        val = cmndlgsc.wxSingleChoiceDialog_SetSelection(self.this,arg0)
+    def SetSelection(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxSingleChoiceDialog_SetSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def ShowModal(self):
-        val = cmndlgsc.wxSingleChoiceDialog_ShowModal(self.this)
+    def ShowModal(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxSingleChoiceDialog_ShowModal,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxSingleChoiceDialog instance>"
+        return "<C wxSingleChoiceDialog instance at %s>" % (self.this,)

 class wxSingleChoiceDialog(wxSingleChoiceDialogPtr):
 class wxSingleChoiceDialog(wxSingleChoiceDialogPtr):

-    def __init__(self,arg0,arg1,arg2,arg3,*args) :
-        argl = map(None,args)
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(cmndlgsc.new_wxSingleChoiceDialog,(arg0.this,arg1,arg2,arg3,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(cmndlgsc.new_wxSingleChoiceDialog,_args,_kwargs)

         self.thisown = 1
         wx._StdDialogCallbacks(self)
 
         self.thisown = 1
         wx._StdDialogCallbacks(self)
 


@@ -215,24 +198,20 @@ class wxTextEntryDialogPtr(wxDialogPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetValue(self):
-        val = cmndlgsc.wxTextEntryDialog_GetValue(self.this)
+    def GetValue(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxTextEntryDialog_GetValue,(self,) + _args, _kwargs)

         return val
         return val

-    def SetValue(self,arg0):
-        val = cmndlgsc.wxTextEntryDialog_SetValue(self.this,arg0)
+    def SetValue(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxTextEntryDialog_SetValue,(self,) + _args, _kwargs)

         return val
         return val

-    def ShowModal(self):
-        val = cmndlgsc.wxTextEntryDialog_ShowModal(self.this)
+    def ShowModal(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxTextEntryDialog_ShowModal,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxTextEntryDialog instance>"
+        return "<C wxTextEntryDialog instance at %s>" % (self.this,)

 class wxTextEntryDialog(wxTextEntryDialogPtr):
 class wxTextEntryDialog(wxTextEntryDialogPtr):

-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[3] = argl[3].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(cmndlgsc.new_wxTextEntryDialog,(arg0.this,arg1,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(cmndlgsc.new_wxTextEntryDialog,_args,_kwargs)

         self.thisown = 1
         wx._StdDialogCallbacks(self)
 
         self.thisown = 1
         wx._StdDialogCallbacks(self)
 


@@ -243,58 +222,56 @@ class wxFontDataPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self, cmndlgsc=cmndlgsc):
+    def __del__(self,cmndlgsc=cmndlgsc):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            cmndlgsc.delete_wxFontData(self.this)
-    def EnableEffects(self,arg0):
-        val = cmndlgsc.wxFontData_EnableEffects(self.this,arg0)
+            cmndlgsc.delete_wxFontData(self)
+    def EnableEffects(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxFontData_EnableEffects,(self,) + _args, _kwargs)

         return val
         return val

-    def GetAllowSymbols(self):
-        val = cmndlgsc.wxFontData_GetAllowSymbols(self.this)
+    def GetAllowSymbols(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxFontData_GetAllowSymbols,(self,) + _args, _kwargs)

         return val
         return val

-    def GetColour(self):
-        val = cmndlgsc.wxFontData_GetColour(self.this)
-        val = wxColourPtr(val)
+    def GetColour(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxFontData_GetColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) 

         return val
         return val

-    def GetChosenFont(self):
-        val = cmndlgsc.wxFontData_GetChosenFont(self.this)
-        val = wxFontPtr(val)
-        val.thisown = 1
+    def GetChosenFont(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxFontData_GetChosenFont,(self,) + _args, _kwargs)
+        if val: val = wxFontPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetEnableEffects(self):
-        val = cmndlgsc.wxFontData_GetEnableEffects(self.this)
+    def GetEnableEffects(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxFontData_GetEnableEffects,(self,) + _args, _kwargs)

         return val
         return val

-    def GetInitialFont(self):
-        val = cmndlgsc.wxFontData_GetInitialFont(self.this)
-        val = wxFontPtr(val)
-        val.thisown = 1
+    def GetInitialFont(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxFontData_GetInitialFont,(self,) + _args, _kwargs)
+        if val: val = wxFontPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetShowHelp(self):
-        val = cmndlgsc.wxFontData_GetShowHelp(self.this)
+    def GetShowHelp(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxFontData_GetShowHelp,(self,) + _args, _kwargs)

         return val
         return val

-    def SetAllowSymbols(self,arg0):
-        val = cmndlgsc.wxFontData_SetAllowSymbols(self.this,arg0)
+    def SetAllowSymbols(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxFontData_SetAllowSymbols,(self,) + _args, _kwargs)

         return val
         return val

-    def SetChosenFont(self,arg0):
-        val = cmndlgsc.wxFontData_SetChosenFont(self.this,arg0.this)
+    def SetChosenFont(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxFontData_SetChosenFont,(self,) + _args, _kwargs)

         return val
         return val

-    def SetColour(self,arg0):
-        val = cmndlgsc.wxFontData_SetColour(self.this,arg0.this)
+    def SetColour(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxFontData_SetColour,(self,) + _args, _kwargs)

         return val
         return val

-    def SetInitialFont(self,arg0):
-        val = cmndlgsc.wxFontData_SetInitialFont(self.this,arg0.this)
+    def SetInitialFont(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxFontData_SetInitialFont,(self,) + _args, _kwargs)

         return val
         return val

-    def SetRange(self,arg0,arg1):
-        val = cmndlgsc.wxFontData_SetRange(self.this,arg0,arg1)
+    def SetRange(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxFontData_SetRange,(self,) + _args, _kwargs)

         return val
         return val

-    def SetShowHelp(self,arg0):
-        val = cmndlgsc.wxFontData_SetShowHelp(self.this,arg0)
+    def SetShowHelp(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxFontData_SetShowHelp,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxFontData instance>"
+        return "<C wxFontData instance at %s>" % (self.this,)

 class wxFontData(wxFontDataPtr):
 class wxFontData(wxFontDataPtr):

-    def __init__(self) :
-        self.this = cmndlgsc.new_wxFontData()
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(cmndlgsc.new_wxFontData,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -304,22 +281,18 @@ class wxFontDialogPtr(wxDialogPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetFontData(self):
-        val = cmndlgsc.wxFontDialog_GetFontData(self.this)
-        val = wxFontDataPtr(val)
+    def GetFontData(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxFontDialog_GetFontData,(self,) + _args, _kwargs)
+        if val: val = wxFontDataPtr(val) 

         return val
         return val

-    def ShowModal(self):
-        val = cmndlgsc.wxFontDialog_ShowModal(self.this)
+    def ShowModal(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxFontDialog_ShowModal,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxFontDialog instance>"
+        return "<C wxFontDialog instance at %s>" % (self.this,)

 class wxFontDialog(wxFontDialogPtr):
 class wxFontDialog(wxFontDialogPtr):

-    def __init__(self,arg0,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(cmndlgsc.new_wxFontDialog,(arg0.this,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(cmndlgsc.new_wxFontDialog,_args,_kwargs)

         self.thisown = 1
         wx._StdDialogCallbacks(self)
 
         self.thisown = 1
         wx._StdDialogCallbacks(self)
 


@@ -330,18 +303,14 @@ class wxMessageDialogPtr(wxDialogPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def ShowModal(self):
-        val = cmndlgsc.wxMessageDialog_ShowModal(self.this)
+    def ShowModal(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxMessageDialog_ShowModal,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxMessageDialog instance>"
+        return "<C wxMessageDialog instance at %s>" % (self.this,)

 class wxMessageDialog(wxMessageDialogPtr):
 class wxMessageDialog(wxMessageDialogPtr):

-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[2] = argl[2].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(cmndlgsc.new_wxMessageDialog,(arg0.this,arg1,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(cmndlgsc.new_wxMessageDialog,_args,_kwargs)

         self.thisown = 1
         wx._StdDialogCallbacks(self)
 
         self.thisown = 1
         wx._StdDialogCallbacks(self)
 


@@ -352,21 +321,17 @@ class wxProgressDialogPtr(wxFramePtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def Update(self,*args):
-        val = apply(cmndlgsc.wxProgressDialog_Update,(self.this,)+args)
+    def Update(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxProgressDialog_Update,(self,) + _args, _kwargs)

         return val
         return val

-    def Resume(self):
-        val = cmndlgsc.wxProgressDialog_Resume(self.this)
+    def Resume(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxProgressDialog_Resume,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxProgressDialog instance>"
+        return "<C wxProgressDialog instance at %s>" % (self.this,)

 class wxProgressDialog(wxProgressDialogPtr):
 class wxProgressDialog(wxProgressDialogPtr):

-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(cmndlgsc.new_wxProgressDialog,(arg0,arg1,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(cmndlgsc.new_wxProgressDialog,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 

diff --git a/utils/wxPython/src/msw/controls.cpp b/utils/wxPython/src/msw/controls.cpp
index cf3caafc35b47a2b307271648b41fd1f21f1bb08..f75b98b5e27e7ad310ecb91eb9a03281c0b24985 100644 (file)
--- a/utils/wxPython/src/msw/controls.cpp
+++ b/utils/wxPython/src/msw/controls.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)

- * Version 1.1 (Patch 5)
+ * Version 1.1 (Patch 6)

  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.


@@ -24,16 +24,16 @@
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)

-#      define SWIGEXPORT(a,b) __declspec(dllexport) a b
+#      define SWIGEXPORT(a) __declspec(dllexport) a

 #   else
 #      if defined(__BORLANDC__)
 #   else
 #      if defined(__BORLANDC__)

-#          define SWIGEXPORT(a,b) a _export b
+#          define SWIGEXPORT(a) a _export 

 #      else
 #      else

-#          define SWIGEXPORT(a,b) a b
+#          define SWIGEXPORT(a) a 

 #      endif
 #   endif
 #else
 #      endif
 #   endif
 #else

-#   define SWIGEXPORT(a,b) a b
+#   define SWIGEXPORT(a) a 

 #endif
 
 #ifdef __cplusplus
 #endif
 
 #ifdef __cplusplus


@@ -43,12 +43,12 @@ extern "C" {
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);

+extern char *SWIG_GetPtrObj(PyObject *, void **, char *);

 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif
 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif

-

 #define SWIG_init    initcontrolsc
 
 #define SWIG_name    "controlsc"
 #define SWIG_init    initcontrolsc
 
 #define SWIG_name    "controlsc"


@@ -72,12 +72,13 @@ extern PyObject *SWIG_newvarlink(void);
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;

-    if (!target) {
+    PyObject*   o3;
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);
         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);


@@ -94,23 +95,23 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
     PyObject*   o3;
 
     PyObject*   o2;
     PyObject*   o3;
 

-    if (!target) {
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }
         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }

-        o3 = PyTuple_New(1);
-        PyTuple_SetItem(o3, 0, o);
+        o3 = PyTuple_New(1);            
+        PyTuple_SetItem(o3, 0, o);      

 
         o2 = target;
 
         o2 = target;

-        target = PySequence_Concat(o2, o3);
-        Py_DECREF(o2);
+        target = PySequence_Concat(o2, o3); 
+        Py_DECREF(o2);                      

         Py_DECREF(o3);
     }
     return target;
         Py_DECREF(o3);
     }
     return target;


@@ -130,6 +131,9 @@ extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
 static char* wxStringErrorMsg = "string type is required for parameter";
 
 wxValidator wxPyDefaultValidator;       // Non-const default because of SWIG
 static char* wxStringErrorMsg = "string type is required for parameter";
 
 wxValidator wxPyDefaultValidator;       // Non-const default because of SWIG

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

 static void *SwigwxControlTowxWindow(void *ptr) {
     wxControl *src;
     wxWindow *dest;
 static void *SwigwxControlTowxWindow(void *ptr) {
     wxControl *src;
     wxWindow *dest;


@@ -151,20 +155,22 @@ static PyObject *_wrap_wxControl_Command(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxControl * _arg0;
     wxCommandEvent * _arg1;
     PyObject * _resultobj;
     wxControl * _arg0;
     wxCommandEvent * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxControl_Command",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxControl_Command",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxControl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxControl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxControl_Command. Expected _wxControl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxControl_Command. Expected _wxControl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxCommandEvent_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxCommandEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxControl_Command. Expected _wxCommandEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxControl_Command. Expected _wxCommandEvent_p.");
         return NULL;
         }


@@ -184,13 +190,14 @@ static PyObject *_wrap_wxControl_GetLabel(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxControl * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxControl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxControl_GetLabel",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxControl_GetLabel",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxControl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxControl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxControl_GetLabel. Expected _wxControl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxControl_GetLabel. Expected _wxControl_p.");
         return NULL;
         }


@@ -214,14 +221,15 @@ static PyObject *_wrap_wxControl_SetLabel(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxControl * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxControl * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxControl_SetLabel",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxControl_SetLabel",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxControl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxControl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxControl_SetLabel. Expected _wxControl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxControl_SetLabel. Expected _wxControl_p.");
         return NULL;
         }


@@ -278,23 +286,24 @@ static PyObject *_wrap_new_wxButton(PyObject *self, PyObject *args) {
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;

-    wxPoint * _arg3 = &wxPyDefaultPosition;
-    wxSize * _arg4 = &wxPyDefaultSize;
-    long  _arg5 = 0;
-    wxValidator * _arg6 = &wxPyDefaultValidator;
-    char * _arg7 = "button";
-    char * _argc0 = 0;
+    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    long  _arg5 = (long ) 0;
+    wxValidator * _arg6 = (wxValidator *) &wxPyDefaultValidator;
+    char * _arg7 = (char *) "button";
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
     PyObject * _obj2 = 0;

-    char * _argc3 = 0;
-    char * _argc4 = 0;
-    char * _argc6 = 0;
+    PyObject * _argo3 = 0;
+    PyObject * _argo4 = 0;
+    PyObject * _argo6 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siO|sslss:new_wxButton",&_argc0,&_arg1,&_obj2,&_argc3,&_argc4,&_arg5,&_argc6,&_arg7)) 
+    if(!PyArg_ParseTuple(args,"OiO|OOlOs:new_wxButton",&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_argo6,&_arg7)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxButton. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxButton. Expected _wxWindow_p.");
         return NULL;
         }


@@ -306,20 +315,23 @@ static PyObject *_wrap_new_wxButton(PyObject *self, PyObject *args) {
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxPoint_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxButton. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxButton. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_wxSize_p")) {
+    if (_argo4) {
+        if (_argo4 == Py_None) { _arg4 = NULL; }
+        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxButton. Expected _wxSize_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxButton. Expected _wxSize_p.");
         return NULL;
         }
     }

-    if (_argc6) {
-        if (SWIG_GetPtr(_argc6,(void **) &_arg6,"_wxValidator_p")) {
+    if (_argo6) {
+        if (_argo6 == Py_None) { _arg6 = NULL; }
+        else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxValidator_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of new_wxButton. Expected _wxValidator_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of new_wxButton. Expected _wxValidator_p.");
         return NULL;
         }


@@ -329,8 +341,13 @@ static PyObject *_wrap_new_wxButton(PyObject *self, PyObject *args) {
         _result = (wxButton *)new_wxButton(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,*_arg6,_arg7);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxButton *)new_wxButton(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,*_arg6,_arg7);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxButton_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxButton_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     if (_obj2)
         delete _arg2;
 {
     if (_obj2)
         delete _arg2;


@@ -342,13 +359,14 @@ static PyObject *_wrap_new_wxButton(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxButton_SetDefault(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxButton * _arg0;
 static PyObject *_wrap_wxButton_SetDefault(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxButton * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxButton_SetDefault",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxButton_SetDefault",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxButton_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxButton_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxButton_SetDefault. Expected _wxButton_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxButton_SetDefault. Expected _wxButton_p.");
         return NULL;
         }


@@ -402,47 +420,52 @@ static PyObject *_wrap_new_wxBitmapButton(PyObject *self, PyObject *args) {
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxBitmap * _arg2;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxBitmap * _arg2;

-    wxPoint * _arg3 = &wxPyDefaultPosition;
-    wxSize * _arg4 = &wxPyDefaultSize;
-    long  _arg5 = (wxBU_AUTODRAW);
-    wxValidator * _arg6 = &wxPyDefaultValidator;
-    char * _arg7 = "button";
-    char * _argc0 = 0;
-    char * _argc2 = 0;
-    char * _argc3 = 0;
-    char * _argc4 = 0;
-    char * _argc6 = 0;
+    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    long  _arg5 = (long ) wxBU_AUTODRAW;
+    wxValidator * _arg6 = (wxValidator *) &wxPyDefaultValidator;
+    char * _arg7 = (char *) "button";
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;
+    PyObject * _argo3 = 0;
+    PyObject * _argo4 = 0;
+    PyObject * _argo6 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sis|sslss:new_wxBitmapButton",&_argc0,&_arg1,&_argc2,&_argc3,&_argc4,&_arg5,&_argc6,&_arg7)) 
+    if(!PyArg_ParseTuple(args,"OiO|OOlOs:new_wxBitmapButton",&_argo0,&_arg1,&_argo2,&_argo3,&_argo4,&_arg5,&_argo6,&_arg7)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxBitmapButton. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxBitmapButton. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxBitmap_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxBitmapButton. Expected _wxBitmap_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxBitmapButton. Expected _wxBitmap_p.");
         return NULL;
         }
     }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxPoint_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxBitmapButton. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxBitmapButton. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_wxSize_p")) {
+    if (_argo4) {
+        if (_argo4 == Py_None) { _arg4 = NULL; }
+        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxBitmapButton. Expected _wxSize_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxBitmapButton. Expected _wxSize_p.");
         return NULL;
         }
     }

-    if (_argc6) {
-        if (SWIG_GetPtr(_argc6,(void **) &_arg6,"_wxValidator_p")) {
+    if (_argo6) {
+        if (_argo6 == Py_None) { _arg6 = NULL; }
+        else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxValidator_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of new_wxBitmapButton. Expected _wxValidator_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of new_wxBitmapButton. Expected _wxValidator_p.");
         return NULL;
         }


@@ -452,8 +475,13 @@ static PyObject *_wrap_new_wxBitmapButton(PyObject *self, PyObject *args) {
         _result = (wxBitmapButton *)new_wxBitmapButton(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,*_arg6,_arg7);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxBitmapButton *)new_wxBitmapButton(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,*_arg6,_arg7);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmapButton_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmapButton_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -462,14 +490,15 @@ static PyObject *_wrap_wxBitmapButton_GetBitmapLabel(PyObject *self, PyObject *a
     PyObject * _resultobj;
     wxBitmap * _result;
     wxBitmapButton * _arg0;
     PyObject * _resultobj;
     wxBitmap * _result;
     wxBitmapButton * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxBitmapButton_GetBitmapLabel",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxBitmapButton_GetBitmapLabel",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmapButton_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmapButton_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmapButton_GetBitmapLabel. Expected _wxBitmapButton_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmapButton_GetBitmapLabel. Expected _wxBitmapButton_p.");
         return NULL;
         }


@@ -480,8 +509,13 @@ static PyObject *_wrap_wxBitmapButton_GetBitmapLabel(PyObject *self, PyObject *a
     _result = (wxBitmap *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxBitmap *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -490,14 +524,15 @@ static PyObject *_wrap_wxBitmapButton_GetBitmapDisabled(PyObject *self, PyObject
     PyObject * _resultobj;
     wxBitmap * _result;
     wxBitmapButton * _arg0;
     PyObject * _resultobj;
     wxBitmap * _result;
     wxBitmapButton * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxBitmapButton_GetBitmapDisabled",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxBitmapButton_GetBitmapDisabled",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmapButton_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmapButton_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmapButton_GetBitmapDisabled. Expected _wxBitmapButton_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmapButton_GetBitmapDisabled. Expected _wxBitmapButton_p.");
         return NULL;
         }


@@ -508,8 +543,13 @@ static PyObject *_wrap_wxBitmapButton_GetBitmapDisabled(PyObject *self, PyObject
     _result = (wxBitmap *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxBitmap *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -518,14 +558,15 @@ static PyObject *_wrap_wxBitmapButton_GetBitmapFocus(PyObject *self, PyObject *a
     PyObject * _resultobj;
     wxBitmap * _result;
     wxBitmapButton * _arg0;
     PyObject * _resultobj;
     wxBitmap * _result;
     wxBitmapButton * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxBitmapButton_GetBitmapFocus",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxBitmapButton_GetBitmapFocus",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmapButton_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmapButton_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmapButton_GetBitmapFocus. Expected _wxBitmapButton_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmapButton_GetBitmapFocus. Expected _wxBitmapButton_p.");
         return NULL;
         }


@@ -536,8 +577,13 @@ static PyObject *_wrap_wxBitmapButton_GetBitmapFocus(PyObject *self, PyObject *a
     _result = (wxBitmap *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxBitmap *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -546,14 +592,15 @@ static PyObject *_wrap_wxBitmapButton_GetBitmapSelected(PyObject *self, PyObject
     PyObject * _resultobj;
     wxBitmap * _result;
     wxBitmapButton * _arg0;
     PyObject * _resultobj;
     wxBitmap * _result;
     wxBitmapButton * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxBitmapButton_GetBitmapSelected",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxBitmapButton_GetBitmapSelected",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmapButton_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmapButton_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmapButton_GetBitmapSelected. Expected _wxBitmapButton_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmapButton_GetBitmapSelected. Expected _wxBitmapButton_p.");
         return NULL;
         }


@@ -564,8 +611,13 @@ static PyObject *_wrap_wxBitmapButton_GetBitmapSelected(PyObject *self, PyObject
     _result = (wxBitmap *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxBitmap *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -574,20 +626,22 @@ static PyObject *_wrap_wxBitmapButton_SetBitmapDisabled(PyObject *self, PyObject
     PyObject * _resultobj;
     wxBitmapButton * _arg0;
     wxBitmap * _arg1;
     PyObject * _resultobj;
     wxBitmapButton * _arg0;
     wxBitmap * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxBitmapButton_SetBitmapDisabled",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxBitmapButton_SetBitmapDisabled",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmapButton_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmapButton_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmapButton_SetBitmapDisabled. Expected _wxBitmapButton_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmapButton_SetBitmapDisabled. Expected _wxBitmapButton_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxBitmapButton_SetBitmapDisabled. Expected _wxBitmap_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxBitmapButton_SetBitmapDisabled. Expected _wxBitmap_p.");
         return NULL;
         }


@@ -607,20 +661,22 @@ static PyObject *_wrap_wxBitmapButton_SetBitmapFocus(PyObject *self, PyObject *a
     PyObject * _resultobj;
     wxBitmapButton * _arg0;
     wxBitmap * _arg1;
     PyObject * _resultobj;
     wxBitmapButton * _arg0;
     wxBitmap * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxBitmapButton_SetBitmapFocus",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxBitmapButton_SetBitmapFocus",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmapButton_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmapButton_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmapButton_SetBitmapFocus. Expected _wxBitmapButton_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmapButton_SetBitmapFocus. Expected _wxBitmapButton_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxBitmapButton_SetBitmapFocus. Expected _wxBitmap_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxBitmapButton_SetBitmapFocus. Expected _wxBitmap_p.");
         return NULL;
         }


@@ -640,20 +696,22 @@ static PyObject *_wrap_wxBitmapButton_SetBitmapSelected(PyObject *self, PyObject
     PyObject * _resultobj;
     wxBitmapButton * _arg0;
     wxBitmap * _arg1;
     PyObject * _resultobj;
     wxBitmapButton * _arg0;
     wxBitmap * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxBitmapButton_SetBitmapSelected",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxBitmapButton_SetBitmapSelected",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmapButton_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmapButton_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmapButton_SetBitmapSelected. Expected _wxBitmapButton_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmapButton_SetBitmapSelected. Expected _wxBitmapButton_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxBitmapButton_SetBitmapSelected. Expected _wxBitmap_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxBitmapButton_SetBitmapSelected. Expected _wxBitmap_p.");
         return NULL;
         }


@@ -673,20 +731,22 @@ static PyObject *_wrap_wxBitmapButton_SetBitmapLabel(PyObject *self, PyObject *a
     PyObject * _resultobj;
     wxBitmapButton * _arg0;
     wxBitmap * _arg1;
     PyObject * _resultobj;
     wxBitmapButton * _arg0;
     wxBitmap * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxBitmapButton_SetBitmapLabel",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxBitmapButton_SetBitmapLabel",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmapButton_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmapButton_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmapButton_SetBitmapLabel. Expected _wxBitmapButton_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmapButton_SetBitmapLabel. Expected _wxBitmapButton_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxBitmapButton_SetBitmapLabel. Expected _wxBitmap_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxBitmapButton_SetBitmapLabel. Expected _wxBitmap_p.");
         return NULL;
         }


@@ -732,23 +792,24 @@ static PyObject *_wrap_new_wxCheckBox(PyObject *self, PyObject *args) {
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;

-    wxPoint * _arg3 = &wxPyDefaultPosition;
-    wxSize * _arg4 = &wxPyDefaultSize;
-    long  _arg5 = 0;
-    wxValidator * _arg6 = &wxPyDefaultValidator;
-    char * _arg7 = "checkBox";
-    char * _argc0 = 0;
+    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    long  _arg5 = (long ) 0;
+    wxValidator * _arg6 = (wxValidator *) &wxPyDefaultValidator;
+    char * _arg7 = (char *) "checkBox";
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
     PyObject * _obj2 = 0;

-    char * _argc3 = 0;
-    char * _argc4 = 0;
-    char * _argc6 = 0;
+    PyObject * _argo3 = 0;
+    PyObject * _argo4 = 0;
+    PyObject * _argo6 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siO|sslss:new_wxCheckBox",&_argc0,&_arg1,&_obj2,&_argc3,&_argc4,&_arg5,&_argc6,&_arg7)) 
+    if(!PyArg_ParseTuple(args,"OiO|OOlOs:new_wxCheckBox",&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_argo6,&_arg7)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxCheckBox. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxCheckBox. Expected _wxWindow_p.");
         return NULL;
         }


@@ -760,20 +821,23 @@ static PyObject *_wrap_new_wxCheckBox(PyObject *self, PyObject *args) {
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxPoint_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxCheckBox. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxCheckBox. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_wxSize_p")) {
+    if (_argo4) {
+        if (_argo4 == Py_None) { _arg4 = NULL; }
+        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxCheckBox. Expected _wxSize_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxCheckBox. Expected _wxSize_p.");
         return NULL;
         }
     }

-    if (_argc6) {
-        if (SWIG_GetPtr(_argc6,(void **) &_arg6,"_wxValidator_p")) {
+    if (_argo6) {
+        if (_argo6 == Py_None) { _arg6 = NULL; }
+        else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxValidator_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of new_wxCheckBox. Expected _wxValidator_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of new_wxCheckBox. Expected _wxValidator_p.");
         return NULL;
         }


@@ -783,8 +847,13 @@ static PyObject *_wrap_new_wxCheckBox(PyObject *self, PyObject *args) {
         _result = (wxCheckBox *)new_wxCheckBox(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,*_arg6,_arg7);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxCheckBox *)new_wxCheckBox(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,*_arg6,_arg7);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxCheckBox_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxCheckBox_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     if (_obj2)
         delete _arg2;
 {
     if (_obj2)
         delete _arg2;


@@ -797,13 +866,14 @@ static PyObject *_wrap_wxCheckBox_GetValue(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxCheckBox * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxCheckBox * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxCheckBox_GetValue",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxCheckBox_GetValue",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCheckBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCheckBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCheckBox_GetValue. Expected _wxCheckBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCheckBox_GetValue. Expected _wxCheckBox_p.");
         return NULL;
         }


@@ -822,14 +892,15 @@ static PyObject *_wrap_wxCheckBox_SetValue(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxCheckBox * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxCheckBox * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxCheckBox_SetValue",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxCheckBox_SetValue",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCheckBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCheckBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCheckBox_SetValue. Expected _wxCheckBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCheckBox_SetValue. Expected _wxCheckBox_p.");
         return NULL;
         }


@@ -875,37 +946,40 @@ static PyObject *_wrap_new_wxChoice(PyObject *self, PyObject *args) {
     wxChoice * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxChoice * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;

-    wxPoint * _arg2 = &wxPyDefaultPosition;
-    wxSize * _arg3 = &wxPyDefaultSize;
-    int  _arg4 = 0;
-    wxString * _arg5 = NULL;
-    long  _arg6 = 0;
-    wxValidator * _arg7 = &wxPyDefaultValidator;
-    char * _arg8 = "choice";
-    char * _argc0 = 0;
-    char * _argc2 = 0;
-    char * _argc3 = 0;
+    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    int  _arg4 = (int ) 0;
+    wxString * _arg5 = (wxString *) NULL;
+    long  _arg6 = (long ) 0;
+    wxValidator * _arg7 = (wxValidator *) &wxPyDefaultValidator;
+    char * _arg8 = (char *) "choice";
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;
+    PyObject * _argo3 = 0;

     PyObject * _obj5 = 0;
     PyObject * _obj5 = 0;

-    char * _argc7 = 0;
+    PyObject * _argo7 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si|ssOlss:new_wxChoice",&_argc0,&_arg1,&_argc2,&_argc3,&_obj5,&_arg6,&_argc7,&_arg8)) 
+    if(!PyArg_ParseTuple(args,"Oi|OOOlOs:new_wxChoice",&_argo0,&_arg1,&_argo2,&_argo3,&_obj5,&_arg6,&_argo7,&_arg8)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxChoice. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxChoice. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxChoice. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxChoice. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxSize_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxChoice. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxChoice. Expected _wxSize_p.");
         return NULL;
         }


@@ -917,8 +991,9 @@ static PyObject *_wrap_new_wxChoice(PyObject *self, PyObject *args) {
         return NULL;
     }
 }
         return NULL;
     }
 }

-    if (_argc7) {
-        if (SWIG_GetPtr(_argc7,(void **) &_arg7,"_wxValidator_p")) {
+    if (_argo7) {
+        if (_argo7 == Py_None) { _arg7 = NULL; }
+        else if (SWIG_GetPtrObj(_argo7,(void **) &_arg7,"_wxValidator_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 8 of new_wxChoice. Expected _wxValidator_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 8 of new_wxChoice. Expected _wxValidator_p.");
         return NULL;
         }


@@ -936,8 +1011,13 @@ static PyObject *_wrap_new_wxChoice(PyObject *self, PyObject *args) {
         _result = (wxChoice *)new_wxChoice(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5,_arg6,*_arg7,_arg8);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxChoice *)new_wxChoice(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5,_arg6,*_arg7,_arg8);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxChoice_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxChoice_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     delete [] _arg5;
 }
 {
     delete [] _arg5;
 }


@@ -949,14 +1029,15 @@ static PyObject *_wrap_wxChoice_Append(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxChoice * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxChoice * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxChoice_Append",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxChoice_Append",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxChoice_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxChoice_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxChoice_Append. Expected _wxChoice_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxChoice_Append. Expected _wxChoice_p.");
         return NULL;
         }


@@ -986,13 +1067,14 @@ static PyObject *_wrap_wxChoice_Append(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxChoice_Clear(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxChoice * _arg0;
 static PyObject *_wrap_wxChoice_Clear(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxChoice * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxChoice_Clear",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxChoice_Clear",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxChoice_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxChoice_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxChoice_Clear. Expected _wxChoice_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxChoice_Clear. Expected _wxChoice_p.");
         return NULL;
         }


@@ -1013,14 +1095,15 @@ static PyObject *_wrap_wxChoice_FindString(PyObject *self, PyObject *args) {
     int  _result;
     wxChoice * _arg0;
     wxString * _arg1;
     int  _result;
     wxChoice * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxChoice_FindString",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxChoice_FindString",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxChoice_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxChoice_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxChoice_FindString. Expected _wxChoice_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxChoice_FindString. Expected _wxChoice_p.");
         return NULL;
         }


@@ -1050,13 +1133,14 @@ static PyObject *_wrap_wxChoice_GetColumns(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxChoice * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxChoice * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxChoice_GetColumns",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxChoice_GetColumns",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxChoice_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxChoice_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxChoice_GetColumns. Expected _wxChoice_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxChoice_GetColumns. Expected _wxChoice_p.");
         return NULL;
         }


@@ -1075,13 +1159,14 @@ static PyObject *_wrap_wxChoice_GetSelection(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxChoice * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxChoice * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxChoice_GetSelection",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxChoice_GetSelection",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxChoice_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxChoice_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxChoice_GetSelection. Expected _wxChoice_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxChoice_GetSelection. Expected _wxChoice_p.");
         return NULL;
         }


@@ -1101,13 +1186,14 @@ static PyObject *_wrap_wxChoice_GetString(PyObject *self, PyObject *args) {
     wxString * _result;
     wxChoice * _arg0;
     int  _arg1;
     wxString * _result;
     wxChoice * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxChoice_GetString",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxChoice_GetString",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxChoice_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxChoice_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxChoice_GetString. Expected _wxChoice_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxChoice_GetString. Expected _wxChoice_p.");
         return NULL;
         }


@@ -1131,13 +1217,14 @@ static PyObject *_wrap_wxChoice_GetStringSelection(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     wxString * _result;
     wxChoice * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxChoice * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxChoice_GetStringSelection",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxChoice_GetStringSelection",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxChoice_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxChoice_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxChoice_GetStringSelection. Expected _wxChoice_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxChoice_GetStringSelection. Expected _wxChoice_p.");
         return NULL;
         }


@@ -1161,13 +1248,14 @@ static PyObject *_wrap_wxChoice_Number(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxChoice * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxChoice * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxChoice_Number",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxChoice_Number",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxChoice_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxChoice_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxChoice_Number. Expected _wxChoice_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxChoice_Number. Expected _wxChoice_p.");
         return NULL;
         }


@@ -1185,14 +1273,15 @@ static PyObject *_wrap_wxChoice_Number(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxChoice_SetColumns(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxChoice * _arg0;
 static PyObject *_wrap_wxChoice_SetColumns(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxChoice * _arg0;

-    int  _arg1 = 1;
-    char * _argc0 = 0;
+    int  _arg1 = (int ) 1;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxChoice_SetColumns",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"O|i:wxChoice_SetColumns",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxChoice_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxChoice_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxChoice_SetColumns. Expected _wxChoice_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxChoice_SetColumns. Expected _wxChoice_p.");
         return NULL;
         }


@@ -1212,13 +1301,14 @@ static PyObject *_wrap_wxChoice_SetSelection(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxChoice * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxChoice * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxChoice_SetSelection",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxChoice_SetSelection",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxChoice_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxChoice_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxChoice_SetSelection. Expected _wxChoice_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxChoice_SetSelection. Expected _wxChoice_p.");
         return NULL;
         }


@@ -1238,14 +1328,15 @@ static PyObject *_wrap_wxChoice_SetStringSelection(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     wxChoice * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxChoice * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxChoice_SetStringSelection",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxChoice_SetStringSelection",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxChoice_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxChoice_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxChoice_SetStringSelection. Expected _wxChoice_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxChoice_SetStringSelection. Expected _wxChoice_p.");
         return NULL;
         }


@@ -1309,38 +1400,41 @@ static PyObject *_wrap_new_wxComboBox(PyObject *self, PyObject *args) {
     wxComboBox * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxComboBox * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;

-    char * _arg2 = "";
-    wxPoint * _arg3 = &wxPyDefaultPosition;
-    wxSize * _arg4 = &wxPyDefaultSize;
-    int  _arg5 = 0;
-    wxString * _arg6 = NULL;
-    long  _arg7 = 0;
-    wxValidator * _arg8 = &wxPyDefaultValidator;
-    char * _arg9 = "comboBox";
-    char * _argc0 = 0;
-    char * _argc3 = 0;
-    char * _argc4 = 0;
+    char * _arg2 = (char *) "";
+    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    int  _arg5 = (int ) 0;
+    wxString * _arg6 = (wxString *) NULL;
+    long  _arg7 = (long ) 0;
+    wxValidator * _arg8 = (wxValidator *) &wxPyDefaultValidator;
+    char * _arg9 = (char *) "comboBox";
+    PyObject * _argo0 = 0;
+    PyObject * _argo3 = 0;
+    PyObject * _argo4 = 0;

     PyObject * _obj6 = 0;
     PyObject * _obj6 = 0;

-    char * _argc8 = 0;
+    PyObject * _argo8 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si|sssOlss:new_wxComboBox",&_argc0,&_arg1,&_arg2,&_argc3,&_argc4,&_obj6,&_arg7,&_argc8,&_arg9)) 
+    if(!PyArg_ParseTuple(args,"Oi|sOOOlOs:new_wxComboBox",&_argo0,&_arg1,&_arg2,&_argo3,&_argo4,&_obj6,&_arg7,&_argo8,&_arg9)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxComboBox. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxComboBox. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxPoint_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxComboBox. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxComboBox. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_wxSize_p")) {
+    if (_argo4) {
+        if (_argo4 == Py_None) { _arg4 = NULL; }
+        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxComboBox. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxComboBox. Expected _wxSize_p.");
         return NULL;
         }


@@ -1352,8 +1446,9 @@ static PyObject *_wrap_new_wxComboBox(PyObject *self, PyObject *args) {
         return NULL;
     }
 }
         return NULL;
     }
 }

-    if (_argc8) {
-        if (SWIG_GetPtr(_argc8,(void **) &_arg8,"_wxValidator_p")) {
+    if (_argo8) {
+        if (_argo8 == Py_None) { _arg8 = NULL; }
+        else if (SWIG_GetPtrObj(_argo8,(void **) &_arg8,"_wxValidator_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 9 of new_wxComboBox. Expected _wxValidator_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 9 of new_wxComboBox. Expected _wxValidator_p.");
         return NULL;
         }


@@ -1371,8 +1466,13 @@ static PyObject *_wrap_new_wxComboBox(PyObject *self, PyObject *args) {
         _result = (wxComboBox *)new_wxComboBox(_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5,_arg6,_arg7,*_arg8,_arg9);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxComboBox *)new_wxComboBox(_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5,_arg6,_arg7,*_arg8,_arg9);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxComboBox_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxComboBox_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     delete [] _arg6;
 }
 {
     delete [] _arg6;
 }


@@ -1384,14 +1484,15 @@ static PyObject *_wrap_wxComboBox_Append(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxComboBox * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxComboBox_Append",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxComboBox_Append",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxComboBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxComboBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_Append. Expected _wxComboBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_Append. Expected _wxComboBox_p.");
         return NULL;
         }


@@ -1421,13 +1522,14 @@ static PyObject *_wrap_wxComboBox_Append(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxComboBox_Clear(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
 static PyObject *_wrap_wxComboBox_Clear(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxComboBox * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxComboBox_Clear",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxComboBox_Clear",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxComboBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxComboBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_Clear. Expected _wxComboBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_Clear. Expected _wxComboBox_p.");
         return NULL;
         }


@@ -1446,13 +1548,14 @@ static PyObject *_wrap_wxComboBox_Clear(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxComboBox_Copy(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
 static PyObject *_wrap_wxComboBox_Copy(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxComboBox * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxComboBox_Copy",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxComboBox_Copy",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxComboBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxComboBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_Copy. Expected _wxComboBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_Copy. Expected _wxComboBox_p.");
         return NULL;
         }


@@ -1471,13 +1574,14 @@ static PyObject *_wrap_wxComboBox_Copy(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxComboBox_Cut(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
 static PyObject *_wrap_wxComboBox_Cut(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxComboBox * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxComboBox_Cut",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxComboBox_Cut",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxComboBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxComboBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_Cut. Expected _wxComboBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_Cut. Expected _wxComboBox_p.");
         return NULL;
         }


@@ -1497,13 +1601,14 @@ static PyObject *_wrap_wxComboBox_Delete(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxComboBox * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxComboBox_Delete",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxComboBox_Delete",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxComboBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxComboBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_Delete. Expected _wxComboBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_Delete. Expected _wxComboBox_p.");
         return NULL;
         }


@@ -1524,14 +1629,15 @@ static PyObject *_wrap_wxComboBox_FindString(PyObject *self, PyObject *args) {
     int  _result;
     wxComboBox * _arg0;
     wxString * _arg1;
     int  _result;
     wxComboBox * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxComboBox_FindString",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxComboBox_FindString",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxComboBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxComboBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_FindString. Expected _wxComboBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_FindString. Expected _wxComboBox_p.");
         return NULL;
         }


@@ -1561,13 +1667,14 @@ static PyObject *_wrap_wxComboBox_GetInsertionPoint(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     long  _result;
     wxComboBox * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxComboBox * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxComboBox_GetInsertionPoint",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxComboBox_GetInsertionPoint",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxComboBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxComboBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_GetInsertionPoint. Expected _wxComboBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_GetInsertionPoint. Expected _wxComboBox_p.");
         return NULL;
         }


@@ -1586,13 +1693,14 @@ static PyObject *_wrap_wxComboBox_GetLastPosition(PyObject *self, PyObject *args
     PyObject * _resultobj;
     long  _result;
     wxComboBox * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxComboBox * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxComboBox_GetLastPosition",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxComboBox_GetLastPosition",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxComboBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxComboBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_GetLastPosition. Expected _wxComboBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_GetLastPosition. Expected _wxComboBox_p.");
         return NULL;
         }


@@ -1611,13 +1719,14 @@ static PyObject *_wrap_wxComboBox_GetSelection(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxComboBox * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxComboBox * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxComboBox_GetSelection",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxComboBox_GetSelection",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxComboBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxComboBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_GetSelection. Expected _wxComboBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_GetSelection. Expected _wxComboBox_p.");
         return NULL;
         }


@@ -1637,13 +1746,14 @@ static PyObject *_wrap_wxComboBox_GetString(PyObject *self, PyObject *args) {
     wxString * _result;
     wxComboBox * _arg0;
     int  _arg1;
     wxString * _result;
     wxComboBox * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxComboBox_GetString",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxComboBox_GetString",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxComboBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxComboBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_GetString. Expected _wxComboBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_GetString. Expected _wxComboBox_p.");
         return NULL;
         }


@@ -1667,13 +1777,14 @@ static PyObject *_wrap_wxComboBox_GetStringSelection(PyObject *self, PyObject *a
     PyObject * _resultobj;
     wxString * _result;
     wxComboBox * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxComboBox * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxComboBox_GetStringSelection",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxComboBox_GetStringSelection",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxComboBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxComboBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_GetStringSelection. Expected _wxComboBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_GetStringSelection. Expected _wxComboBox_p.");
         return NULL;
         }


@@ -1697,13 +1808,14 @@ static PyObject *_wrap_wxComboBox_GetValue(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxComboBox * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxComboBox * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxComboBox_GetValue",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxComboBox_GetValue",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxComboBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxComboBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_GetValue. Expected _wxComboBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_GetValue. Expected _wxComboBox_p.");
         return NULL;
         }


@@ -1727,13 +1839,14 @@ static PyObject *_wrap_wxComboBox_Number(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxComboBox * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxComboBox * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxComboBox_Number",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxComboBox_Number",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxComboBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxComboBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_Number. Expected _wxComboBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_Number. Expected _wxComboBox_p.");
         return NULL;
         }


@@ -1751,13 +1864,14 @@ static PyObject *_wrap_wxComboBox_Number(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxComboBox_Paste(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
 static PyObject *_wrap_wxComboBox_Paste(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxComboBox * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxComboBox_Paste",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxComboBox_Paste",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxComboBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxComboBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_Paste. Expected _wxComboBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_Paste. Expected _wxComboBox_p.");
         return NULL;
         }


@@ -1779,14 +1893,15 @@ static PyObject *_wrap_wxComboBox_Replace(PyObject *self, PyObject *args) {
     long  _arg1;
     long  _arg2;
     wxString * _arg3;
     long  _arg1;
     long  _arg2;
     wxString * _arg3;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj3 = 0;
 
     self = self;
     PyObject * _obj3 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sllO:wxComboBox_Replace",&_argc0,&_arg1,&_arg2,&_obj3)) 
+    if(!PyArg_ParseTuple(args,"OllO:wxComboBox_Replace",&_argo0,&_arg1,&_arg2,&_obj3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxComboBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxComboBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_Replace. Expected _wxComboBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_Replace. Expected _wxComboBox_p.");
         return NULL;
         }


@@ -1818,13 +1933,14 @@ static PyObject *_wrap_wxComboBox_Remove(PyObject *self, PyObject *args) {
     wxComboBox * _arg0;
     long  _arg1;
     long  _arg2;
     wxComboBox * _arg0;
     long  _arg1;
     long  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sll:wxComboBox_Remove",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oll:wxComboBox_Remove",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxComboBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxComboBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_Remove. Expected _wxComboBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_Remove. Expected _wxComboBox_p.");
         return NULL;
         }


@@ -1844,13 +1960,14 @@ static PyObject *_wrap_wxComboBox_SetInsertionPoint(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     wxComboBox * _arg0;
     long  _arg1;
     PyObject * _resultobj;
     wxComboBox * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxComboBox_SetInsertionPoint",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxComboBox_SetInsertionPoint",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxComboBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxComboBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_SetInsertionPoint. Expected _wxComboBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_SetInsertionPoint. Expected _wxComboBox_p.");
         return NULL;
         }


@@ -1869,13 +1986,14 @@ static PyObject *_wrap_wxComboBox_SetInsertionPoint(PyObject *self, PyObject *ar
 static PyObject *_wrap_wxComboBox_SetInsertionPointEnd(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
 static PyObject *_wrap_wxComboBox_SetInsertionPointEnd(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxComboBox * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxComboBox_SetInsertionPointEnd",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxComboBox_SetInsertionPointEnd",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxComboBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxComboBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_SetInsertionPointEnd. Expected _wxComboBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_SetInsertionPointEnd. Expected _wxComboBox_p.");
         return NULL;
         }


@@ -1890,19 +2008,47 @@ static PyObject *_wrap_wxComboBox_SetInsertionPointEnd(PyObject *self, PyObject
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxComboBox_SetSelection(_swigobj,_swigarg0)  (_swigobj->SetSelection(_swigarg0))
+static PyObject *_wrap_wxComboBox_SetSelection(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxComboBox * _arg0;
+    int  _arg1;
+    PyObject * _argo0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"Oi:wxComboBox_SetSelection",&_argo0,&_arg1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxComboBox_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_SetSelection. Expected _wxComboBox_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxComboBox_SetSelection(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+

 #define wxComboBox_SetMark(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetSelection(_swigarg0,_swigarg1))
 static PyObject *_wrap_wxComboBox_SetMark(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
     long  _arg1;
     long  _arg2;
 #define wxComboBox_SetMark(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetSelection(_swigarg0,_swigarg1))
 static PyObject *_wrap_wxComboBox_SetMark(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
     long  _arg1;
     long  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sll:wxComboBox_SetMark",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oll:wxComboBox_SetMark",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxComboBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxComboBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_SetMark. Expected _wxComboBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_SetMark. Expected _wxComboBox_p.");
         return NULL;
         }


@@ -1922,14 +2068,15 @@ static PyObject *_wrap_wxComboBox_SetValue(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxComboBox * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxComboBox_SetValue",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxComboBox_SetValue",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxComboBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxComboBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_SetValue. Expected _wxComboBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_SetValue. Expected _wxComboBox_p.");
         return NULL;
         }


@@ -1986,40 +2133,44 @@ static PyObject *_wrap_new_wxGauge(PyObject *self, PyObject *args) {
     wxWindow * _arg0;
     wxWindowID  _arg1;
     int  _arg2;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     int  _arg2;

-    wxPoint * _arg3 = &wxPyDefaultPosition;
-    wxSize * _arg4 = &wxPyDefaultSize;
-    long  _arg5 = (wxGA_HORIZONTAL);
-    wxValidator * _arg6 = &wxPyDefaultValidator;
-    char * _arg7 = "gauge";
-    char * _argc0 = 0;
-    char * _argc3 = 0;
-    char * _argc4 = 0;
-    char * _argc6 = 0;
+    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    long  _arg5 = (long ) wxGA_HORIZONTAL;
+    wxValidator * _arg6 = (wxValidator *) &wxPyDefaultValidator;
+    char * _arg7 = (char *) "gauge";
+    PyObject * _argo0 = 0;
+    PyObject * _argo3 = 0;
+    PyObject * _argo4 = 0;
+    PyObject * _argo6 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii|sslss:new_wxGauge",&_argc0,&_arg1,&_arg2,&_argc3,&_argc4,&_arg5,&_argc6,&_arg7)) 
+    if(!PyArg_ParseTuple(args,"Oii|OOlOs:new_wxGauge",&_argo0,&_arg1,&_arg2,&_argo3,&_argo4,&_arg5,&_argo6,&_arg7)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxGauge. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxGauge. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxPoint_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxGauge. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxGauge. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_wxSize_p")) {
+    if (_argo4) {
+        if (_argo4 == Py_None) { _arg4 = NULL; }
+        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxGauge. Expected _wxSize_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxGauge. Expected _wxSize_p.");
         return NULL;
         }
     }

-    if (_argc6) {
-        if (SWIG_GetPtr(_argc6,(void **) &_arg6,"_wxValidator_p")) {
+    if (_argo6) {
+        if (_argo6 == Py_None) { _arg6 = NULL; }
+        else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxValidator_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of new_wxGauge. Expected _wxValidator_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of new_wxGauge. Expected _wxValidator_p.");
         return NULL;
         }


@@ -2029,8 +2180,13 @@ static PyObject *_wrap_new_wxGauge(PyObject *self, PyObject *args) {
         _result = (wxGauge *)new_wxGauge(_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5,*_arg6,_arg7);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxGauge *)new_wxGauge(_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5,*_arg6,_arg7);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxGauge_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxGauge_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -2039,13 +2195,14 @@ static PyObject *_wrap_wxGauge_GetBezelFace(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxGauge * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxGauge * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGauge_GetBezelFace",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGauge_GetBezelFace",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGauge_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGauge_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGauge_GetBezelFace. Expected _wxGauge_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGauge_GetBezelFace. Expected _wxGauge_p.");
         return NULL;
         }


@@ -2064,13 +2221,14 @@ static PyObject *_wrap_wxGauge_GetRange(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxGauge * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxGauge * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGauge_GetRange",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGauge_GetRange",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGauge_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGauge_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGauge_GetRange. Expected _wxGauge_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGauge_GetRange. Expected _wxGauge_p.");
         return NULL;
         }


@@ -2089,13 +2247,14 @@ static PyObject *_wrap_wxGauge_GetShadowWidth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxGauge * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxGauge * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGauge_GetShadowWidth",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGauge_GetShadowWidth",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGauge_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGauge_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGauge_GetShadowWidth. Expected _wxGauge_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGauge_GetShadowWidth. Expected _wxGauge_p.");
         return NULL;
         }


@@ -2114,13 +2273,14 @@ static PyObject *_wrap_wxGauge_GetValue(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxGauge * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxGauge * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGauge_GetValue",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGauge_GetValue",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGauge_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGauge_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGauge_GetValue. Expected _wxGauge_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGauge_GetValue. Expected _wxGauge_p.");
         return NULL;
         }


@@ -2139,13 +2299,14 @@ static PyObject *_wrap_wxGauge_SetBezelFace(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGauge * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxGauge * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxGauge_SetBezelFace",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxGauge_SetBezelFace",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGauge_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGauge_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGauge_SetBezelFace. Expected _wxGauge_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGauge_SetBezelFace. Expected _wxGauge_p.");
         return NULL;
         }


@@ -2165,13 +2326,14 @@ static PyObject *_wrap_wxGauge_SetRange(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGauge * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxGauge * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxGauge_SetRange",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxGauge_SetRange",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGauge_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGauge_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGauge_SetRange. Expected _wxGauge_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGauge_SetRange. Expected _wxGauge_p.");
         return NULL;
         }


@@ -2191,13 +2353,14 @@ static PyObject *_wrap_wxGauge_SetShadowWidth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGauge * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxGauge * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxGauge_SetShadowWidth",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxGauge_SetShadowWidth",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGauge_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGauge_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGauge_SetShadowWidth. Expected _wxGauge_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGauge_SetShadowWidth. Expected _wxGauge_p.");
         return NULL;
         }


@@ -2217,13 +2380,14 @@ static PyObject *_wrap_wxGauge_SetValue(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGauge * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxGauge * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxGauge_SetValue",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxGauge_SetValue",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGauge_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGauge_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGauge_SetValue. Expected _wxGauge_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGauge_SetValue. Expected _wxGauge_p.");
         return NULL;
         }


@@ -2269,21 +2433,22 @@ static PyObject *_wrap_new_wxStaticBox(PyObject *self, PyObject *args) {
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;

-    wxPoint * _arg3 = &wxPyDefaultPosition;
-    wxSize * _arg4 = &wxPyDefaultSize;
-    long  _arg5 = 0;
-    char * _arg6 = "staticBox";
-    char * _argc0 = 0;
+    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    long  _arg5 = (long ) 0;
+    char * _arg6 = (char *) "staticBox";
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
     PyObject * _obj2 = 0;

-    char * _argc3 = 0;
-    char * _argc4 = 0;
+    PyObject * _argo3 = 0;
+    PyObject * _argo4 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siO|ssls:new_wxStaticBox",&_argc0,&_arg1,&_obj2,&_argc3,&_argc4,&_arg5,&_arg6)) 
+    if(!PyArg_ParseTuple(args,"OiO|OOls:new_wxStaticBox",&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxStaticBox. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxStaticBox. Expected _wxWindow_p.");
         return NULL;
         }


@@ -2295,14 +2460,16 @@ static PyObject *_wrap_new_wxStaticBox(PyObject *self, PyObject *args) {
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxPoint_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxStaticBox. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxStaticBox. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_wxSize_p")) {
+    if (_argo4) {
+        if (_argo4 == Py_None) { _arg4 = NULL; }
+        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxStaticBox. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxStaticBox. Expected _wxSize_p.");
         return NULL;
         }


@@ -2312,8 +2479,13 @@ static PyObject *_wrap_new_wxStaticBox(PyObject *self, PyObject *args) {
         _result = (wxStaticBox *)new_wxStaticBox(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxStaticBox *)new_wxStaticBox(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxStaticBox_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxStaticBox_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     if (_obj2)
         delete _arg2;
 {
     if (_obj2)
         delete _arg2;


@@ -2351,32 +2523,35 @@ static PyObject *_wrap_new_wxStaticLine(PyObject *self, PyObject *args) {
     wxStaticLine * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxStaticLine * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;

-    wxPoint * _arg2 = &wxPyDefaultPosition;
-    wxSize * _arg3 = &wxPyDefaultSize;
-    long  _arg4 = wxLI_HORIZONTAL;
-    char * _arg5 = "staticLine";
-    char * _argc0 = 0;
-    char * _argc2 = 0;
-    char * _argc3 = 0;
+    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    long  _arg4 = (long ) wxLI_HORIZONTAL;
+    char * _arg5 = (char *) "staticLine";
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;
+    PyObject * _argo3 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si|ssls:new_wxStaticLine",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTuple(args,"Oi|OOls:new_wxStaticLine",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxStaticLine. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxStaticLine. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxStaticLine. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxStaticLine. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxSize_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxStaticLine. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxStaticLine. Expected _wxSize_p.");
         return NULL;
         }


@@ -2386,8 +2561,13 @@ static PyObject *_wrap_new_wxStaticLine(PyObject *self, PyObject *args) {
         _result = (wxStaticLine *)new_wxStaticLine(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxStaticLine *)new_wxStaticLine(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxStaticLine_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxStaticLine_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -2422,21 +2602,22 @@ static PyObject *_wrap_new_wxStaticText(PyObject *self, PyObject *args) {
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;

-    wxPoint * _arg3 = &wxPyDefaultPosition;
-    wxSize * _arg4 = &wxPyDefaultSize;
-    long  _arg5 = 0;
-    char * _arg6 = "staticText";
-    char * _argc0 = 0;
+    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    long  _arg5 = (long ) 0;
+    char * _arg6 = (char *) "staticText";
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
     PyObject * _obj2 = 0;

-    char * _argc3 = 0;
-    char * _argc4 = 0;
+    PyObject * _argo3 = 0;
+    PyObject * _argo4 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siO|ssls:new_wxStaticText",&_argc0,&_arg1,&_obj2,&_argc3,&_argc4,&_arg5,&_arg6)) 
+    if(!PyArg_ParseTuple(args,"OiO|OOls:new_wxStaticText",&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxStaticText. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxStaticText. Expected _wxWindow_p.");
         return NULL;
         }


@@ -2448,14 +2629,16 @@ static PyObject *_wrap_new_wxStaticText(PyObject *self, PyObject *args) {
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxPoint_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxStaticText. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxStaticText. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_wxSize_p")) {
+    if (_argo4) {
+        if (_argo4 == Py_None) { _arg4 = NULL; }
+        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxStaticText. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxStaticText. Expected _wxSize_p.");
         return NULL;
         }


@@ -2465,8 +2648,13 @@ static PyObject *_wrap_new_wxStaticText(PyObject *self, PyObject *args) {
         _result = (wxStaticText *)new_wxStaticText(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxStaticText *)new_wxStaticText(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxStaticText_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxStaticText_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     if (_obj2)
         delete _arg2;
 {
     if (_obj2)
         delete _arg2;


@@ -2479,13 +2667,14 @@ static PyObject *_wrap_wxStaticText_GetLabel(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxStaticText * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxStaticText * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxStaticText_GetLabel",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxStaticText_GetLabel",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxStaticText_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStaticText_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStaticText_GetLabel. Expected _wxStaticText_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStaticText_GetLabel. Expected _wxStaticText_p.");
         return NULL;
         }


@@ -2509,14 +2698,15 @@ static PyObject *_wrap_wxStaticText_SetLabel(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxStaticText * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxStaticText * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxStaticText_SetLabel",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxStaticText_SetLabel",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxStaticText_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStaticText_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStaticText_SetLabel. Expected _wxStaticText_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStaticText_SetLabel. Expected _wxStaticText_p.");
         return NULL;
         }


@@ -2572,37 +2762,40 @@ static PyObject *_wrap_new_wxListBox(PyObject *self, PyObject *args) {
     wxListBox * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxListBox * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;

-    wxPoint * _arg2 = &wxPyDefaultPosition;
-    wxSize * _arg3 = &wxPyDefaultSize;
+    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;

     int  _arg4;
     int  _arg4;

-    wxString * _arg5 = NULL;
-    long  _arg6 = 0;
-    wxValidator * _arg7 = &wxPyDefaultValidator;
-    char * _arg8 = "listBox";
-    char * _argc0 = 0;
-    char * _argc2 = 0;
-    char * _argc3 = 0;
+    wxString * _arg5 = (wxString *) NULL;
+    long  _arg6 = (long ) 0;
+    wxValidator * _arg7 = (wxValidator *) &wxPyDefaultValidator;
+    char * _arg8 = (char *) "listBox";
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;
+    PyObject * _argo3 = 0;

     PyObject * _obj5 = 0;
     PyObject * _obj5 = 0;

-    char * _argc7 = 0;
+    PyObject * _argo7 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si|ssOlss:new_wxListBox",&_argc0,&_arg1,&_argc2,&_argc3,&_obj5,&_arg6,&_argc7,&_arg8)) 
+    if(!PyArg_ParseTuple(args,"Oi|OOOlOs:new_wxListBox",&_argo0,&_arg1,&_argo2,&_argo3,&_obj5,&_arg6,&_argo7,&_arg8)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxListBox. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxListBox. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxListBox. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxListBox. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxSize_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxListBox. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxListBox. Expected _wxSize_p.");
         return NULL;
         }


@@ -2614,8 +2807,9 @@ static PyObject *_wrap_new_wxListBox(PyObject *self, PyObject *args) {
         return NULL;
     }
 }
         return NULL;
     }
 }

-    if (_argc7) {
-        if (SWIG_GetPtr(_argc7,(void **) &_arg7,"_wxValidator_p")) {
+    if (_argo7) {
+        if (_argo7 == Py_None) { _arg7 = NULL; }
+        else if (SWIG_GetPtrObj(_argo7,(void **) &_arg7,"_wxValidator_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 8 of new_wxListBox. Expected _wxValidator_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 8 of new_wxListBox. Expected _wxValidator_p.");
         return NULL;
         }


@@ -2633,8 +2827,13 @@ static PyObject *_wrap_new_wxListBox(PyObject *self, PyObject *args) {
         _result = (wxListBox *)new_wxListBox(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5,_arg6,*_arg7,_arg8);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxListBox *)new_wxListBox(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5,_arg6,*_arg7,_arg8);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxListBox_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxListBox_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     delete [] _arg5;
 }
 {
     delete [] _arg5;
 }


@@ -2646,14 +2845,15 @@ static PyObject *_wrap_wxListBox_Append(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxListBox * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxListBox * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxListBox_Append",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxListBox_Append",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_Append. Expected _wxListBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_Append. Expected _wxListBox_p.");
         return NULL;
         }


@@ -2683,13 +2883,14 @@ static PyObject *_wrap_wxListBox_Append(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxListBox_Clear(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxListBox * _arg0;
 static PyObject *_wrap_wxListBox_Clear(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxListBox * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxListBox_Clear",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxListBox_Clear",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_Clear. Expected _wxListBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_Clear. Expected _wxListBox_p.");
         return NULL;
         }


@@ -2709,13 +2910,14 @@ static PyObject *_wrap_wxListBox_Delete(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxListBox * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxListBox * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxListBox_Delete",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxListBox_Delete",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_Delete. Expected _wxListBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_Delete. Expected _wxListBox_p.");
         return NULL;
         }


@@ -2735,13 +2937,14 @@ static PyObject *_wrap_wxListBox_Deselect(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxListBox * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxListBox * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxListBox_Deselect",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxListBox_Deselect",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_Deselect. Expected _wxListBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_Deselect. Expected _wxListBox_p.");
         return NULL;
         }


@@ -2762,14 +2965,15 @@ static PyObject *_wrap_wxListBox_FindString(PyObject *self, PyObject *args) {
     int  _result;
     wxListBox * _arg0;
     wxString * _arg1;
     int  _result;
     wxListBox * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxListBox_FindString",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxListBox_FindString",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_FindString. Expected _wxListBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_FindString. Expected _wxListBox_p.");
         return NULL;
         }


@@ -2799,13 +3003,14 @@ static PyObject *_wrap_wxListBox_GetSelection(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxListBox * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxListBox * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxListBox_GetSelection",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxListBox_GetSelection",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_GetSelection. Expected _wxListBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_GetSelection. Expected _wxListBox_p.");
         return NULL;
         }


@@ -2832,13 +3037,14 @@ static PyObject *_wrap_wxListBox_GetSelections(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     PyObject * _result;
     wxListBox * _arg0;
     PyObject * _resultobj;
     PyObject * _result;
     wxListBox * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxListBox_GetSelections",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxListBox_GetSelections",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_GetSelections. Expected _wxListBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_GetSelections. Expected _wxListBox_p.");
         return NULL;
         }


@@ -2860,13 +3066,14 @@ static PyObject *_wrap_wxListBox_GetString(PyObject *self, PyObject *args) {
     wxString * _result;
     wxListBox * _arg0;
     int  _arg1;
     wxString * _result;
     wxListBox * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxListBox_GetString",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxListBox_GetString",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_GetString. Expected _wxListBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_GetString. Expected _wxListBox_p.");
         return NULL;
         }


@@ -2890,13 +3097,14 @@ static PyObject *_wrap_wxListBox_GetStringSelection(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     wxString * _result;
     wxListBox * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxListBox * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxListBox_GetStringSelection",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxListBox_GetStringSelection",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_GetStringSelection. Expected _wxListBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_GetStringSelection. Expected _wxListBox_p.");
         return NULL;
         }


@@ -2920,13 +3128,14 @@ static PyObject *_wrap_wxListBox_Number(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxListBox * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxListBox * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxListBox_Number",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxListBox_Number",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_Number. Expected _wxListBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_Number. Expected _wxListBox_p.");
         return NULL;
         }


@@ -2946,13 +3155,14 @@ static PyObject *_wrap_wxListBox_Selected(PyObject *self, PyObject *args) {
     bool  _result;
     wxListBox * _arg0;
     int  _arg1;
     bool  _result;
     wxListBox * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxListBox_Selected",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxListBox_Selected",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_Selected. Expected _wxListBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_Selected. Expected _wxListBox_p.");
         return NULL;
         }


@@ -2972,14 +3182,15 @@ static PyObject *_wrap_wxListBox_Set(PyObject *self, PyObject *args) {
     wxListBox * _arg0;
     int  _arg1;
     wxString * _arg2;
     wxListBox * _arg0;
     int  _arg1;
     wxString * _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
 
     self = self;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxListBox_Set",&_argc0,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"OO:wxListBox_Set",&_argo0,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_Set. Expected _wxListBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_Set. Expected _wxListBox_p.");
         return NULL;
         }


@@ -3017,13 +3228,14 @@ static PyObject *_wrap_wxListBox_SetFirstItem(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxListBox * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxListBox * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxListBox_SetFirstItem",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxListBox_SetFirstItem",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_SetFirstItem. Expected _wxListBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_SetFirstItem. Expected _wxListBox_p.");
         return NULL;
         }


@@ -3043,14 +3255,15 @@ static PyObject *_wrap_wxListBox_SetFirstItemStr(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxListBox * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxListBox * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxListBox_SetFirstItemStr",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxListBox_SetFirstItemStr",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_SetFirstItemStr. Expected _wxListBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_SetFirstItemStr. Expected _wxListBox_p.");
         return NULL;
         }


@@ -3081,15 +3294,16 @@ static PyObject *_wrap_wxListBox_SetSelection(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxListBox * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxListBox * _arg0;
     int  _arg1;

-    bool  _arg2 = (1);
-    char * _argc0 = 0;
-    int tempbool2;
+    bool  _arg2 = (bool ) TRUE;
+    PyObject * _argo0 = 0;
+    int tempbool2 = (int) TRUE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si|i:wxListBox_SetSelection",&_argc0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTuple(args,"Oi|i:wxListBox_SetSelection",&_argo0,&_arg1,&tempbool2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_SetSelection. Expected _wxListBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_SetSelection. Expected _wxListBox_p.");
         return NULL;
         }


@@ -3111,14 +3325,15 @@ static PyObject *_wrap_wxListBox_SetString(PyObject *self, PyObject *args) {
     wxListBox * _arg0;
     int  _arg1;
     wxString * _arg2;
     wxListBox * _arg0;
     int  _arg1;
     wxString * _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
 
     self = self;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siO:wxListBox_SetString",&_argc0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"OiO:wxListBox_SetString",&_argo0,&_arg1,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_SetString. Expected _wxListBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_SetString. Expected _wxListBox_p.");
         return NULL;
         }


@@ -3149,16 +3364,17 @@ static PyObject *_wrap_wxListBox_SetStringSelection(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     wxListBox * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxListBox * _arg0;
     wxString * _arg1;

-    bool  _arg2 = (1);
-    char * _argc0 = 0;
+    bool  _arg2 = (bool ) TRUE;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
     PyObject * _obj1 = 0;

-    int tempbool2;
+    int tempbool2 = (int) TRUE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO|i:wxListBox_SetStringSelection",&_argc0,&_obj1,&tempbool2)) 
+    if(!PyArg_ParseTuple(args,"OO|i:wxListBox_SetStringSelection",&_argo0,&_obj1,&tempbool2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_SetStringSelection. Expected _wxListBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_SetStringSelection. Expected _wxListBox_p.");
         return NULL;
         }


@@ -3223,37 +3439,40 @@ static PyObject *_wrap_new_wxCheckListBox(PyObject *self, PyObject *args) {
     wxCheckListBox * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxCheckListBox * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;

-    wxPoint * _arg2 = &wxPyDefaultPosition;
-    wxSize * _arg3 = &wxPyDefaultSize;
-    int  _arg4 = 0;
-    wxString * _arg5 = NULL;
-    long  _arg6 = 0;
-    wxValidator * _arg7 = &wxPyDefaultValidator;
-    char * _arg8 = "listBox";
-    char * _argc0 = 0;
-    char * _argc2 = 0;
-    char * _argc3 = 0;
+    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    int  _arg4 = (int ) 0;
+    wxString * _arg5 = (wxString *) NULL;
+    long  _arg6 = (long ) 0;
+    wxValidator * _arg7 = (wxValidator *) &wxPyDefaultValidator;
+    char * _arg8 = (char *) "listBox";
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;
+    PyObject * _argo3 = 0;

     PyObject * _obj5 = 0;
     PyObject * _obj5 = 0;

-    char * _argc7 = 0;
+    PyObject * _argo7 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si|ssOlss:new_wxCheckListBox",&_argc0,&_arg1,&_argc2,&_argc3,&_obj5,&_arg6,&_argc7,&_arg8)) 
+    if(!PyArg_ParseTuple(args,"Oi|OOOlOs:new_wxCheckListBox",&_argo0,&_arg1,&_argo2,&_argo3,&_obj5,&_arg6,&_argo7,&_arg8)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxCheckListBox. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxCheckListBox. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxCheckListBox. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxCheckListBox. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxSize_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxCheckListBox. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxCheckListBox. Expected _wxSize_p.");
         return NULL;
         }


@@ -3265,8 +3484,9 @@ static PyObject *_wrap_new_wxCheckListBox(PyObject *self, PyObject *args) {
         return NULL;
     }
 }
         return NULL;
     }
 }

-    if (_argc7) {
-        if (SWIG_GetPtr(_argc7,(void **) &_arg7,"_wxValidator_p")) {
+    if (_argo7) {
+        if (_argo7 == Py_None) { _arg7 = NULL; }
+        else if (SWIG_GetPtrObj(_argo7,(void **) &_arg7,"_wxValidator_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 8 of new_wxCheckListBox. Expected _wxValidator_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 8 of new_wxCheckListBox. Expected _wxValidator_p.");
         return NULL;
         }


@@ -3284,8 +3504,13 @@ static PyObject *_wrap_new_wxCheckListBox(PyObject *self, PyObject *args) {
         _result = (wxCheckListBox *)new_wxCheckListBox(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5,_arg6,*_arg7,_arg8);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxCheckListBox *)new_wxCheckListBox(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5,_arg6,*_arg7,_arg8);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxCheckListBox_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxCheckListBox_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     delete [] _arg5;
 }
 {
     delete [] _arg5;
 }


@@ -3298,13 +3523,14 @@ static PyObject *_wrap_wxCheckListBox_IsChecked(PyObject *self, PyObject *args)
     bool  _result;
     wxCheckListBox * _arg0;
     int  _arg1;
     bool  _result;
     wxCheckListBox * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxCheckListBox_IsChecked",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxCheckListBox_IsChecked",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCheckListBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCheckListBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCheckListBox_IsChecked. Expected _wxCheckListBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCheckListBox_IsChecked. Expected _wxCheckListBox_p.");
         return NULL;
         }


@@ -3323,15 +3549,16 @@ static PyObject *_wrap_wxCheckListBox_Check(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxCheckListBox * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxCheckListBox * _arg0;
     int  _arg1;

-    bool  _arg2 = (1);
-    char * _argc0 = 0;
-    int tempbool2;
+    bool  _arg2 = (bool ) TRUE;
+    PyObject * _argo0 = 0;
+    int tempbool2 = (int) TRUE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si|i:wxCheckListBox_Check",&_argc0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTuple(args,"Oi|i:wxCheckListBox_Check",&_argo0,&_arg1,&tempbool2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCheckListBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCheckListBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCheckListBox_Check. Expected _wxCheckListBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCheckListBox_Check. Expected _wxCheckListBox_p.");
         return NULL;
         }


@@ -3352,13 +3579,14 @@ static PyObject *_wrap_wxCheckListBox_GetItemHeight(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     int  _result;
     wxCheckListBox * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxCheckListBox * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxCheckListBox_GetItemHeight",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxCheckListBox_GetItemHeight",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCheckListBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCheckListBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCheckListBox_GetItemHeight. Expected _wxCheckListBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCheckListBox_GetItemHeight. Expected _wxCheckListBox_p.");
         return NULL;
         }


@@ -3402,41 +3630,45 @@ static PyObject *_wrap_new_wxTextCtrl(PyObject *self, PyObject *args) {
     wxTextCtrl * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxTextCtrl * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;

-    char * _arg2 = "";
-    wxPoint * _arg3 = &wxPyDefaultPosition;
-    wxSize * _arg4 = &wxPyDefaultSize;
-    long  _arg5 = 0;
-    wxValidator * _arg6 = &wxPyDefaultValidator;
-    char * _arg7 = "text";
-    char * _argc0 = 0;
-    char * _argc3 = 0;
-    char * _argc4 = 0;
-    char * _argc6 = 0;
+    char * _arg2 = (char *) "";
+    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    long  _arg5 = (long ) 0;
+    wxValidator * _arg6 = (wxValidator *) &wxPyDefaultValidator;
+    char * _arg7 = (char *) "text";
+    PyObject * _argo0 = 0;
+    PyObject * _argo3 = 0;
+    PyObject * _argo4 = 0;
+    PyObject * _argo6 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si|ssslss:new_wxTextCtrl",&_argc0,&_arg1,&_arg2,&_argc3,&_argc4,&_arg5,&_argc6,&_arg7)) 
+    if(!PyArg_ParseTuple(args,"Oi|sOOlOs:new_wxTextCtrl",&_argo0,&_arg1,&_arg2,&_argo3,&_argo4,&_arg5,&_argo6,&_arg7)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxTextCtrl. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxTextCtrl. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxPoint_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxTextCtrl. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxTextCtrl. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_wxSize_p")) {
+    if (_argo4) {
+        if (_argo4 == Py_None) { _arg4 = NULL; }
+        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxTextCtrl. Expected _wxSize_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxTextCtrl. Expected _wxSize_p.");
         return NULL;
         }
     }

-    if (_argc6) {
-        if (SWIG_GetPtr(_argc6,(void **) &_arg6,"_wxValidator_p")) {
+    if (_argo6) {
+        if (_argo6 == Py_None) { _arg6 = NULL; }
+        else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxValidator_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of new_wxTextCtrl. Expected _wxValidator_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of new_wxTextCtrl. Expected _wxValidator_p.");
         return NULL;
         }


@@ -3446,8 +3678,13 @@ static PyObject *_wrap_new_wxTextCtrl(PyObject *self, PyObject *args) {
         _result = (wxTextCtrl *)new_wxTextCtrl(_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5,*_arg6,_arg7);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxTextCtrl *)new_wxTextCtrl(_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5,*_arg6,_arg7);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxTextCtrl_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxTextCtrl_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3455,13 +3692,14 @@ static PyObject *_wrap_new_wxTextCtrl(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxTextCtrl_Clear(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
 static PyObject *_wrap_wxTextCtrl_Clear(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTextCtrl_Clear",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_Clear",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_Clear. Expected _wxTextCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_Clear. Expected _wxTextCtrl_p.");
         return NULL;
         }


@@ -3480,13 +3718,14 @@ static PyObject *_wrap_wxTextCtrl_Clear(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxTextCtrl_Copy(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
 static PyObject *_wrap_wxTextCtrl_Copy(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTextCtrl_Copy",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_Copy",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_Copy. Expected _wxTextCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_Copy. Expected _wxTextCtrl_p.");
         return NULL;
         }


@@ -3505,13 +3744,14 @@ static PyObject *_wrap_wxTextCtrl_Copy(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxTextCtrl_Cut(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
 static PyObject *_wrap_wxTextCtrl_Cut(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTextCtrl_Cut",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_Cut",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_Cut. Expected _wxTextCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_Cut. Expected _wxTextCtrl_p.");
         return NULL;
         }


@@ -3530,13 +3770,14 @@ static PyObject *_wrap_wxTextCtrl_Cut(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxTextCtrl_DiscardEdits(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
 static PyObject *_wrap_wxTextCtrl_DiscardEdits(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTextCtrl_DiscardEdits",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_DiscardEdits",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_DiscardEdits. Expected _wxTextCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_DiscardEdits. Expected _wxTextCtrl_p.");
         return NULL;
         }


@@ -3556,13 +3797,14 @@ static PyObject *_wrap_wxTextCtrl_GetInsertionPoint(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     long  _result;
     wxTextCtrl * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxTextCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTextCtrl_GetInsertionPoint",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_GetInsertionPoint",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_GetInsertionPoint. Expected _wxTextCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_GetInsertionPoint. Expected _wxTextCtrl_p.");
         return NULL;
         }


@@ -3581,13 +3823,14 @@ static PyObject *_wrap_wxTextCtrl_GetLastPosition(PyObject *self, PyObject *args
     PyObject * _resultobj;
     long  _result;
     wxTextCtrl * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxTextCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTextCtrl_GetLastPosition",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_GetLastPosition",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_GetLastPosition. Expected _wxTextCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_GetLastPosition. Expected _wxTextCtrl_p.");
         return NULL;
         }


@@ -3607,13 +3850,14 @@ static PyObject *_wrap_wxTextCtrl_GetLineLength(PyObject *self, PyObject *args)
     int  _result;
     wxTextCtrl * _arg0;
     long  _arg1;
     int  _result;
     wxTextCtrl * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxTextCtrl_GetLineLength",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxTextCtrl_GetLineLength",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_GetLineLength. Expected _wxTextCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_GetLineLength. Expected _wxTextCtrl_p.");
         return NULL;
         }


@@ -3633,13 +3877,14 @@ static PyObject *_wrap_wxTextCtrl_GetLineText(PyObject *self, PyObject *args) {
     wxString * _result;
     wxTextCtrl * _arg0;
     long  _arg1;
     wxString * _result;
     wxTextCtrl * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxTextCtrl_GetLineText",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxTextCtrl_GetLineText",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_GetLineText. Expected _wxTextCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_GetLineText. Expected _wxTextCtrl_p.");
         return NULL;
         }


@@ -3663,13 +3908,14 @@ static PyObject *_wrap_wxTextCtrl_GetNumberOfLines(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     int  _result;
     wxTextCtrl * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxTextCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTextCtrl_GetNumberOfLines",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_GetNumberOfLines",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_GetNumberOfLines. Expected _wxTextCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_GetNumberOfLines. Expected _wxTextCtrl_p.");
         return NULL;
         }


@@ -3688,13 +3934,14 @@ static PyObject *_wrap_wxTextCtrl_GetValue(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxTextCtrl * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxTextCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTextCtrl_GetValue",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_GetValue",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_GetValue. Expected _wxTextCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_GetValue. Expected _wxTextCtrl_p.");
         return NULL;
         }


@@ -3718,13 +3965,14 @@ static PyObject *_wrap_wxTextCtrl_IsModified(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxTextCtrl * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxTextCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTextCtrl_IsModified",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_IsModified",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_IsModified. Expected _wxTextCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_IsModified. Expected _wxTextCtrl_p.");
         return NULL;
         }


@@ -3744,14 +3992,15 @@ static PyObject *_wrap_wxTextCtrl_LoadFile(PyObject *self, PyObject *args) {
     bool  _result;
     wxTextCtrl * _arg0;
     wxString * _arg1;
     bool  _result;
     wxTextCtrl * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxTextCtrl_LoadFile",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTextCtrl_LoadFile",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_LoadFile. Expected _wxTextCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_LoadFile. Expected _wxTextCtrl_p.");
         return NULL;
         }


@@ -3780,13 +4029,14 @@ static PyObject *_wrap_wxTextCtrl_LoadFile(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxTextCtrl_Paste(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
 static PyObject *_wrap_wxTextCtrl_Paste(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTextCtrl_Paste",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_Paste",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_Paste. Expected _wxTextCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_Paste. Expected _wxTextCtrl_p.");
         return NULL;
         }


@@ -3810,7 +4060,7 @@ static PyObject *_wrap_wxTextCtrl_PositionToXY(PyObject *self, PyObject *args) {
     long  temp;
     long * _arg3;
     long  temp0;
     long  temp;
     long * _arg3;
     long  temp0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 {
 
     self = self;
 {


@@ -3819,10 +4069,11 @@ static PyObject *_wrap_wxTextCtrl_PositionToXY(PyObject *self, PyObject *args) {
 {
   _arg3 = &temp0;
 }
 {
   _arg3 = &temp0;
 }

-    if(!PyArg_ParseTuple(args,"sl:wxTextCtrl_PositionToXY",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxTextCtrl_PositionToXY",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_PositionToXY. Expected _wxTextCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_PositionToXY. Expected _wxTextCtrl_p.");
         return NULL;
         }


@@ -3853,13 +4104,14 @@ static PyObject *_wrap_wxTextCtrl_Remove(PyObject *self, PyObject *args) {
     wxTextCtrl * _arg0;
     long  _arg1;
     long  _arg2;
     wxTextCtrl * _arg0;
     long  _arg1;
     long  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sll:wxTextCtrl_Remove",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oll:wxTextCtrl_Remove",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_Remove. Expected _wxTextCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_Remove. Expected _wxTextCtrl_p.");
         return NULL;
         }


@@ -3881,14 +4133,15 @@ static PyObject *_wrap_wxTextCtrl_Replace(PyObject *self, PyObject *args) {
     long  _arg1;
     long  _arg2;
     wxString * _arg3;
     long  _arg1;
     long  _arg2;
     wxString * _arg3;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj3 = 0;
 
     self = self;
     PyObject * _obj3 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sllO:wxTextCtrl_Replace",&_argc0,&_arg1,&_arg2,&_obj3)) 
+    if(!PyArg_ParseTuple(args,"OllO:wxTextCtrl_Replace",&_argo0,&_arg1,&_arg2,&_obj3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_Replace. Expected _wxTextCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_Replace. Expected _wxTextCtrl_p.");
         return NULL;
         }


@@ -3920,14 +4173,15 @@ static PyObject *_wrap_wxTextCtrl_SaveFile(PyObject *self, PyObject *args) {
     bool  _result;
     wxTextCtrl * _arg0;
     wxString * _arg1;
     bool  _result;
     wxTextCtrl * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxTextCtrl_SaveFile",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTextCtrl_SaveFile",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_SaveFile. Expected _wxTextCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_SaveFile. Expected _wxTextCtrl_p.");
         return NULL;
         }


@@ -3957,14 +4211,15 @@ static PyObject *_wrap_wxTextCtrl_SetEditable(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxTextCtrl_SetEditable",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxTextCtrl_SetEditable",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_SetEditable. Expected _wxTextCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_SetEditable. Expected _wxTextCtrl_p.");
         return NULL;
         }


@@ -3985,13 +4240,14 @@ static PyObject *_wrap_wxTextCtrl_SetInsertionPoint(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     long  _arg1;
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxTextCtrl_SetInsertionPoint",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxTextCtrl_SetInsertionPoint",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_SetInsertionPoint. Expected _wxTextCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_SetInsertionPoint. Expected _wxTextCtrl_p.");
         return NULL;
         }


@@ -4010,13 +4266,14 @@ static PyObject *_wrap_wxTextCtrl_SetInsertionPoint(PyObject *self, PyObject *ar
 static PyObject *_wrap_wxTextCtrl_SetInsertionPointEnd(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
 static PyObject *_wrap_wxTextCtrl_SetInsertionPointEnd(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTextCtrl_SetInsertionPointEnd",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_SetInsertionPointEnd",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_SetInsertionPointEnd. Expected _wxTextCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_SetInsertionPointEnd. Expected _wxTextCtrl_p.");
         return NULL;
         }


@@ -4037,13 +4294,14 @@ static PyObject *_wrap_wxTextCtrl_SetSelection(PyObject *self, PyObject *args) {
     wxTextCtrl * _arg0;
     long  _arg1;
     long  _arg2;
     wxTextCtrl * _arg0;
     long  _arg1;
     long  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sll:wxTextCtrl_SetSelection",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oll:wxTextCtrl_SetSelection",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_SetSelection. Expected _wxTextCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_SetSelection. Expected _wxTextCtrl_p.");
         return NULL;
         }


@@ -4063,14 +4321,15 @@ static PyObject *_wrap_wxTextCtrl_SetValue(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxTextCtrl_SetValue",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTextCtrl_SetValue",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_SetValue. Expected _wxTextCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_SetValue. Expected _wxTextCtrl_p.");
         return NULL;
         }


@@ -4101,13 +4360,14 @@ static PyObject *_wrap_wxTextCtrl_ShowPosition(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     long  _arg1;
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxTextCtrl_ShowPosition",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxTextCtrl_ShowPosition",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_ShowPosition. Expected _wxTextCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_ShowPosition. Expected _wxTextCtrl_p.");
         return NULL;
         }


@@ -4127,14 +4387,15 @@ static PyObject *_wrap_wxTextCtrl_WriteText(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxTextCtrl_WriteText",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTextCtrl_WriteText",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_WriteText. Expected _wxTextCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_WriteText. Expected _wxTextCtrl_p.");
         return NULL;
         }


@@ -4165,14 +4426,15 @@ static PyObject *_wrap_wxTextCtrl_AppendText(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxTextCtrl_AppendText",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTextCtrl_AppendText",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_AppendText. Expected _wxTextCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_AppendText. Expected _wxTextCtrl_p.");
         return NULL;
         }


@@ -4205,13 +4467,14 @@ static PyObject *_wrap_wxTextCtrl_XYToPosition(PyObject *self, PyObject *args) {
     wxTextCtrl * _arg0;
     long  _arg1;
     long  _arg2;
     wxTextCtrl * _arg0;
     long  _arg1;
     long  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sll:wxTextCtrl_XYToPosition",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oll:wxTextCtrl_XYToPosition",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_XYToPosition. Expected _wxTextCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_XYToPosition. Expected _wxTextCtrl_p.");
         return NULL;
         }


@@ -4230,13 +4493,14 @@ static PyObject *_wrap_wxTextCtrl_CanCopy(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxTextCtrl * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxTextCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTextCtrl_CanCopy",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_CanCopy",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_CanCopy. Expected _wxTextCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_CanCopy. Expected _wxTextCtrl_p.");
         return NULL;
         }


@@ -4255,13 +4519,14 @@ static PyObject *_wrap_wxTextCtrl_CanCut(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxTextCtrl * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxTextCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTextCtrl_CanCut",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_CanCut",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_CanCut. Expected _wxTextCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_CanCut. Expected _wxTextCtrl_p.");
         return NULL;
         }


@@ -4280,13 +4545,14 @@ static PyObject *_wrap_wxTextCtrl_CanPaste(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxTextCtrl * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxTextCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTextCtrl_CanPaste",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_CanPaste",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_CanPaste. Expected _wxTextCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_CanPaste. Expected _wxTextCtrl_p.");
         return NULL;
         }


@@ -4305,13 +4571,14 @@ static PyObject *_wrap_wxTextCtrl_CanRedo(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxTextCtrl * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxTextCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTextCtrl_CanRedo",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_CanRedo",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_CanRedo. Expected _wxTextCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_CanRedo. Expected _wxTextCtrl_p.");
         return NULL;
         }


@@ -4330,13 +4597,14 @@ static PyObject *_wrap_wxTextCtrl_CanUndo(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxTextCtrl * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxTextCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTextCtrl_CanUndo",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_CanUndo",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_CanUndo. Expected _wxTextCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_CanUndo. Expected _wxTextCtrl_p.");
         return NULL;
         }


@@ -4358,7 +4626,7 @@ static PyObject *_wrap_wxTextCtrl_GetSelection(PyObject *self, PyObject *args) {
     long  temp;
     long * _arg2;
     long  temp0;
     long  temp;
     long * _arg2;
     long  temp0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 {
 
     self = self;
 {


@@ -4367,10 +4635,11 @@ static PyObject *_wrap_wxTextCtrl_GetSelection(PyObject *self, PyObject *args) {
 {
   _arg2 = &temp0;
 }
 {
   _arg2 = &temp0;
 }

-    if(!PyArg_ParseTuple(args,"s:wxTextCtrl_GetSelection",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_GetSelection",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_GetSelection. Expected _wxTextCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_GetSelection. Expected _wxTextCtrl_p.");
         return NULL;
         }


@@ -4400,13 +4669,14 @@ static PyObject *_wrap_wxTextCtrl_IsEditable(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxTextCtrl * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxTextCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTextCtrl_IsEditable",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_IsEditable",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_IsEditable. Expected _wxTextCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_IsEditable. Expected _wxTextCtrl_p.");
         return NULL;
         }


@@ -4449,41 +4719,45 @@ static PyObject *_wrap_new_wxScrollBar(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxScrollBar * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxScrollBar * _result;
     wxWindow * _arg0;

-    wxWindowID  _arg1 = -1;
-    wxPoint * _arg2 = &wxPyDefaultPosition;
-    wxSize * _arg3 = &wxPyDefaultSize;
-    long  _arg4 = (wxSB_HORIZONTAL);
-    wxValidator * _arg5 = &wxPyDefaultValidator;
-    char * _arg6 = "scrollBar";
-    char * _argc0 = 0;
-    char * _argc2 = 0;
-    char * _argc3 = 0;
-    char * _argc5 = 0;
+    wxWindowID  _arg1 = (wxWindowID ) -1;
+    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    long  _arg4 = (long ) wxSB_HORIZONTAL;
+    wxValidator * _arg5 = (wxValidator *) &wxPyDefaultValidator;
+    char * _arg6 = (char *) "scrollBar";
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;
+    PyObject * _argo3 = 0;
+    PyObject * _argo5 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|isslss:new_wxScrollBar",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_argc5,&_arg6)) 
+    if(!PyArg_ParseTuple(args,"O|iOOlOs:new_wxScrollBar",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_argo5,&_arg6)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxScrollBar. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxScrollBar. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxScrollBar. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxScrollBar. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxSize_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxScrollBar. Expected _wxSize_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxScrollBar. Expected _wxSize_p.");
         return NULL;
         }
     }

-    if (_argc5) {
-        if (SWIG_GetPtr(_argc5,(void **) &_arg5,"_wxValidator_p")) {
+    if (_argo5) {
+        if (_argo5 == Py_None) { _arg5 = NULL; }
+        else if (SWIG_GetPtrObj(_argo5,(void **) &_arg5,"_wxValidator_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of new_wxScrollBar. Expected _wxValidator_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of new_wxScrollBar. Expected _wxValidator_p.");
         return NULL;
         }


@@ -4493,8 +4767,13 @@ static PyObject *_wrap_new_wxScrollBar(PyObject *self, PyObject *args) {
         _result = (wxScrollBar *)new_wxScrollBar(_arg0,_arg1,*_arg2,*_arg3,_arg4,*_arg5,_arg6);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxScrollBar *)new_wxScrollBar(_arg0,_arg1,*_arg2,*_arg3,_arg4,*_arg5,_arg6);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxScrollBar_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxScrollBar_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -4503,13 +4782,14 @@ static PyObject *_wrap_wxScrollBar_GetRange(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxScrollBar * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxScrollBar * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxScrollBar_GetRange",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxScrollBar_GetRange",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScrollBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScrollBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrollBar_GetRange. Expected _wxScrollBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrollBar_GetRange. Expected _wxScrollBar_p.");
         return NULL;
         }


@@ -4528,13 +4808,14 @@ static PyObject *_wrap_wxScrollBar_GetPageSize(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxScrollBar * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxScrollBar * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxScrollBar_GetPageSize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxScrollBar_GetPageSize",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScrollBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScrollBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrollBar_GetPageSize. Expected _wxScrollBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrollBar_GetPageSize. Expected _wxScrollBar_p.");
         return NULL;
         }


@@ -4553,13 +4834,14 @@ static PyObject *_wrap_wxScrollBar_GetThumbPosition(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     int  _result;
     wxScrollBar * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxScrollBar * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxScrollBar_GetThumbPosition",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxScrollBar_GetThumbPosition",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScrollBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScrollBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrollBar_GetThumbPosition. Expected _wxScrollBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrollBar_GetThumbPosition. Expected _wxScrollBar_p.");
         return NULL;
         }


@@ -4578,13 +4860,14 @@ static PyObject *_wrap_wxScrollBar_GetThumbSize(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     int  _result;
     wxScrollBar * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxScrollBar * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxScrollBar_GetThumbSize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxScrollBar_GetThumbSize",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScrollBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScrollBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrollBar_GetThumbSize. Expected _wxScrollBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrollBar_GetThumbSize. Expected _wxScrollBar_p.");
         return NULL;
         }


@@ -4603,13 +4886,14 @@ static PyObject *_wrap_wxScrollBar_SetThumbPosition(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     wxScrollBar * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxScrollBar * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxScrollBar_SetThumbPosition",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxScrollBar_SetThumbPosition",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScrollBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScrollBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrollBar_SetThumbPosition. Expected _wxScrollBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrollBar_SetThumbPosition. Expected _wxScrollBar_p.");
         return NULL;
         }


@@ -4632,15 +4916,16 @@ static PyObject *_wrap_wxScrollBar_SetScrollbar(PyObject *self, PyObject *args)
     int  _arg2;
     int  _arg3;
     int  _arg4;
     int  _arg2;
     int  _arg3;
     int  _arg4;

-    bool  _arg5 = (1);
-    char * _argc0 = 0;
-    int tempbool5;
+    bool  _arg5 = (bool ) TRUE;
+    PyObject * _argo0 = 0;
+    int tempbool5 = (int) TRUE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siiii|i:wxScrollBar_SetScrollbar",&_argc0,&_arg1,&_arg2,&_arg3,&_arg4,&tempbool5)) 
+    if(!PyArg_ParseTuple(args,"Oiiii|i:wxScrollBar_SetScrollbar",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&tempbool5)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScrollBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScrollBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrollBar_SetScrollbar. Expected _wxScrollBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrollBar_SetScrollbar. Expected _wxScrollBar_p.");
         return NULL;
         }


@@ -4685,33 +4970,36 @@ static PyObject *_wrap_new_wxSpinButton(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxSpinButton * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxSpinButton * _result;
     wxWindow * _arg0;

-    wxWindowID  _arg1 = -1;
-    wxPoint * _arg2 = &wxPyDefaultPosition;
-    wxSize * _arg3 = &wxPyDefaultSize;
-    long  _arg4 = (wxSP_HORIZONTAL);
-    char * _arg5 = "spinButton";
-    char * _argc0 = 0;
-    char * _argc2 = 0;
-    char * _argc3 = 0;
+    wxWindowID  _arg1 = (wxWindowID ) -1;
+    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    long  _arg4 = (long ) wxSP_HORIZONTAL;
+    char * _arg5 = (char *) "spinButton";
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;
+    PyObject * _argo3 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|issls:new_wxSpinButton",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTuple(args,"O|iOOls:new_wxSpinButton",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxSpinButton. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxSpinButton. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxSpinButton. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxSpinButton. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxSize_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxSpinButton. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxSpinButton. Expected _wxSize_p.");
         return NULL;
         }


@@ -4721,8 +5009,13 @@ static PyObject *_wrap_new_wxSpinButton(PyObject *self, PyObject *args) {
         _result = (wxSpinButton *)new_wxSpinButton(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxSpinButton *)new_wxSpinButton(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxSpinButton_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxSpinButton_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -4731,13 +5024,14 @@ static PyObject *_wrap_wxSpinButton_GetMax(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxSpinButton * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxSpinButton * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSpinButton_GetMax",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSpinButton_GetMax",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSpinButton_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSpinButton_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSpinButton_GetMax. Expected _wxSpinButton_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSpinButton_GetMax. Expected _wxSpinButton_p.");
         return NULL;
         }


@@ -4756,13 +5050,14 @@ static PyObject *_wrap_wxSpinButton_GetMin(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxSpinButton * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxSpinButton * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSpinButton_GetMin",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSpinButton_GetMin",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSpinButton_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSpinButton_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSpinButton_GetMin. Expected _wxSpinButton_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSpinButton_GetMin. Expected _wxSpinButton_p.");
         return NULL;
         }


@@ -4781,13 +5076,14 @@ static PyObject *_wrap_wxSpinButton_GetValue(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxSpinButton * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxSpinButton * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSpinButton_GetValue",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSpinButton_GetValue",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSpinButton_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSpinButton_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSpinButton_GetValue. Expected _wxSpinButton_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSpinButton_GetValue. Expected _wxSpinButton_p.");
         return NULL;
         }


@@ -4807,13 +5103,14 @@ static PyObject *_wrap_wxSpinButton_SetRange(PyObject *self, PyObject *args) {
     wxSpinButton * _arg0;
     int  _arg1;
     int  _arg2;
     wxSpinButton * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxSpinButton_SetRange",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxSpinButton_SetRange",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSpinButton_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSpinButton_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSpinButton_SetRange. Expected _wxSpinButton_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSpinButton_SetRange. Expected _wxSpinButton_p.");
         return NULL;
         }


@@ -4833,13 +5130,14 @@ static PyObject *_wrap_wxSpinButton_SetValue(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxSpinButton * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxSpinButton * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxSpinButton_SetValue",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxSpinButton_SetValue",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSpinButton_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSpinButton_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSpinButton_SetValue. Expected _wxSpinButton_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSpinButton_SetValue. Expected _wxSpinButton_p.");
         return NULL;
         }


@@ -4885,39 +5183,43 @@ static PyObject *_wrap_new_wxStaticBitmap(PyObject *self, PyObject *args) {
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxBitmap * _arg2;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxBitmap * _arg2;

-    wxPoint * _arg3 = &wxPyDefaultPosition;
-    wxSize * _arg4 = &wxPyDefaultSize;
-    long  _arg5 = 0;
-    char * _arg6 = "staticBitmap";
-    char * _argc0 = 0;
-    char * _argc2 = 0;
-    char * _argc3 = 0;
-    char * _argc4 = 0;
+    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    long  _arg5 = (long ) 0;
+    char * _arg6 = (char *) "staticBitmap";
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;
+    PyObject * _argo3 = 0;
+    PyObject * _argo4 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sis|ssls:new_wxStaticBitmap",&_argc0,&_arg1,&_argc2,&_argc3,&_argc4,&_arg5,&_arg6)) 
+    if(!PyArg_ParseTuple(args,"OiO|OOls:new_wxStaticBitmap",&_argo0,&_arg1,&_argo2,&_argo3,&_argo4,&_arg5,&_arg6)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxStaticBitmap. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxStaticBitmap. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxBitmap_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxStaticBitmap. Expected _wxBitmap_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxStaticBitmap. Expected _wxBitmap_p.");
         return NULL;
         }
     }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxPoint_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxStaticBitmap. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxStaticBitmap. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_wxSize_p")) {
+    if (_argo4) {
+        if (_argo4 == Py_None) { _arg4 = NULL; }
+        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxStaticBitmap. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxStaticBitmap. Expected _wxSize_p.");
         return NULL;
         }


@@ -4927,8 +5229,13 @@ static PyObject *_wrap_new_wxStaticBitmap(PyObject *self, PyObject *args) {
         _result = (wxStaticBitmap *)new_wxStaticBitmap(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxStaticBitmap *)new_wxStaticBitmap(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxStaticBitmap_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxStaticBitmap_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -4937,14 +5244,15 @@ static PyObject *_wrap_wxStaticBitmap_GetBitmap(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxBitmap * _result;
     wxStaticBitmap * _arg0;
     PyObject * _resultobj;
     wxBitmap * _result;
     wxStaticBitmap * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxStaticBitmap_GetBitmap",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxStaticBitmap_GetBitmap",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxStaticBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStaticBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStaticBitmap_GetBitmap. Expected _wxStaticBitmap_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStaticBitmap_GetBitmap. Expected _wxStaticBitmap_p.");
         return NULL;
         }


@@ -4955,8 +5263,13 @@ static PyObject *_wrap_wxStaticBitmap_GetBitmap(PyObject *self, PyObject *args)
     _result = (wxBitmap *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxBitmap *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -4965,20 +5278,22 @@ static PyObject *_wrap_wxStaticBitmap_SetBitmap(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxStaticBitmap * _arg0;
     wxBitmap * _arg1;
     PyObject * _resultobj;
     wxStaticBitmap * _arg0;
     wxBitmap * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxStaticBitmap_SetBitmap",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxStaticBitmap_SetBitmap",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxStaticBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStaticBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStaticBitmap_SetBitmap. Expected _wxStaticBitmap_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStaticBitmap_SetBitmap. Expected _wxStaticBitmap_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxStaticBitmap_SetBitmap. Expected _wxBitmap_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxStaticBitmap_SetBitmap. Expected _wxBitmap_p.");
         return NULL;
         }


@@ -4998,20 +5313,22 @@ static PyObject *_wrap_wxStaticBitmap_SetIcon(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxStaticBitmap * _arg0;
     wxIcon * _arg1;
     PyObject * _resultobj;
     wxStaticBitmap * _arg0;
     wxIcon * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxStaticBitmap_SetIcon",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxStaticBitmap_SetIcon",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxStaticBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStaticBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStaticBitmap_SetIcon. Expected _wxStaticBitmap_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStaticBitmap_SetIcon. Expected _wxStaticBitmap_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxIcon_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxIcon_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxStaticBitmap_SetIcon. Expected _wxIcon_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxStaticBitmap_SetIcon. Expected _wxIcon_p.");
         return NULL;
         }


@@ -5057,27 +5374,28 @@ static PyObject *_wrap_new_wxRadioBox(PyObject *self, PyObject *args) {
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;

-    wxPoint * _arg3 = &wxPyDefaultPosition;
-    wxSize * _arg4 = &wxPyDefaultSize;
-    int  _arg5 = 0;
-    wxString * _arg6 = NULL;
-    int  _arg7 = 0;
-    long  _arg8 = (wxRA_HORIZONTAL);
-    wxValidator * _arg9 = &wxPyDefaultValidator;
-    char * _arg10 = "radioBox";
-    char * _argc0 = 0;
+    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    int  _arg5 = (int ) 0;
+    wxString * _arg6 = (wxString *) NULL;
+    int  _arg7 = (int ) 0;
+    long  _arg8 = (long ) wxRA_HORIZONTAL;
+    wxValidator * _arg9 = (wxValidator *) &wxPyDefaultValidator;
+    char * _arg10 = (char *) "radioBox";
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
     PyObject * _obj2 = 0;

-    char * _argc3 = 0;
-    char * _argc4 = 0;
+    PyObject * _argo3 = 0;
+    PyObject * _argo4 = 0;

     PyObject * _obj6 = 0;
     PyObject * _obj6 = 0;

-    char * _argc9 = 0;
+    PyObject * _argo9 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siO|ssOilss:new_wxRadioBox",&_argc0,&_arg1,&_obj2,&_argc3,&_argc4,&_obj6,&_arg7,&_arg8,&_argc9,&_arg10)) 
+    if(!PyArg_ParseTuple(args,"OiO|OOOilOs:new_wxRadioBox",&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_obj6,&_arg7,&_arg8,&_argo9,&_arg10)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxRadioBox. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxRadioBox. Expected _wxWindow_p.");
         return NULL;
         }


@@ -5089,14 +5407,16 @@ static PyObject *_wrap_new_wxRadioBox(PyObject *self, PyObject *args) {
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxPoint_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxRadioBox. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxRadioBox. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_wxSize_p")) {
+    if (_argo4) {
+        if (_argo4 == Py_None) { _arg4 = NULL; }
+        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxRadioBox. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxRadioBox. Expected _wxSize_p.");
         return NULL;
         }


@@ -5108,8 +5428,9 @@ static PyObject *_wrap_new_wxRadioBox(PyObject *self, PyObject *args) {
         return NULL;
     }
 }
         return NULL;
     }
 }

-    if (_argc9) {
-        if (SWIG_GetPtr(_argc9,(void **) &_arg9,"_wxValidator_p")) {
+    if (_argo9) {
+        if (_argo9 == Py_None) { _arg9 = NULL; }
+        else if (SWIG_GetPtrObj(_argo9,(void **) &_arg9,"_wxValidator_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 10 of new_wxRadioBox. Expected _wxValidator_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 10 of new_wxRadioBox. Expected _wxValidator_p.");
         return NULL;
         }


@@ -5127,8 +5448,13 @@ static PyObject *_wrap_new_wxRadioBox(PyObject *self, PyObject *args) {
         _result = (wxRadioBox *)new_wxRadioBox(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6,_arg7,_arg8,*_arg9,_arg10);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxRadioBox *)new_wxRadioBox(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6,_arg7,_arg8,*_arg9,_arg10);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxRadioBox_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxRadioBox_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     if (_obj2)
         delete _arg2;
 {
     if (_obj2)
         delete _arg2;


@@ -5144,14 +5470,15 @@ static PyObject *_wrap_wxRadioBox_Enable(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRadioBox * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxRadioBox * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxRadioBox_Enable",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxRadioBox_Enable",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRadioBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRadioBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_Enable. Expected _wxRadioBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_Enable. Expected _wxRadioBox_p.");
         return NULL;
         }


@@ -5173,14 +5500,15 @@ static PyObject *_wrap_wxRadioBox_EnableItem(PyObject *self, PyObject *args) {
     wxRadioBox * _arg0;
     int  _arg1;
     bool  _arg2;
     wxRadioBox * _arg0;
     int  _arg1;
     bool  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool2;
 
     self = self;
     int tempbool2;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxRadioBox_EnableItem",&_argc0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxRadioBox_EnableItem",&_argo0,&_arg1,&tempbool2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRadioBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRadioBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_EnableItem. Expected _wxRadioBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_EnableItem. Expected _wxRadioBox_p.");
         return NULL;
         }


@@ -5202,14 +5530,15 @@ static PyObject *_wrap_wxRadioBox_FindString(PyObject *self, PyObject *args) {
     int  _result;
     wxRadioBox * _arg0;
     wxString * _arg1;
     int  _result;
     wxRadioBox * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxRadioBox_FindString",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxRadioBox_FindString",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRadioBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRadioBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_FindString. Expected _wxRadioBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_FindString. Expected _wxRadioBox_p.");
         return NULL;
         }


@@ -5240,13 +5569,14 @@ static PyObject *_wrap_wxRadioBox_GetItemLabel(PyObject *self, PyObject *args) {
     wxString * _result;
     wxRadioBox * _arg0;
     int  _arg1;
     wxString * _result;
     wxRadioBox * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxRadioBox_GetItemLabel",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxRadioBox_GetItemLabel",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRadioBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRadioBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_GetItemLabel. Expected _wxRadioBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_GetItemLabel. Expected _wxRadioBox_p.");
         return NULL;
         }


@@ -5270,13 +5600,14 @@ static PyObject *_wrap_wxRadioBox_GetSelection(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxRadioBox * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxRadioBox * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxRadioBox_GetSelection",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRadioBox_GetSelection",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRadioBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRadioBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_GetSelection. Expected _wxRadioBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_GetSelection. Expected _wxRadioBox_p.");
         return NULL;
         }


@@ -5296,13 +5627,14 @@ static PyObject *_wrap_wxRadioBox_GetString(PyObject *self, PyObject *args) {
     wxString * _result;
     wxRadioBox * _arg0;
     int  _arg1;
     wxString * _result;
     wxRadioBox * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxRadioBox_GetString",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxRadioBox_GetString",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRadioBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRadioBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_GetString. Expected _wxRadioBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_GetString. Expected _wxRadioBox_p.");
         return NULL;
         }


@@ -5326,13 +5658,14 @@ static PyObject *_wrap_wxRadioBox_GetStringSelection(PyObject *self, PyObject *a
     PyObject * _resultobj;
     wxString * _result;
     wxRadioBox * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxRadioBox * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxRadioBox_GetStringSelection",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRadioBox_GetStringSelection",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRadioBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRadioBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_GetStringSelection. Expected _wxRadioBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_GetStringSelection. Expected _wxRadioBox_p.");
         return NULL;
         }


@@ -5356,13 +5689,14 @@ static PyObject *_wrap_wxRadioBox_Number(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxRadioBox * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxRadioBox * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxRadioBox_Number",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRadioBox_Number",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRadioBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRadioBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_Number. Expected _wxRadioBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_Number. Expected _wxRadioBox_p.");
         return NULL;
         }


@@ -5382,14 +5716,15 @@ static PyObject *_wrap_wxRadioBox_SetItemLabel(PyObject *self, PyObject *args) {
     wxRadioBox * _arg0;
     int  _arg1;
     wxString * _arg2;
     wxRadioBox * _arg0;
     int  _arg1;
     wxString * _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
 
     self = self;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siO:wxRadioBox_SetItemLabel",&_argc0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"OiO:wxRadioBox_SetItemLabel",&_argo0,&_arg1,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRadioBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRadioBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_SetItemLabel. Expected _wxRadioBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_SetItemLabel. Expected _wxRadioBox_p.");
         return NULL;
         }


@@ -5420,13 +5755,14 @@ static PyObject *_wrap_wxRadioBox_SetSelection(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRadioBox * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxRadioBox * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxRadioBox_SetSelection",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxRadioBox_SetSelection",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRadioBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRadioBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_SetSelection. Expected _wxRadioBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_SetSelection. Expected _wxRadioBox_p.");
         return NULL;
         }


@@ -5446,14 +5782,15 @@ static PyObject *_wrap_wxRadioBox_SetStringSelection(PyObject *self, PyObject *a
     PyObject * _resultobj;
     wxRadioBox * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxRadioBox * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxRadioBox_SetStringSelection",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxRadioBox_SetStringSelection",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRadioBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRadioBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_SetStringSelection. Expected _wxRadioBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_SetStringSelection. Expected _wxRadioBox_p.");
         return NULL;
         }


@@ -5484,14 +5821,15 @@ static PyObject *_wrap_wxRadioBox_Show(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRadioBox * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxRadioBox * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxRadioBox_Show",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxRadioBox_Show",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRadioBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRadioBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_Show. Expected _wxRadioBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_Show. Expected _wxRadioBox_p.");
         return NULL;
         }


@@ -5513,14 +5851,15 @@ static PyObject *_wrap_wxRadioBox_ShowItem(PyObject *self, PyObject *args) {
     wxRadioBox * _arg0;
     int  _arg1;
     bool  _arg2;
     wxRadioBox * _arg0;
     int  _arg1;
     bool  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool2;
 
     self = self;
     int tempbool2;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxRadioBox_ShowItem",&_argc0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxRadioBox_ShowItem",&_argo0,&_arg1,&tempbool2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRadioBox_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRadioBox_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_ShowItem. Expected _wxRadioBox_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_ShowItem. Expected _wxRadioBox_p.");
         return NULL;
         }


@@ -5567,23 +5906,24 @@ static PyObject *_wrap_new_wxRadioButton(PyObject *self, PyObject *args) {
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;

-    wxPoint * _arg3 = &wxPyDefaultPosition;
-    wxSize * _arg4 = &wxPyDefaultSize;
-    long  _arg5 = 0;
-    wxValidator * _arg6 = &wxPyDefaultValidator;
-    char * _arg7 = "radioButton";
-    char * _argc0 = 0;
+    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    long  _arg5 = (long ) 0;
+    wxValidator * _arg6 = (wxValidator *) &wxPyDefaultValidator;
+    char * _arg7 = (char *) "radioButton";
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
     PyObject * _obj2 = 0;

-    char * _argc3 = 0;
-    char * _argc4 = 0;
-    char * _argc6 = 0;
+    PyObject * _argo3 = 0;
+    PyObject * _argo4 = 0;
+    PyObject * _argo6 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siO|sslss:new_wxRadioButton",&_argc0,&_arg1,&_obj2,&_argc3,&_argc4,&_arg5,&_argc6,&_arg7)) 
+    if(!PyArg_ParseTuple(args,"OiO|OOlOs:new_wxRadioButton",&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_argo6,&_arg7)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxRadioButton. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxRadioButton. Expected _wxWindow_p.");
         return NULL;
         }


@@ -5595,20 +5935,23 @@ static PyObject *_wrap_new_wxRadioButton(PyObject *self, PyObject *args) {
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxPoint_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxRadioButton. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxRadioButton. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_wxSize_p")) {
+    if (_argo4) {
+        if (_argo4 == Py_None) { _arg4 = NULL; }
+        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxRadioButton. Expected _wxSize_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxRadioButton. Expected _wxSize_p.");
         return NULL;
         }
     }

-    if (_argc6) {
-        if (SWIG_GetPtr(_argc6,(void **) &_arg6,"_wxValidator_p")) {
+    if (_argo6) {
+        if (_argo6 == Py_None) { _arg6 = NULL; }
+        else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxValidator_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of new_wxRadioButton. Expected _wxValidator_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of new_wxRadioButton. Expected _wxValidator_p.");
         return NULL;
         }


@@ -5618,8 +5961,13 @@ static PyObject *_wrap_new_wxRadioButton(PyObject *self, PyObject *args) {
         _result = (wxRadioButton *)new_wxRadioButton(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,*_arg6,_arg7);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxRadioButton *)new_wxRadioButton(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,*_arg6,_arg7);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxRadioButton_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxRadioButton_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     if (_obj2)
         delete _arg2;
 {
     if (_obj2)
         delete _arg2;


@@ -5632,13 +5980,14 @@ static PyObject *_wrap_wxRadioButton_GetValue(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxRadioButton * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxRadioButton * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxRadioButton_GetValue",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRadioButton_GetValue",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRadioButton_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRadioButton_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioButton_GetValue. Expected _wxRadioButton_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioButton_GetValue. Expected _wxRadioButton_p.");
         return NULL;
         }


@@ -5657,14 +6006,15 @@ static PyObject *_wrap_wxRadioButton_SetValue(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRadioButton * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxRadioButton * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxRadioButton_SetValue",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxRadioButton_SetValue",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRadioButton_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRadioButton_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioButton_SetValue. Expected _wxRadioButton_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioButton_SetValue. Expected _wxRadioButton_p.");
         return NULL;
         }


@@ -5713,40 +6063,44 @@ static PyObject *_wrap_new_wxSlider(PyObject *self, PyObject *args) {
     int  _arg2;
     int  _arg3;
     int  _arg4;
     int  _arg2;
     int  _arg3;
     int  _arg4;

-    wxPoint * _arg5 = &wxPyDefaultPosition;
-    wxSize * _arg6 = &wxPyDefaultSize;
-    long  _arg7 = (wxSL_HORIZONTAL);
-    wxValidator * _arg8 = &wxPyDefaultValidator;
-    char * _arg9 = "slider";
-    char * _argc0 = 0;
-    char * _argc5 = 0;
-    char * _argc6 = 0;
-    char * _argc8 = 0;
+    wxPoint * _arg5 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg6 = (wxSize *) &wxPyDefaultSize;
+    long  _arg7 = (long ) wxSL_HORIZONTAL;
+    wxValidator * _arg8 = (wxValidator *) &wxPyDefaultValidator;
+    char * _arg9 = (char *) "slider";
+    PyObject * _argo0 = 0;
+    PyObject * _argo5 = 0;
+    PyObject * _argo6 = 0;
+    PyObject * _argo8 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siiii|sslss:new_wxSlider",&_argc0,&_arg1,&_arg2,&_arg3,&_arg4,&_argc5,&_argc6,&_arg7,&_argc8,&_arg9)) 
+    if(!PyArg_ParseTuple(args,"Oiiii|OOlOs:new_wxSlider",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_argo5,&_argo6,&_arg7,&_argo8,&_arg9)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxSlider. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxSlider. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc5) {
-        if (SWIG_GetPtr(_argc5,(void **) &_arg5,"_wxPoint_p")) {
+    if (_argo5) {
+        if (_argo5 == Py_None) { _arg5 = NULL; }
+        else if (SWIG_GetPtrObj(_argo5,(void **) &_arg5,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of new_wxSlider. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of new_wxSlider. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc6) {
-        if (SWIG_GetPtr(_argc6,(void **) &_arg6,"_wxSize_p")) {
+    if (_argo6) {
+        if (_argo6 == Py_None) { _arg6 = NULL; }
+        else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of new_wxSlider. Expected _wxSize_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of new_wxSlider. Expected _wxSize_p.");
         return NULL;
         }
     }

-    if (_argc8) {
-        if (SWIG_GetPtr(_argc8,(void **) &_arg8,"_wxValidator_p")) {
+    if (_argo8) {
+        if (_argo8 == Py_None) { _arg8 = NULL; }
+        else if (SWIG_GetPtrObj(_argo8,(void **) &_arg8,"_wxValidator_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 9 of new_wxSlider. Expected _wxValidator_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 9 of new_wxSlider. Expected _wxValidator_p.");
         return NULL;
         }


@@ -5756,8 +6110,13 @@ static PyObject *_wrap_new_wxSlider(PyObject *self, PyObject *args) {
         _result = (wxSlider *)new_wxSlider(_arg0,_arg1,_arg2,_arg3,_arg4,*_arg5,*_arg6,_arg7,*_arg8,_arg9);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxSlider *)new_wxSlider(_arg0,_arg1,_arg2,_arg3,_arg4,*_arg5,*_arg6,_arg7,*_arg8,_arg9);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxSlider_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxSlider_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -5765,13 +6124,14 @@ static PyObject *_wrap_new_wxSlider(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxSlider_ClearSel(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxSlider * _arg0;
 static PyObject *_wrap_wxSlider_ClearSel(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxSlider * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSlider_ClearSel",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSlider_ClearSel",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSlider_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSlider_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_ClearSel. Expected _wxSlider_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_ClearSel. Expected _wxSlider_p.");
         return NULL;
         }


@@ -5790,13 +6150,14 @@ static PyObject *_wrap_wxSlider_ClearSel(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxSlider_ClearTicks(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxSlider * _arg0;
 static PyObject *_wrap_wxSlider_ClearTicks(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxSlider * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSlider_ClearTicks",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSlider_ClearTicks",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSlider_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSlider_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_ClearTicks. Expected _wxSlider_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_ClearTicks. Expected _wxSlider_p.");
         return NULL;
         }


@@ -5816,13 +6177,14 @@ static PyObject *_wrap_wxSlider_GetLineSize(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSlider_GetLineSize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSlider_GetLineSize",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSlider_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSlider_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_GetLineSize. Expected _wxSlider_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_GetLineSize. Expected _wxSlider_p.");
         return NULL;
         }


@@ -5841,13 +6203,14 @@ static PyObject *_wrap_wxSlider_GetMax(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSlider_GetMax",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSlider_GetMax",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSlider_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSlider_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_GetMax. Expected _wxSlider_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_GetMax. Expected _wxSlider_p.");
         return NULL;
         }


@@ -5866,13 +6229,14 @@ static PyObject *_wrap_wxSlider_GetMin(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSlider_GetMin",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSlider_GetMin",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSlider_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSlider_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_GetMin. Expected _wxSlider_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_GetMin. Expected _wxSlider_p.");
         return NULL;
         }


@@ -5891,13 +6255,14 @@ static PyObject *_wrap_wxSlider_GetPageSize(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSlider_GetPageSize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSlider_GetPageSize",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSlider_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSlider_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_GetPageSize. Expected _wxSlider_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_GetPageSize. Expected _wxSlider_p.");
         return NULL;
         }


@@ -5916,13 +6281,14 @@ static PyObject *_wrap_wxSlider_GetSelEnd(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSlider_GetSelEnd",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSlider_GetSelEnd",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSlider_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSlider_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_GetSelEnd. Expected _wxSlider_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_GetSelEnd. Expected _wxSlider_p.");
         return NULL;
         }


@@ -5941,13 +6307,14 @@ static PyObject *_wrap_wxSlider_GetSelStart(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSlider_GetSelStart",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSlider_GetSelStart",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSlider_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSlider_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_GetSelStart. Expected _wxSlider_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_GetSelStart. Expected _wxSlider_p.");
         return NULL;
         }


@@ -5966,13 +6333,14 @@ static PyObject *_wrap_wxSlider_GetThumbLength(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSlider_GetThumbLength",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSlider_GetThumbLength",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSlider_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSlider_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_GetThumbLength. Expected _wxSlider_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_GetThumbLength. Expected _wxSlider_p.");
         return NULL;
         }


@@ -5991,13 +6359,14 @@ static PyObject *_wrap_wxSlider_GetTickFreq(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSlider_GetTickFreq",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSlider_GetTickFreq",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSlider_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSlider_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_GetTickFreq. Expected _wxSlider_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_GetTickFreq. Expected _wxSlider_p.");
         return NULL;
         }


@@ -6016,13 +6385,14 @@ static PyObject *_wrap_wxSlider_GetValue(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSlider_GetValue",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSlider_GetValue",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSlider_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSlider_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_GetValue. Expected _wxSlider_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_GetValue. Expected _wxSlider_p.");
         return NULL;
         }


@@ -6042,13 +6412,14 @@ static PyObject *_wrap_wxSlider_SetRange(PyObject *self, PyObject *args) {
     wxSlider * _arg0;
     int  _arg1;
     int  _arg2;
     wxSlider * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxSlider_SetRange",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxSlider_SetRange",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSlider_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSlider_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_SetRange. Expected _wxSlider_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_SetRange. Expected _wxSlider_p.");
         return NULL;
         }


@@ -6069,13 +6440,14 @@ static PyObject *_wrap_wxSlider_SetTickFreq(PyObject *self, PyObject *args) {
     wxSlider * _arg0;
     int  _arg1;
     int  _arg2;
     wxSlider * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxSlider_SetTickFreq",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxSlider_SetTickFreq",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSlider_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSlider_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_SetTickFreq. Expected _wxSlider_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_SetTickFreq. Expected _wxSlider_p.");
         return NULL;
         }


@@ -6095,13 +6467,14 @@ static PyObject *_wrap_wxSlider_SetLineSize(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxSlider * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxSlider * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxSlider_SetLineSize",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxSlider_SetLineSize",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSlider_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSlider_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_SetLineSize. Expected _wxSlider_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_SetLineSize. Expected _wxSlider_p.");
         return NULL;
         }


@@ -6121,13 +6494,14 @@ static PyObject *_wrap_wxSlider_SetPageSize(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxSlider * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxSlider * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxSlider_SetPageSize",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxSlider_SetPageSize",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSlider_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSlider_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_SetPageSize. Expected _wxSlider_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_SetPageSize. Expected _wxSlider_p.");
         return NULL;
         }


@@ -6148,13 +6522,14 @@ static PyObject *_wrap_wxSlider_SetSelection(PyObject *self, PyObject *args) {
     wxSlider * _arg0;
     int  _arg1;
     int  _arg2;
     wxSlider * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxSlider_SetSelection",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxSlider_SetSelection",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSlider_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSlider_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_SetSelection. Expected _wxSlider_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_SetSelection. Expected _wxSlider_p.");
         return NULL;
         }


@@ -6174,13 +6549,14 @@ static PyObject *_wrap_wxSlider_SetThumbLength(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxSlider * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxSlider * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxSlider_SetThumbLength",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxSlider_SetThumbLength",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSlider_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSlider_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_SetThumbLength. Expected _wxSlider_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_SetThumbLength. Expected _wxSlider_p.");
         return NULL;
         }


@@ -6200,13 +6576,14 @@ static PyObject *_wrap_wxSlider_SetTick(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxSlider * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxSlider * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxSlider_SetTick",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxSlider_SetTick",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSlider_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSlider_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_SetTick. Expected _wxSlider_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_SetTick. Expected _wxSlider_p.");
         return NULL;
         }


@@ -6226,13 +6603,14 @@ static PyObject *_wrap_wxSlider_SetValue(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxSlider * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxSlider * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxSlider_SetValue",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxSlider_SetValue",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSlider_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSlider_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_SetValue. Expected _wxSlider_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSlider_SetValue. Expected _wxSlider_p.");
         return NULL;
         }


@@ -6248,655 +6626,666 @@ static PyObject *_wrap_wxSlider_SetValue(PyObject *self, PyObject *args) {
 }
 
 static PyMethodDef controlscMethods[] = {
 }
 
 static PyMethodDef controlscMethods[] = {

-        { "wxSlider_SetValue", _wrap_wxSlider_SetValue, 1 },
-        { "wxSlider_SetTick", _wrap_wxSlider_SetTick, 1 },
-        { "wxSlider_SetThumbLength", _wrap_wxSlider_SetThumbLength, 1 },
-        { "wxSlider_SetSelection", _wrap_wxSlider_SetSelection, 1 },
-        { "wxSlider_SetPageSize", _wrap_wxSlider_SetPageSize, 1 },
-        { "wxSlider_SetLineSize", _wrap_wxSlider_SetLineSize, 1 },
-        { "wxSlider_SetTickFreq", _wrap_wxSlider_SetTickFreq, 1 },
-        { "wxSlider_SetRange", _wrap_wxSlider_SetRange, 1 },
-        { "wxSlider_GetValue", _wrap_wxSlider_GetValue, 1 },
-        { "wxSlider_GetTickFreq", _wrap_wxSlider_GetTickFreq, 1 },
-        { "wxSlider_GetThumbLength", _wrap_wxSlider_GetThumbLength, 1 },
-        { "wxSlider_GetSelStart", _wrap_wxSlider_GetSelStart, 1 },
-        { "wxSlider_GetSelEnd", _wrap_wxSlider_GetSelEnd, 1 },
-        { "wxSlider_GetPageSize", _wrap_wxSlider_GetPageSize, 1 },
-        { "wxSlider_GetMin", _wrap_wxSlider_GetMin, 1 },
-        { "wxSlider_GetMax", _wrap_wxSlider_GetMax, 1 },
-        { "wxSlider_GetLineSize", _wrap_wxSlider_GetLineSize, 1 },
-        { "wxSlider_ClearTicks", _wrap_wxSlider_ClearTicks, 1 },
-        { "wxSlider_ClearSel", _wrap_wxSlider_ClearSel, 1 },
-        { "new_wxSlider", _wrap_new_wxSlider, 1 },
-        { "wxRadioButton_SetValue", _wrap_wxRadioButton_SetValue, 1 },
-        { "wxRadioButton_GetValue", _wrap_wxRadioButton_GetValue, 1 },
-        { "new_wxRadioButton", _wrap_new_wxRadioButton, 1 },
-        { "wxRadioBox_ShowItem", _wrap_wxRadioBox_ShowItem, 1 },
-        { "wxRadioBox_Show", _wrap_wxRadioBox_Show, 1 },
-        { "wxRadioBox_SetStringSelection", _wrap_wxRadioBox_SetStringSelection, 1 },
-        { "wxRadioBox_SetSelection", _wrap_wxRadioBox_SetSelection, 1 },
-        { "wxRadioBox_SetItemLabel", _wrap_wxRadioBox_SetItemLabel, 1 },
-        { "wxRadioBox_Number", _wrap_wxRadioBox_Number, 1 },
-        { "wxRadioBox_GetStringSelection", _wrap_wxRadioBox_GetStringSelection, 1 },
-        { "wxRadioBox_GetString", _wrap_wxRadioBox_GetString, 1 },
-        { "wxRadioBox_GetSelection", _wrap_wxRadioBox_GetSelection, 1 },
-        { "wxRadioBox_GetItemLabel", _wrap_wxRadioBox_GetItemLabel, 1 },
-        { "wxRadioBox_FindString", _wrap_wxRadioBox_FindString, 1 },
-        { "wxRadioBox_EnableItem", _wrap_wxRadioBox_EnableItem, 1 },
-        { "wxRadioBox_Enable", _wrap_wxRadioBox_Enable, 1 },
-        { "new_wxRadioBox", _wrap_new_wxRadioBox, 1 },
-        { "wxStaticBitmap_SetIcon", _wrap_wxStaticBitmap_SetIcon, 1 },
-        { "wxStaticBitmap_SetBitmap", _wrap_wxStaticBitmap_SetBitmap, 1 },
-        { "wxStaticBitmap_GetBitmap", _wrap_wxStaticBitmap_GetBitmap, 1 },
-        { "new_wxStaticBitmap", _wrap_new_wxStaticBitmap, 1 },
-        { "wxSpinButton_SetValue", _wrap_wxSpinButton_SetValue, 1 },
-        { "wxSpinButton_SetRange", _wrap_wxSpinButton_SetRange, 1 },
-        { "wxSpinButton_GetValue", _wrap_wxSpinButton_GetValue, 1 },
-        { "wxSpinButton_GetMin", _wrap_wxSpinButton_GetMin, 1 },
-        { "wxSpinButton_GetMax", _wrap_wxSpinButton_GetMax, 1 },
-        { "new_wxSpinButton", _wrap_new_wxSpinButton, 1 },
-        { "wxScrollBar_SetScrollbar", _wrap_wxScrollBar_SetScrollbar, 1 },
-        { "wxScrollBar_SetThumbPosition", _wrap_wxScrollBar_SetThumbPosition, 1 },
-        { "wxScrollBar_GetThumbSize", _wrap_wxScrollBar_GetThumbSize, 1 },
-        { "wxScrollBar_GetThumbPosition", _wrap_wxScrollBar_GetThumbPosition, 1 },
-        { "wxScrollBar_GetPageSize", _wrap_wxScrollBar_GetPageSize, 1 },
-        { "wxScrollBar_GetRange", _wrap_wxScrollBar_GetRange, 1 },
-        { "new_wxScrollBar", _wrap_new_wxScrollBar, 1 },
-        { "wxTextCtrl_IsEditable", _wrap_wxTextCtrl_IsEditable, 1 },
-        { "wxTextCtrl_GetSelection", _wrap_wxTextCtrl_GetSelection, 1 },
-        { "wxTextCtrl_CanUndo", _wrap_wxTextCtrl_CanUndo, 1 },
-        { "wxTextCtrl_CanRedo", _wrap_wxTextCtrl_CanRedo, 1 },
-        { "wxTextCtrl_CanPaste", _wrap_wxTextCtrl_CanPaste, 1 },
-        { "wxTextCtrl_CanCut", _wrap_wxTextCtrl_CanCut, 1 },
-        { "wxTextCtrl_CanCopy", _wrap_wxTextCtrl_CanCopy, 1 },
-        { "wxTextCtrl_XYToPosition", _wrap_wxTextCtrl_XYToPosition, 1 },
-        { "wxTextCtrl_AppendText", _wrap_wxTextCtrl_AppendText, 1 },
-        { "wxTextCtrl_WriteText", _wrap_wxTextCtrl_WriteText, 1 },
-        { "wxTextCtrl_ShowPosition", _wrap_wxTextCtrl_ShowPosition, 1 },
-        { "wxTextCtrl_SetValue", _wrap_wxTextCtrl_SetValue, 1 },
-        { "wxTextCtrl_SetSelection", _wrap_wxTextCtrl_SetSelection, 1 },
-        { "wxTextCtrl_SetInsertionPointEnd", _wrap_wxTextCtrl_SetInsertionPointEnd, 1 },
-        { "wxTextCtrl_SetInsertionPoint", _wrap_wxTextCtrl_SetInsertionPoint, 1 },
-        { "wxTextCtrl_SetEditable", _wrap_wxTextCtrl_SetEditable, 1 },
-        { "wxTextCtrl_SaveFile", _wrap_wxTextCtrl_SaveFile, 1 },
-        { "wxTextCtrl_Replace", _wrap_wxTextCtrl_Replace, 1 },
-        { "wxTextCtrl_Remove", _wrap_wxTextCtrl_Remove, 1 },
-        { "wxTextCtrl_PositionToXY", _wrap_wxTextCtrl_PositionToXY, 1 },
-        { "wxTextCtrl_Paste", _wrap_wxTextCtrl_Paste, 1 },
-        { "wxTextCtrl_LoadFile", _wrap_wxTextCtrl_LoadFile, 1 },
-        { "wxTextCtrl_IsModified", _wrap_wxTextCtrl_IsModified, 1 },
-        { "wxTextCtrl_GetValue", _wrap_wxTextCtrl_GetValue, 1 },
-        { "wxTextCtrl_GetNumberOfLines", _wrap_wxTextCtrl_GetNumberOfLines, 1 },
-        { "wxTextCtrl_GetLineText", _wrap_wxTextCtrl_GetLineText, 1 },
-        { "wxTextCtrl_GetLineLength", _wrap_wxTextCtrl_GetLineLength, 1 },
-        { "wxTextCtrl_GetLastPosition", _wrap_wxTextCtrl_GetLastPosition, 1 },
-        { "wxTextCtrl_GetInsertionPoint", _wrap_wxTextCtrl_GetInsertionPoint, 1 },
-        { "wxTextCtrl_DiscardEdits", _wrap_wxTextCtrl_DiscardEdits, 1 },
-        { "wxTextCtrl_Cut", _wrap_wxTextCtrl_Cut, 1 },
-        { "wxTextCtrl_Copy", _wrap_wxTextCtrl_Copy, 1 },
-        { "wxTextCtrl_Clear", _wrap_wxTextCtrl_Clear, 1 },
-        { "new_wxTextCtrl", _wrap_new_wxTextCtrl, 1 },
-        { "wxCheckListBox_GetItemHeight", _wrap_wxCheckListBox_GetItemHeight, 1 },
-        { "wxCheckListBox_Check", _wrap_wxCheckListBox_Check, 1 },
-        { "wxCheckListBox_IsChecked", _wrap_wxCheckListBox_IsChecked, 1 },
-        { "new_wxCheckListBox", _wrap_new_wxCheckListBox, 1 },
-        { "wxListBox_SetStringSelection", _wrap_wxListBox_SetStringSelection, 1 },
-        { "wxListBox_SetString", _wrap_wxListBox_SetString, 1 },
-        { "wxListBox_SetSelection", _wrap_wxListBox_SetSelection, 1 },
-        { "wxListBox_SetFirstItemStr", _wrap_wxListBox_SetFirstItemStr, 1 },
-        { "wxListBox_SetFirstItem", _wrap_wxListBox_SetFirstItem, 1 },
-        { "wxListBox_Set", _wrap_wxListBox_Set, 1 },
-        { "wxListBox_Selected", _wrap_wxListBox_Selected, 1 },
-        { "wxListBox_Number", _wrap_wxListBox_Number, 1 },
-        { "wxListBox_GetStringSelection", _wrap_wxListBox_GetStringSelection, 1 },
-        { "wxListBox_GetString", _wrap_wxListBox_GetString, 1 },
-        { "wxListBox_GetSelections", _wrap_wxListBox_GetSelections, 1 },
-        { "wxListBox_GetSelection", _wrap_wxListBox_GetSelection, 1 },
-        { "wxListBox_FindString", _wrap_wxListBox_FindString, 1 },
-        { "wxListBox_Deselect", _wrap_wxListBox_Deselect, 1 },
-        { "wxListBox_Delete", _wrap_wxListBox_Delete, 1 },
-        { "wxListBox_Clear", _wrap_wxListBox_Clear, 1 },
-        { "wxListBox_Append", _wrap_wxListBox_Append, 1 },
-        { "new_wxListBox", _wrap_new_wxListBox, 1 },
-        { "wxStaticText_SetLabel", _wrap_wxStaticText_SetLabel, 1 },
-        { "wxStaticText_GetLabel", _wrap_wxStaticText_GetLabel, 1 },
-        { "new_wxStaticText", _wrap_new_wxStaticText, 1 },
-        { "new_wxStaticLine", _wrap_new_wxStaticLine, 1 },
-        { "new_wxStaticBox", _wrap_new_wxStaticBox, 1 },
-        { "wxGauge_SetValue", _wrap_wxGauge_SetValue, 1 },
-        { "wxGauge_SetShadowWidth", _wrap_wxGauge_SetShadowWidth, 1 },
-        { "wxGauge_SetRange", _wrap_wxGauge_SetRange, 1 },
-        { "wxGauge_SetBezelFace", _wrap_wxGauge_SetBezelFace, 1 },
-        { "wxGauge_GetValue", _wrap_wxGauge_GetValue, 1 },
-        { "wxGauge_GetShadowWidth", _wrap_wxGauge_GetShadowWidth, 1 },
-        { "wxGauge_GetRange", _wrap_wxGauge_GetRange, 1 },
-        { "wxGauge_GetBezelFace", _wrap_wxGauge_GetBezelFace, 1 },
-        { "new_wxGauge", _wrap_new_wxGauge, 1 },
-        { "wxComboBox_SetValue", _wrap_wxComboBox_SetValue, 1 },
-        { "wxComboBox_SetMark", _wrap_wxComboBox_SetMark, 1 },
-        { "wxComboBox_SetInsertionPointEnd", _wrap_wxComboBox_SetInsertionPointEnd, 1 },
-        { "wxComboBox_SetInsertionPoint", _wrap_wxComboBox_SetInsertionPoint, 1 },
-        { "wxComboBox_Remove", _wrap_wxComboBox_Remove, 1 },
-        { "wxComboBox_Replace", _wrap_wxComboBox_Replace, 1 },
-        { "wxComboBox_Paste", _wrap_wxComboBox_Paste, 1 },
-        { "wxComboBox_Number", _wrap_wxComboBox_Number, 1 },
-        { "wxComboBox_GetValue", _wrap_wxComboBox_GetValue, 1 },
-        { "wxComboBox_GetStringSelection", _wrap_wxComboBox_GetStringSelection, 1 },
-        { "wxComboBox_GetString", _wrap_wxComboBox_GetString, 1 },
-        { "wxComboBox_GetSelection", _wrap_wxComboBox_GetSelection, 1 },
-        { "wxComboBox_GetLastPosition", _wrap_wxComboBox_GetLastPosition, 1 },
-        { "wxComboBox_GetInsertionPoint", _wrap_wxComboBox_GetInsertionPoint, 1 },
-        { "wxComboBox_FindString", _wrap_wxComboBox_FindString, 1 },
-        { "wxComboBox_Delete", _wrap_wxComboBox_Delete, 1 },
-        { "wxComboBox_Cut", _wrap_wxComboBox_Cut, 1 },
-        { "wxComboBox_Copy", _wrap_wxComboBox_Copy, 1 },
-        { "wxComboBox_Clear", _wrap_wxComboBox_Clear, 1 },
-        { "wxComboBox_Append", _wrap_wxComboBox_Append, 1 },
-        { "new_wxComboBox", _wrap_new_wxComboBox, 1 },
-        { "wxChoice_SetStringSelection", _wrap_wxChoice_SetStringSelection, 1 },
-        { "wxChoice_SetSelection", _wrap_wxChoice_SetSelection, 1 },
-        { "wxChoice_SetColumns", _wrap_wxChoice_SetColumns, 1 },
-        { "wxChoice_Number", _wrap_wxChoice_Number, 1 },
-        { "wxChoice_GetStringSelection", _wrap_wxChoice_GetStringSelection, 1 },
-        { "wxChoice_GetString", _wrap_wxChoice_GetString, 1 },
-        { "wxChoice_GetSelection", _wrap_wxChoice_GetSelection, 1 },
-        { "wxChoice_GetColumns", _wrap_wxChoice_GetColumns, 1 },
-        { "wxChoice_FindString", _wrap_wxChoice_FindString, 1 },
-        { "wxChoice_Clear", _wrap_wxChoice_Clear, 1 },
-        { "wxChoice_Append", _wrap_wxChoice_Append, 1 },
-        { "new_wxChoice", _wrap_new_wxChoice, 1 },
-        { "wxCheckBox_SetValue", _wrap_wxCheckBox_SetValue, 1 },
-        { "wxCheckBox_GetValue", _wrap_wxCheckBox_GetValue, 1 },
-        { "new_wxCheckBox", _wrap_new_wxCheckBox, 1 },
-        { "wxBitmapButton_SetBitmapLabel", _wrap_wxBitmapButton_SetBitmapLabel, 1 },
-        { "wxBitmapButton_SetBitmapSelected", _wrap_wxBitmapButton_SetBitmapSelected, 1 },
-        { "wxBitmapButton_SetBitmapFocus", _wrap_wxBitmapButton_SetBitmapFocus, 1 },
-        { "wxBitmapButton_SetBitmapDisabled", _wrap_wxBitmapButton_SetBitmapDisabled, 1 },
-        { "wxBitmapButton_GetBitmapSelected", _wrap_wxBitmapButton_GetBitmapSelected, 1 },
-        { "wxBitmapButton_GetBitmapFocus", _wrap_wxBitmapButton_GetBitmapFocus, 1 },
-        { "wxBitmapButton_GetBitmapDisabled", _wrap_wxBitmapButton_GetBitmapDisabled, 1 },
-        { "wxBitmapButton_GetBitmapLabel", _wrap_wxBitmapButton_GetBitmapLabel, 1 },
-        { "new_wxBitmapButton", _wrap_new_wxBitmapButton, 1 },
-        { "wxButton_SetDefault", _wrap_wxButton_SetDefault, 1 },
-        { "new_wxButton", _wrap_new_wxButton, 1 },
-        { "wxControl_SetLabel", _wrap_wxControl_SetLabel, 1 },
-        { "wxControl_GetLabel", _wrap_wxControl_GetLabel, 1 },
-        { "wxControl_Command", _wrap_wxControl_Command, 1 },
+        { "wxSlider_SetValue", _wrap_wxSlider_SetValue, METH_VARARGS },
+        { "wxSlider_SetTick", _wrap_wxSlider_SetTick, METH_VARARGS },
+        { "wxSlider_SetThumbLength", _wrap_wxSlider_SetThumbLength, METH_VARARGS },
+        { "wxSlider_SetSelection", _wrap_wxSlider_SetSelection, METH_VARARGS },
+        { "wxSlider_SetPageSize", _wrap_wxSlider_SetPageSize, METH_VARARGS },
+        { "wxSlider_SetLineSize", _wrap_wxSlider_SetLineSize, METH_VARARGS },
+        { "wxSlider_SetTickFreq", _wrap_wxSlider_SetTickFreq, METH_VARARGS },
+        { "wxSlider_SetRange", _wrap_wxSlider_SetRange, METH_VARARGS },
+        { "wxSlider_GetValue", _wrap_wxSlider_GetValue, METH_VARARGS },
+        { "wxSlider_GetTickFreq", _wrap_wxSlider_GetTickFreq, METH_VARARGS },
+        { "wxSlider_GetThumbLength", _wrap_wxSlider_GetThumbLength, METH_VARARGS },
+        { "wxSlider_GetSelStart", _wrap_wxSlider_GetSelStart, METH_VARARGS },
+        { "wxSlider_GetSelEnd", _wrap_wxSlider_GetSelEnd, METH_VARARGS },
+        { "wxSlider_GetPageSize", _wrap_wxSlider_GetPageSize, METH_VARARGS },
+        { "wxSlider_GetMin", _wrap_wxSlider_GetMin, METH_VARARGS },
+        { "wxSlider_GetMax", _wrap_wxSlider_GetMax, METH_VARARGS },
+        { "wxSlider_GetLineSize", _wrap_wxSlider_GetLineSize, METH_VARARGS },
+        { "wxSlider_ClearTicks", _wrap_wxSlider_ClearTicks, METH_VARARGS },
+        { "wxSlider_ClearSel", _wrap_wxSlider_ClearSel, METH_VARARGS },
+        { "new_wxSlider", _wrap_new_wxSlider, METH_VARARGS },
+        { "wxRadioButton_SetValue", _wrap_wxRadioButton_SetValue, METH_VARARGS },
+        { "wxRadioButton_GetValue", _wrap_wxRadioButton_GetValue, METH_VARARGS },
+        { "new_wxRadioButton", _wrap_new_wxRadioButton, METH_VARARGS },
+        { "wxRadioBox_ShowItem", _wrap_wxRadioBox_ShowItem, METH_VARARGS },
+        { "wxRadioBox_Show", _wrap_wxRadioBox_Show, METH_VARARGS },
+        { "wxRadioBox_SetStringSelection", _wrap_wxRadioBox_SetStringSelection, METH_VARARGS },
+        { "wxRadioBox_SetSelection", _wrap_wxRadioBox_SetSelection, METH_VARARGS },
+        { "wxRadioBox_SetItemLabel", _wrap_wxRadioBox_SetItemLabel, METH_VARARGS },
+        { "wxRadioBox_Number", _wrap_wxRadioBox_Number, METH_VARARGS },
+        { "wxRadioBox_GetStringSelection", _wrap_wxRadioBox_GetStringSelection, METH_VARARGS },
+        { "wxRadioBox_GetString", _wrap_wxRadioBox_GetString, METH_VARARGS },
+        { "wxRadioBox_GetSelection", _wrap_wxRadioBox_GetSelection, METH_VARARGS },
+        { "wxRadioBox_GetItemLabel", _wrap_wxRadioBox_GetItemLabel, METH_VARARGS },
+        { "wxRadioBox_FindString", _wrap_wxRadioBox_FindString, METH_VARARGS },
+        { "wxRadioBox_EnableItem", _wrap_wxRadioBox_EnableItem, METH_VARARGS },
+        { "wxRadioBox_Enable", _wrap_wxRadioBox_Enable, METH_VARARGS },
+        { "new_wxRadioBox", _wrap_new_wxRadioBox, METH_VARARGS },
+        { "wxStaticBitmap_SetIcon", _wrap_wxStaticBitmap_SetIcon, METH_VARARGS },
+        { "wxStaticBitmap_SetBitmap", _wrap_wxStaticBitmap_SetBitmap, METH_VARARGS },
+        { "wxStaticBitmap_GetBitmap", _wrap_wxStaticBitmap_GetBitmap, METH_VARARGS },
+        { "new_wxStaticBitmap", _wrap_new_wxStaticBitmap, METH_VARARGS },
+        { "wxSpinButton_SetValue", _wrap_wxSpinButton_SetValue, METH_VARARGS },
+        { "wxSpinButton_SetRange", _wrap_wxSpinButton_SetRange, METH_VARARGS },
+        { "wxSpinButton_GetValue", _wrap_wxSpinButton_GetValue, METH_VARARGS },
+        { "wxSpinButton_GetMin", _wrap_wxSpinButton_GetMin, METH_VARARGS },
+        { "wxSpinButton_GetMax", _wrap_wxSpinButton_GetMax, METH_VARARGS },
+        { "new_wxSpinButton", _wrap_new_wxSpinButton, METH_VARARGS },
+        { "wxScrollBar_SetScrollbar", _wrap_wxScrollBar_SetScrollbar, METH_VARARGS },
+        { "wxScrollBar_SetThumbPosition", _wrap_wxScrollBar_SetThumbPosition, METH_VARARGS },
+        { "wxScrollBar_GetThumbSize", _wrap_wxScrollBar_GetThumbSize, METH_VARARGS },
+        { "wxScrollBar_GetThumbPosition", _wrap_wxScrollBar_GetThumbPosition, METH_VARARGS },
+        { "wxScrollBar_GetPageSize", _wrap_wxScrollBar_GetPageSize, METH_VARARGS },
+        { "wxScrollBar_GetRange", _wrap_wxScrollBar_GetRange, METH_VARARGS },
+        { "new_wxScrollBar", _wrap_new_wxScrollBar, METH_VARARGS },
+        { "wxTextCtrl_IsEditable", _wrap_wxTextCtrl_IsEditable, METH_VARARGS },
+        { "wxTextCtrl_GetSelection", _wrap_wxTextCtrl_GetSelection, METH_VARARGS },
+        { "wxTextCtrl_CanUndo", _wrap_wxTextCtrl_CanUndo, METH_VARARGS },
+        { "wxTextCtrl_CanRedo", _wrap_wxTextCtrl_CanRedo, METH_VARARGS },
+        { "wxTextCtrl_CanPaste", _wrap_wxTextCtrl_CanPaste, METH_VARARGS },
+        { "wxTextCtrl_CanCut", _wrap_wxTextCtrl_CanCut, METH_VARARGS },
+        { "wxTextCtrl_CanCopy", _wrap_wxTextCtrl_CanCopy, METH_VARARGS },
+        { "wxTextCtrl_XYToPosition", _wrap_wxTextCtrl_XYToPosition, METH_VARARGS },
+        { "wxTextCtrl_AppendText", _wrap_wxTextCtrl_AppendText, METH_VARARGS },
+        { "wxTextCtrl_WriteText", _wrap_wxTextCtrl_WriteText, METH_VARARGS },
+        { "wxTextCtrl_ShowPosition", _wrap_wxTextCtrl_ShowPosition, METH_VARARGS },
+        { "wxTextCtrl_SetValue", _wrap_wxTextCtrl_SetValue, METH_VARARGS },
+        { "wxTextCtrl_SetSelection", _wrap_wxTextCtrl_SetSelection, METH_VARARGS },
+        { "wxTextCtrl_SetInsertionPointEnd", _wrap_wxTextCtrl_SetInsertionPointEnd, METH_VARARGS },
+        { "wxTextCtrl_SetInsertionPoint", _wrap_wxTextCtrl_SetInsertionPoint, METH_VARARGS },
+        { "wxTextCtrl_SetEditable", _wrap_wxTextCtrl_SetEditable, METH_VARARGS },
+        { "wxTextCtrl_SaveFile", _wrap_wxTextCtrl_SaveFile, METH_VARARGS },
+        { "wxTextCtrl_Replace", _wrap_wxTextCtrl_Replace, METH_VARARGS },
+        { "wxTextCtrl_Remove", _wrap_wxTextCtrl_Remove, METH_VARARGS },
+        { "wxTextCtrl_PositionToXY", _wrap_wxTextCtrl_PositionToXY, METH_VARARGS },
+        { "wxTextCtrl_Paste", _wrap_wxTextCtrl_Paste, METH_VARARGS },
+        { "wxTextCtrl_LoadFile", _wrap_wxTextCtrl_LoadFile, METH_VARARGS },
+        { "wxTextCtrl_IsModified", _wrap_wxTextCtrl_IsModified, METH_VARARGS },
+        { "wxTextCtrl_GetValue", _wrap_wxTextCtrl_GetValue, METH_VARARGS },
+        { "wxTextCtrl_GetNumberOfLines", _wrap_wxTextCtrl_GetNumberOfLines, METH_VARARGS },
+        { "wxTextCtrl_GetLineText", _wrap_wxTextCtrl_GetLineText, METH_VARARGS },
+        { "wxTextCtrl_GetLineLength", _wrap_wxTextCtrl_GetLineLength, METH_VARARGS },
+        { "wxTextCtrl_GetLastPosition", _wrap_wxTextCtrl_GetLastPosition, METH_VARARGS },
+        { "wxTextCtrl_GetInsertionPoint", _wrap_wxTextCtrl_GetInsertionPoint, METH_VARARGS },
+        { "wxTextCtrl_DiscardEdits", _wrap_wxTextCtrl_DiscardEdits, METH_VARARGS },
+        { "wxTextCtrl_Cut", _wrap_wxTextCtrl_Cut, METH_VARARGS },
+        { "wxTextCtrl_Copy", _wrap_wxTextCtrl_Copy, METH_VARARGS },
+        { "wxTextCtrl_Clear", _wrap_wxTextCtrl_Clear, METH_VARARGS },
+        { "new_wxTextCtrl", _wrap_new_wxTextCtrl, METH_VARARGS },
+        { "wxCheckListBox_GetItemHeight", _wrap_wxCheckListBox_GetItemHeight, METH_VARARGS },
+        { "wxCheckListBox_Check", _wrap_wxCheckListBox_Check, METH_VARARGS },
+        { "wxCheckListBox_IsChecked", _wrap_wxCheckListBox_IsChecked, METH_VARARGS },
+        { "new_wxCheckListBox", _wrap_new_wxCheckListBox, METH_VARARGS },
+        { "wxListBox_SetStringSelection", _wrap_wxListBox_SetStringSelection, METH_VARARGS },
+        { "wxListBox_SetString", _wrap_wxListBox_SetString, METH_VARARGS },
+        { "wxListBox_SetSelection", _wrap_wxListBox_SetSelection, METH_VARARGS },
+        { "wxListBox_SetFirstItemStr", _wrap_wxListBox_SetFirstItemStr, METH_VARARGS },
+        { "wxListBox_SetFirstItem", _wrap_wxListBox_SetFirstItem, METH_VARARGS },
+        { "wxListBox_Set", _wrap_wxListBox_Set, METH_VARARGS },
+        { "wxListBox_Selected", _wrap_wxListBox_Selected, METH_VARARGS },
+        { "wxListBox_Number", _wrap_wxListBox_Number, METH_VARARGS },
+        { "wxListBox_GetStringSelection", _wrap_wxListBox_GetStringSelection, METH_VARARGS },
+        { "wxListBox_GetString", _wrap_wxListBox_GetString, METH_VARARGS },
+        { "wxListBox_GetSelections", _wrap_wxListBox_GetSelections, METH_VARARGS },
+        { "wxListBox_GetSelection", _wrap_wxListBox_GetSelection, METH_VARARGS },
+        { "wxListBox_FindString", _wrap_wxListBox_FindString, METH_VARARGS },
+        { "wxListBox_Deselect", _wrap_wxListBox_Deselect, METH_VARARGS },
+        { "wxListBox_Delete", _wrap_wxListBox_Delete, METH_VARARGS },
+        { "wxListBox_Clear", _wrap_wxListBox_Clear, METH_VARARGS },
+        { "wxListBox_Append", _wrap_wxListBox_Append, METH_VARARGS },
+        { "new_wxListBox", _wrap_new_wxListBox, METH_VARARGS },
+        { "wxStaticText_SetLabel", _wrap_wxStaticText_SetLabel, METH_VARARGS },
+        { "wxStaticText_GetLabel", _wrap_wxStaticText_GetLabel, METH_VARARGS },
+        { "new_wxStaticText", _wrap_new_wxStaticText, METH_VARARGS },
+        { "new_wxStaticLine", _wrap_new_wxStaticLine, METH_VARARGS },
+        { "new_wxStaticBox", _wrap_new_wxStaticBox, METH_VARARGS },
+        { "wxGauge_SetValue", _wrap_wxGauge_SetValue, METH_VARARGS },
+        { "wxGauge_SetShadowWidth", _wrap_wxGauge_SetShadowWidth, METH_VARARGS },
+        { "wxGauge_SetRange", _wrap_wxGauge_SetRange, METH_VARARGS },
+        { "wxGauge_SetBezelFace", _wrap_wxGauge_SetBezelFace, METH_VARARGS },
+        { "wxGauge_GetValue", _wrap_wxGauge_GetValue, METH_VARARGS },
+        { "wxGauge_GetShadowWidth", _wrap_wxGauge_GetShadowWidth, METH_VARARGS },
+        { "wxGauge_GetRange", _wrap_wxGauge_GetRange, METH_VARARGS },
+        { "wxGauge_GetBezelFace", _wrap_wxGauge_GetBezelFace, METH_VARARGS },
+        { "new_wxGauge", _wrap_new_wxGauge, METH_VARARGS },
+        { "wxComboBox_SetValue", _wrap_wxComboBox_SetValue, METH_VARARGS },
+        { "wxComboBox_SetMark", _wrap_wxComboBox_SetMark, METH_VARARGS },
+        { "wxComboBox_SetSelection", _wrap_wxComboBox_SetSelection, METH_VARARGS },
+        { "wxComboBox_SetInsertionPointEnd", _wrap_wxComboBox_SetInsertionPointEnd, METH_VARARGS },
+        { "wxComboBox_SetInsertionPoint", _wrap_wxComboBox_SetInsertionPoint, METH_VARARGS },
+        { "wxComboBox_Remove", _wrap_wxComboBox_Remove, METH_VARARGS },
+        { "wxComboBox_Replace", _wrap_wxComboBox_Replace, METH_VARARGS },
+        { "wxComboBox_Paste", _wrap_wxComboBox_Paste, METH_VARARGS },
+        { "wxComboBox_Number", _wrap_wxComboBox_Number, METH_VARARGS },
+        { "wxComboBox_GetValue", _wrap_wxComboBox_GetValue, METH_VARARGS },
+        { "wxComboBox_GetStringSelection", _wrap_wxComboBox_GetStringSelection, METH_VARARGS },
+        { "wxComboBox_GetString", _wrap_wxComboBox_GetString, METH_VARARGS },
+        { "wxComboBox_GetSelection", _wrap_wxComboBox_GetSelection, METH_VARARGS },
+        { "wxComboBox_GetLastPosition", _wrap_wxComboBox_GetLastPosition, METH_VARARGS },
+        { "wxComboBox_GetInsertionPoint", _wrap_wxComboBox_GetInsertionPoint, METH_VARARGS },
+        { "wxComboBox_FindString", _wrap_wxComboBox_FindString, METH_VARARGS },
+        { "wxComboBox_Delete", _wrap_wxComboBox_Delete, METH_VARARGS },
+        { "wxComboBox_Cut", _wrap_wxComboBox_Cut, METH_VARARGS },
+        { "wxComboBox_Copy", _wrap_wxComboBox_Copy, METH_VARARGS },
+        { "wxComboBox_Clear", _wrap_wxComboBox_Clear, METH_VARARGS },
+        { "wxComboBox_Append", _wrap_wxComboBox_Append, METH_VARARGS },
+        { "new_wxComboBox", _wrap_new_wxComboBox, METH_VARARGS },
+        { "wxChoice_SetStringSelection", _wrap_wxChoice_SetStringSelection, METH_VARARGS },
+        { "wxChoice_SetSelection", _wrap_wxChoice_SetSelection, METH_VARARGS },
+        { "wxChoice_SetColumns", _wrap_wxChoice_SetColumns, METH_VARARGS },
+        { "wxChoice_Number", _wrap_wxChoice_Number, METH_VARARGS },
+        { "wxChoice_GetStringSelection", _wrap_wxChoice_GetStringSelection, METH_VARARGS },
+        { "wxChoice_GetString", _wrap_wxChoice_GetString, METH_VARARGS },
+        { "wxChoice_GetSelection", _wrap_wxChoice_GetSelection, METH_VARARGS },
+        { "wxChoice_GetColumns", _wrap_wxChoice_GetColumns, METH_VARARGS },
+        { "wxChoice_FindString", _wrap_wxChoice_FindString, METH_VARARGS },
+        { "wxChoice_Clear", _wrap_wxChoice_Clear, METH_VARARGS },
+        { "wxChoice_Append", _wrap_wxChoice_Append, METH_VARARGS },
+        { "new_wxChoice", _wrap_new_wxChoice, METH_VARARGS },
+        { "wxCheckBox_SetValue", _wrap_wxCheckBox_SetValue, METH_VARARGS },
+        { "wxCheckBox_GetValue", _wrap_wxCheckBox_GetValue, METH_VARARGS },
+        { "new_wxCheckBox", _wrap_new_wxCheckBox, METH_VARARGS },
+        { "wxBitmapButton_SetBitmapLabel", _wrap_wxBitmapButton_SetBitmapLabel, METH_VARARGS },
+        { "wxBitmapButton_SetBitmapSelected", _wrap_wxBitmapButton_SetBitmapSelected, METH_VARARGS },
+        { "wxBitmapButton_SetBitmapFocus", _wrap_wxBitmapButton_SetBitmapFocus, METH_VARARGS },
+        { "wxBitmapButton_SetBitmapDisabled", _wrap_wxBitmapButton_SetBitmapDisabled, METH_VARARGS },
+        { "wxBitmapButton_GetBitmapSelected", _wrap_wxBitmapButton_GetBitmapSelected, METH_VARARGS },
+        { "wxBitmapButton_GetBitmapFocus", _wrap_wxBitmapButton_GetBitmapFocus, METH_VARARGS },
+        { "wxBitmapButton_GetBitmapDisabled", _wrap_wxBitmapButton_GetBitmapDisabled, METH_VARARGS },
+        { "wxBitmapButton_GetBitmapLabel", _wrap_wxBitmapButton_GetBitmapLabel, METH_VARARGS },
+        { "new_wxBitmapButton", _wrap_new_wxBitmapButton, METH_VARARGS },
+        { "wxButton_SetDefault", _wrap_wxButton_SetDefault, METH_VARARGS },
+        { "new_wxButton", _wrap_new_wxButton, METH_VARARGS },
+        { "wxControl_SetLabel", _wrap_wxControl_SetLabel, METH_VARARGS },
+        { "wxControl_GetLabel", _wrap_wxControl_GetLabel, METH_VARARGS },
+        { "wxControl_Command", _wrap_wxControl_Command, METH_VARARGS },

         { NULL, NULL }
 };
         { NULL, NULL }
 };

+#ifdef __cplusplus
+}
+#endif
+/*
+ * This table is used by the pointer type-checker
+ */
+static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
+    { "_wxAcceleratorTable","_class_wxAcceleratorTable",0},
+    { "_wxEvent","_class_wxEvent",0},
+    { "_class_wxActivateEvent","_wxActivateEvent",0},
+    { "_signed_long","_long",0},
+    { "_wxMenuEvent","_class_wxMenuEvent",0},
+    { "_wxPrintQuality","_int",0},
+    { "_wxPrintQuality","_signed_int",0},
+    { "_wxPrintQuality","_unsigned_int",0},
+    { "_wxPrintQuality","_wxWindowID",0},
+    { "_wxPrintQuality","_uint",0},
+    { "_wxPrintQuality","_EBool",0},
+    { "_wxPrintQuality","_size_t",0},
+    { "_class_wxRegionIterator","_wxRegionIterator",0},
+    { "_class_wxMenuBar","_wxMenuBar",0},
+    { "_class_wxEvtHandler","_class_wxSlider",SwigwxSliderTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxSlider",SwigwxSliderTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxRadioButton",SwigwxRadioButtonTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxRadioButton",SwigwxRadioButtonTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxRadioBox",SwigwxRadioBoxTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxRadioBox",SwigwxRadioBoxTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxStaticBitmap",SwigwxStaticBitmapTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxStaticBitmap",SwigwxStaticBitmapTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxSpinButton",SwigwxSpinButtonTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxSpinButton",SwigwxSpinButtonTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxScrollBar",SwigwxScrollBarTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxScrollBar",SwigwxScrollBarTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxTextCtrl",SwigwxTextCtrlTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxTextCtrl",SwigwxTextCtrlTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxCheckListBox",SwigwxCheckListBoxTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxCheckListBox",SwigwxCheckListBoxTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxListBox",SwigwxListBoxTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxListBox",SwigwxListBoxTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxStaticText",SwigwxStaticTextTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxStaticText",SwigwxStaticTextTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxStaticLine",SwigwxStaticLineTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxStaticLine",SwigwxStaticLineTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxStaticBox",SwigwxStaticBoxTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxStaticBox",SwigwxStaticBoxTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxGauge",SwigwxGaugeTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxGauge",SwigwxGaugeTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxComboBox",SwigwxComboBoxTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxComboBox",SwigwxComboBoxTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxChoice",SwigwxChoiceTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxChoice",SwigwxChoiceTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxCheckBox",SwigwxCheckBoxTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxCheckBox",SwigwxCheckBoxTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxBitmapButton",SwigwxBitmapButtonTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxBitmapButton",SwigwxBitmapButtonTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxButton",SwigwxButtonTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxButton",SwigwxButtonTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxControl",SwigwxControlTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxControl",SwigwxControlTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxEvtHandler",0},
+    { "_wxPaintEvent","_class_wxPaintEvent",0},
+    { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
+    { "_wxCursor","_class_wxCursor",0},
+    { "_wxNotifyEvent","_class_wxNotifyEvent",0},
+    { "_wxMask","_class_wxMask",0},
+    { "_wxPen","_class_wxPen",0},
+    { "_wxUpdateUIEvent","_class_wxUpdateUIEvent",0},
+    { "_byte","_unsigned_char",0},
+    { "_wxStaticBox","_class_wxStaticBox",0},
+    { "_wxChoice","_class_wxComboBox",SwigwxComboBoxTowxChoice},
+    { "_wxChoice","_wxComboBox",SwigwxComboBoxTowxChoice},
+    { "_wxChoice","_class_wxChoice",0},
+    { "_wxSlider","_class_wxSlider",0},
+    { "_long","_wxDash",0},
+    { "_long","_unsigned_long",0},
+    { "_long","_signed_long",0},
+    { "_wxImageList","_class_wxImageList",0},
+    { "_wxDropFilesEvent","_class_wxDropFilesEvent",0},
+    { "_wxBitmapButton","_class_wxBitmapButton",0},
+    { "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
+    { "_class_wxGauge","_wxGauge",0},
+    { "_wxDC","_class_wxDC",0},
+    { "_wxSpinEvent","_class_wxSpinEvent",0},
+    { "_size_t","_wxPrintQuality",0},
+    { "_size_t","_unsigned_int",0},
+    { "_size_t","_int",0},
+    { "_size_t","_wxWindowID",0},
+    { "_size_t","_uint",0},
+    { "_class_wxRealPoint","_wxRealPoint",0},
+    { "_wxPrinterDC","_class_wxPrinterDC",0},
+    { "_class_wxMenuItem","_wxMenuItem",0},
+    { "_class_wxPaintEvent","_wxPaintEvent",0},
+    { "_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0},
+    { "_wxPanel","_class_wxPanel",0},
+    { "_wxInitDialogEvent","_class_wxInitDialogEvent",0},
+    { "_wxCheckBox","_class_wxCheckBox",0},
+    { "_wxPyEvent","_class_wxPyEvent",0},
+    { "_wxTextCtrl","_class_wxTextCtrl",0},
+    { "_class_wxMask","_wxMask",0},
+    { "_class_wxKeyEvent","_wxKeyEvent",0},
+    { "_wxColour","_class_wxColour",0},
+    { "_class_wxDialog","_wxDialog",0},
+    { "_wxIdleEvent","_class_wxIdleEvent",0},
+    { "_class_wxUpdateUIEvent","_wxUpdateUIEvent",0},
+    { "_wxStaticLine","_class_wxStaticLine",0},
+    { "_wxBrush","_class_wxBrush",0},
+    { "_wxShowEvent","_class_wxShowEvent",0},
+    { "_uint","_wxPrintQuality",0},
+    { "_uint","_size_t",0},
+    { "_uint","_unsigned_int",0},
+    { "_uint","_int",0},
+    { "_uint","_wxWindowID",0},
+    { "_class_wxEvent","_wxEvent",0},
+    { "_wxCheckListBox","_class_wxCheckListBox",0},
+    { "_wxRect","_class_wxRect",0},
+    { "_wxCommandEvent","_class_wxCommandEvent",0},
+    { "_wxSizeEvent","_class_wxSizeEvent",0},
+    { "_wxPoint","_class_wxPoint",0},
+    { "_class_wxButton","_class_wxBitmapButton",SwigwxBitmapButtonTowxButton},
+    { "_class_wxButton","_wxBitmapButton",SwigwxBitmapButtonTowxButton},
+    { "_class_wxButton","_wxButton",0},
+    { "_wxRadioBox","_class_wxRadioBox",0},
+    { "_wxBitmap","_class_wxBitmap",0},
+    { "_wxPyTimer","_class_wxPyTimer",0},
+    { "_wxWindowDC","_class_wxWindowDC",0},
+    { "_wxScrollBar","_class_wxScrollBar",0},
+    { "_wxSpinButton","_class_wxSpinButton",0},
+    { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
+    { "_class_wxNotifyEvent","_wxNotifyEvent",0},
+    { "_class_wxPyEvent","_wxPyEvent",0},
+    { "_class_wxIconizeEvent","_wxIconizeEvent",0},
+    { "_class_wxStaticBitmap","_wxStaticBitmap",0},
+    { "_class_wxStaticLine","_wxStaticLine",0},
+    { "_wxScrollEvent","_class_wxScrollEvent",0},
+    { "_EBool","_wxPrintQuality",0},
+    { "_EBool","_signed_int",0},
+    { "_EBool","_int",0},
+    { "_EBool","_wxWindowID",0},
+    { "_class_wxRegion","_wxRegion",0},
+    { "_class_wxDropFilesEvent","_wxDropFilesEvent",0},
+    { "_wxStaticText","_class_wxStaticText",0},
+    { "_wxFont","_class_wxFont",0},
+    { "_wxCloseEvent","_class_wxCloseEvent",0},
+    { "_unsigned_long","_wxDash",0},
+    { "_unsigned_long","_long",0},
+    { "_class_wxRect","_wxRect",0},
+    { "_class_wxDC","_wxDC",0},
+    { "_class_wxPyTimer","_wxPyTimer",0},
+    { "_wxFocusEvent","_class_wxFocusEvent",0},
+    { "_wxMaximizeEvent","_class_wxMaximizeEvent",0},
+    { "_class_wxSpinButton","_wxSpinButton",0},
+    { "_wxAcceleratorEntry","_class_wxAcceleratorEntry",0},
+    { "_class_wxPanel","_wxPanel",0},
+    { "_class_wxCheckBox","_wxCheckBox",0},
+    { "_wxComboBox","_class_wxComboBox",0},
+    { "_wxRadioButton","_class_wxRadioButton",0},
+    { "_signed_int","_wxPrintQuality",0},
+    { "_signed_int","_EBool",0},
+    { "_signed_int","_wxWindowID",0},
+    { "_signed_int","_int",0},
+    { "_class_wxTextCtrl","_wxTextCtrl",0},
+    { "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
+    { "_wxMetaFileDC","_class_wxMetaFileDC",0},
+    { "_wxMenu","_class_wxMenu",0},
+    { "_class_wxMoveEvent","_wxMoveEvent",0},
+    { "_wxListBox","_class_wxCheckListBox",SwigwxCheckListBoxTowxListBox},
+    { "_wxListBox","_wxCheckListBox",SwigwxCheckListBoxTowxListBox},
+    { "_wxListBox","_class_wxListBox",0},
+    { "_wxScreenDC","_class_wxScreenDC",0},
+    { "_WXTYPE","_short",0},
+    { "_WXTYPE","_signed_short",0},
+    { "_WXTYPE","_unsigned_short",0},
+    { "_class_wxBrush","_wxBrush",0},
+    { "_unsigned_short","_WXTYPE",0},
+    { "_unsigned_short","_short",0},
+    { "_class_wxWindow","_class_wxSlider",SwigwxSliderTowxWindow},
+    { "_class_wxWindow","_wxSlider",SwigwxSliderTowxWindow},
+    { "_class_wxWindow","_class_wxRadioButton",SwigwxRadioButtonTowxWindow},
+    { "_class_wxWindow","_wxRadioButton",SwigwxRadioButtonTowxWindow},
+    { "_class_wxWindow","_class_wxRadioBox",SwigwxRadioBoxTowxWindow},
+    { "_class_wxWindow","_wxRadioBox",SwigwxRadioBoxTowxWindow},
+    { "_class_wxWindow","_class_wxStaticBitmap",SwigwxStaticBitmapTowxWindow},
+    { "_class_wxWindow","_wxStaticBitmap",SwigwxStaticBitmapTowxWindow},
+    { "_class_wxWindow","_class_wxSpinButton",SwigwxSpinButtonTowxWindow},
+    { "_class_wxWindow","_wxSpinButton",SwigwxSpinButtonTowxWindow},
+    { "_class_wxWindow","_class_wxScrollBar",SwigwxScrollBarTowxWindow},
+    { "_class_wxWindow","_wxScrollBar",SwigwxScrollBarTowxWindow},
+    { "_class_wxWindow","_class_wxTextCtrl",SwigwxTextCtrlTowxWindow},
+    { "_class_wxWindow","_wxTextCtrl",SwigwxTextCtrlTowxWindow},
+    { "_class_wxWindow","_class_wxCheckListBox",SwigwxCheckListBoxTowxWindow},
+    { "_class_wxWindow","_wxCheckListBox",SwigwxCheckListBoxTowxWindow},
+    { "_class_wxWindow","_class_wxListBox",SwigwxListBoxTowxWindow},
+    { "_class_wxWindow","_wxListBox",SwigwxListBoxTowxWindow},
+    { "_class_wxWindow","_class_wxStaticText",SwigwxStaticTextTowxWindow},
+    { "_class_wxWindow","_wxStaticText",SwigwxStaticTextTowxWindow},
+    { "_class_wxWindow","_class_wxStaticLine",SwigwxStaticLineTowxWindow},
+    { "_class_wxWindow","_wxStaticLine",SwigwxStaticLineTowxWindow},
+    { "_class_wxWindow","_class_wxStaticBox",SwigwxStaticBoxTowxWindow},
+    { "_class_wxWindow","_wxStaticBox",SwigwxStaticBoxTowxWindow},
+    { "_class_wxWindow","_class_wxGauge",SwigwxGaugeTowxWindow},
+    { "_class_wxWindow","_wxGauge",SwigwxGaugeTowxWindow},
+    { "_class_wxWindow","_class_wxComboBox",SwigwxComboBoxTowxWindow},
+    { "_class_wxWindow","_wxComboBox",SwigwxComboBoxTowxWindow},
+    { "_class_wxWindow","_class_wxChoice",SwigwxChoiceTowxWindow},
+    { "_class_wxWindow","_wxChoice",SwigwxChoiceTowxWindow},
+    { "_class_wxWindow","_class_wxCheckBox",SwigwxCheckBoxTowxWindow},
+    { "_class_wxWindow","_wxCheckBox",SwigwxCheckBoxTowxWindow},
+    { "_class_wxWindow","_class_wxBitmapButton",SwigwxBitmapButtonTowxWindow},
+    { "_class_wxWindow","_wxBitmapButton",SwigwxBitmapButtonTowxWindow},
+    { "_class_wxWindow","_class_wxButton",SwigwxButtonTowxWindow},
+    { "_class_wxWindow","_wxButton",SwigwxButtonTowxWindow},
+    { "_class_wxWindow","_class_wxControl",SwigwxControlTowxWindow},
+    { "_class_wxWindow","_wxControl",SwigwxControlTowxWindow},
+    { "_class_wxWindow","_wxWindow",0},
+    { "_class_wxStaticText","_wxStaticText",0},
+    { "_class_wxFont","_wxFont",0},
+    { "_class_wxCloseEvent","_wxCloseEvent",0},
+    { "_class_wxMenuEvent","_wxMenuEvent",0},
+    { "_wxClientDC","_class_wxClientDC",0},
+    { "_wxMouseEvent","_class_wxMouseEvent",0},
+    { "_class_wxPoint","_wxPoint",0},
+    { "_wxRealPoint","_class_wxRealPoint",0},
+    { "_class_wxRadioBox","_wxRadioBox",0},
+    { "_signed_short","_WXTYPE",0},
+    { "_signed_short","_short",0},
+    { "_wxMemoryDC","_class_wxMemoryDC",0},
+    { "_wxPaintDC","_class_wxPaintDC",0},
+    { "_class_wxWindowDC","_wxWindowDC",0},
+    { "_class_wxFocusEvent","_wxFocusEvent",0},
+    { "_class_wxMaximizeEvent","_wxMaximizeEvent",0},
+    { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
+    { "_class_wxCursor","_wxCursor",0},
+    { "_wxScrolledWindow","_class_wxScrolledWindow",0},
+    { "_unsigned_char","_byte",0},
+    { "_class_wxMetaFileDC","_wxMetaFileDC",0},
+    { "_class_wxMenu","_wxMenu",0},
+    { "_wxControl","_class_wxSlider",SwigwxSliderTowxControl},
+    { "_wxControl","_wxSlider",SwigwxSliderTowxControl},
+    { "_wxControl","_class_wxRadioButton",SwigwxRadioButtonTowxControl},
+    { "_wxControl","_wxRadioButton",SwigwxRadioButtonTowxControl},
+    { "_wxControl","_class_wxRadioBox",SwigwxRadioBoxTowxControl},
+    { "_wxControl","_wxRadioBox",SwigwxRadioBoxTowxControl},
+    { "_wxControl","_class_wxStaticBitmap",SwigwxStaticBitmapTowxControl},
+    { "_wxControl","_wxStaticBitmap",SwigwxStaticBitmapTowxControl},
+    { "_wxControl","_class_wxSpinButton",SwigwxSpinButtonTowxControl},
+    { "_wxControl","_wxSpinButton",SwigwxSpinButtonTowxControl},
+    { "_wxControl","_class_wxScrollBar",SwigwxScrollBarTowxControl},
+    { "_wxControl","_wxScrollBar",SwigwxScrollBarTowxControl},
+    { "_wxControl","_class_wxTextCtrl",SwigwxTextCtrlTowxControl},
+    { "_wxControl","_wxTextCtrl",SwigwxTextCtrlTowxControl},
+    { "_wxControl","_class_wxCheckListBox",SwigwxCheckListBoxTowxControl},
+    { "_wxControl","_wxCheckListBox",SwigwxCheckListBoxTowxControl},
+    { "_wxControl","_class_wxListBox",SwigwxListBoxTowxControl},
+    { "_wxControl","_wxListBox",SwigwxListBoxTowxControl},
+    { "_wxControl","_class_wxStaticText",SwigwxStaticTextTowxControl},
+    { "_wxControl","_wxStaticText",SwigwxStaticTextTowxControl},
+    { "_wxControl","_class_wxStaticLine",SwigwxStaticLineTowxControl},
+    { "_wxControl","_wxStaticLine",SwigwxStaticLineTowxControl},
+    { "_wxControl","_class_wxStaticBox",SwigwxStaticBoxTowxControl},
+    { "_wxControl","_wxStaticBox",SwigwxStaticBoxTowxControl},
+    { "_wxControl","_class_wxGauge",SwigwxGaugeTowxControl},
+    { "_wxControl","_wxGauge",SwigwxGaugeTowxControl},
+    { "_wxControl","_class_wxComboBox",SwigwxComboBoxTowxControl},
+    { "_wxControl","_wxComboBox",SwigwxComboBoxTowxControl},
+    { "_wxControl","_class_wxChoice",SwigwxChoiceTowxControl},
+    { "_wxControl","_wxChoice",SwigwxChoiceTowxControl},
+    { "_wxControl","_class_wxCheckBox",SwigwxCheckBoxTowxControl},
+    { "_wxControl","_wxCheckBox",SwigwxCheckBoxTowxControl},
+    { "_wxControl","_class_wxBitmapButton",SwigwxBitmapButtonTowxControl},
+    { "_wxControl","_wxBitmapButton",SwigwxBitmapButtonTowxControl},
+    { "_wxControl","_class_wxButton",SwigwxButtonTowxControl},
+    { "_wxControl","_wxButton",SwigwxButtonTowxControl},
+    { "_wxControl","_class_wxControl",0},
+    { "_class_wxListBox","_class_wxCheckListBox",SwigwxCheckListBoxTowxListBox},
+    { "_class_wxListBox","_wxCheckListBox",SwigwxCheckListBoxTowxListBox},
+    { "_class_wxListBox","_wxListBox",0},
+    { "_unsigned_int","_wxPrintQuality",0},
+    { "_unsigned_int","_size_t",0},
+    { "_unsigned_int","_uint",0},
+    { "_unsigned_int","_wxWindowID",0},
+    { "_unsigned_int","_int",0},
+    { "_wxIcon","_class_wxIcon",0},
+    { "_wxDialog","_class_wxDialog",0},
+    { "_class_wxPen","_wxPen",0},
+    { "_short","_WXTYPE",0},
+    { "_short","_unsigned_short",0},
+    { "_short","_signed_short",0},
+    { "_class_wxStaticBox","_wxStaticBox",0},
+    { "_class_wxScrollEvent","_wxScrollEvent",0},
+    { "_wxJoystickEvent","_class_wxJoystickEvent",0},
+    { "_class_wxChoice","_class_wxComboBox",SwigwxComboBoxTowxChoice},
+    { "_class_wxChoice","_wxComboBox",SwigwxComboBoxTowxChoice},
+    { "_class_wxChoice","_wxChoice",0},
+    { "_class_wxSlider","_wxSlider",0},
+    { "_class_wxImageList","_wxImageList",0},
+    { "_class_wxBitmapButton","_wxBitmapButton",0},
+    { "_wxWindowID","_wxPrintQuality",0},
+    { "_wxWindowID","_size_t",0},
+    { "_wxWindowID","_EBool",0},
+    { "_wxWindowID","_uint",0},
+    { "_wxWindowID","_int",0},
+    { "_wxWindowID","_signed_int",0},
+    { "_wxWindowID","_unsigned_int",0},
+    { "_int","_wxPrintQuality",0},
+    { "_int","_size_t",0},
+    { "_int","_EBool",0},
+    { "_int","_uint",0},
+    { "_int","_wxWindowID",0},
+    { "_int","_unsigned_int",0},
+    { "_int","_signed_int",0},
+    { "_class_wxMouseEvent","_wxMouseEvent",0},
+    { "_class_wxSpinEvent","_wxSpinEvent",0},
+    { "_wxButton","_class_wxBitmapButton",SwigwxBitmapButtonTowxButton},
+    { "_wxButton","_wxBitmapButton",SwigwxBitmapButtonTowxButton},
+    { "_wxButton","_class_wxButton",0},
+    { "_wxSize","_class_wxSize",0},
+    { "_wxRegionIterator","_class_wxRegionIterator",0},
+    { "_class_wxPrinterDC","_wxPrinterDC",0},
+    { "_class_wxPaintDC","_wxPaintDC",0},
+    { "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0},
+    { "_class_wxInitDialogEvent","_wxInitDialogEvent",0},
+    { "_class_wxComboBox","_wxComboBox",0},
+    { "_class_wxRadioButton","_wxRadioButton",0},
+    { "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
+    { "_wxIconizeEvent","_class_wxIconizeEvent",0},
+    { "_class_wxControl","_class_wxSlider",SwigwxSliderTowxControl},
+    { "_class_wxControl","_wxSlider",SwigwxSliderTowxControl},
+    { "_class_wxControl","_class_wxRadioButton",SwigwxRadioButtonTowxControl},
+    { "_class_wxControl","_wxRadioButton",SwigwxRadioButtonTowxControl},
+    { "_class_wxControl","_class_wxRadioBox",SwigwxRadioBoxTowxControl},
+    { "_class_wxControl","_wxRadioBox",SwigwxRadioBoxTowxControl},
+    { "_class_wxControl","_class_wxStaticBitmap",SwigwxStaticBitmapTowxControl},
+    { "_class_wxControl","_wxStaticBitmap",SwigwxStaticBitmapTowxControl},
+    { "_class_wxControl","_class_wxSpinButton",SwigwxSpinButtonTowxControl},
+    { "_class_wxControl","_wxSpinButton",SwigwxSpinButtonTowxControl},
+    { "_class_wxControl","_class_wxScrollBar",SwigwxScrollBarTowxControl},
+    { "_class_wxControl","_wxScrollBar",SwigwxScrollBarTowxControl},
+    { "_class_wxControl","_class_wxTextCtrl",SwigwxTextCtrlTowxControl},
+    { "_class_wxControl","_wxTextCtrl",SwigwxTextCtrlTowxControl},
+    { "_class_wxControl","_class_wxCheckListBox",SwigwxCheckListBoxTowxControl},
+    { "_class_wxControl","_wxCheckListBox",SwigwxCheckListBoxTowxControl},
+    { "_class_wxControl","_class_wxListBox",SwigwxListBoxTowxControl},
+    { "_class_wxControl","_wxListBox",SwigwxListBoxTowxControl},
+    { "_class_wxControl","_class_wxStaticText",SwigwxStaticTextTowxControl},
+    { "_class_wxControl","_wxStaticText",SwigwxStaticTextTowxControl},
+    { "_class_wxControl","_class_wxStaticLine",SwigwxStaticLineTowxControl},
+    { "_class_wxControl","_wxStaticLine",SwigwxStaticLineTowxControl},
+    { "_class_wxControl","_class_wxStaticBox",SwigwxStaticBoxTowxControl},
+    { "_class_wxControl","_wxStaticBox",SwigwxStaticBoxTowxControl},
+    { "_class_wxControl","_class_wxGauge",SwigwxGaugeTowxControl},
+    { "_class_wxControl","_wxGauge",SwigwxGaugeTowxControl},
+    { "_class_wxControl","_class_wxComboBox",SwigwxComboBoxTowxControl},
+    { "_class_wxControl","_wxComboBox",SwigwxComboBoxTowxControl},
+    { "_class_wxControl","_class_wxChoice",SwigwxChoiceTowxControl},
+    { "_class_wxControl","_wxChoice",SwigwxChoiceTowxControl},
+    { "_class_wxControl","_class_wxCheckBox",SwigwxCheckBoxTowxControl},
+    { "_class_wxControl","_wxCheckBox",SwigwxCheckBoxTowxControl},
+    { "_class_wxControl","_class_wxBitmapButton",SwigwxBitmapButtonTowxControl},
+    { "_class_wxControl","_wxBitmapButton",SwigwxBitmapButtonTowxControl},
+    { "_class_wxControl","_class_wxButton",SwigwxButtonTowxControl},
+    { "_class_wxControl","_wxButton",SwigwxButtonTowxControl},
+    { "_class_wxControl","_wxControl",0},
+    { "_wxStaticBitmap","_class_wxStaticBitmap",0},
+    { "_class_wxIcon","_wxIcon",0},
+    { "_class_wxColour","_wxColour",0},
+    { "_class_wxScreenDC","_wxScreenDC",0},
+    { "_wxPalette","_class_wxPalette",0},
+    { "_class_wxIdleEvent","_wxIdleEvent",0},
+    { "_wxEraseEvent","_class_wxEraseEvent",0},
+    { "_class_wxJoystickEvent","_wxJoystickEvent",0},
+    { "_wxRegion","_class_wxRegion",0},
+    { "_class_wxShowEvent","_wxShowEvent",0},
+    { "_wxActivateEvent","_class_wxActivateEvent",0},
+    { "_wxGauge","_class_wxGauge",0},
+    { "_class_wxCheckListBox","_wxCheckListBox",0},
+    { "_class_wxCommandEvent","_wxCommandEvent",0},
+    { "_class_wxClientDC","_wxClientDC",0},
+    { "_class_wxSizeEvent","_wxSizeEvent",0},
+    { "_class_wxSize","_wxSize",0},
+    { "_class_wxBitmap","_wxBitmap",0},
+    { "_class_wxMemoryDC","_wxMemoryDC",0},
+    { "_wxMenuBar","_class_wxMenuBar",0},
+    { "_wxEvtHandler","_class_wxSlider",SwigwxSliderTowxEvtHandler},
+    { "_wxEvtHandler","_wxSlider",SwigwxSliderTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxRadioButton",SwigwxRadioButtonTowxEvtHandler},
+    { "_wxEvtHandler","_wxRadioButton",SwigwxRadioButtonTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxRadioBox",SwigwxRadioBoxTowxEvtHandler},
+    { "_wxEvtHandler","_wxRadioBox",SwigwxRadioBoxTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxStaticBitmap",SwigwxStaticBitmapTowxEvtHandler},
+    { "_wxEvtHandler","_wxStaticBitmap",SwigwxStaticBitmapTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxSpinButton",SwigwxSpinButtonTowxEvtHandler},
+    { "_wxEvtHandler","_wxSpinButton",SwigwxSpinButtonTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxScrollBar",SwigwxScrollBarTowxEvtHandler},
+    { "_wxEvtHandler","_wxScrollBar",SwigwxScrollBarTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxTextCtrl",SwigwxTextCtrlTowxEvtHandler},
+    { "_wxEvtHandler","_wxTextCtrl",SwigwxTextCtrlTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxCheckListBox",SwigwxCheckListBoxTowxEvtHandler},
+    { "_wxEvtHandler","_wxCheckListBox",SwigwxCheckListBoxTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxListBox",SwigwxListBoxTowxEvtHandler},
+    { "_wxEvtHandler","_wxListBox",SwigwxListBoxTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxStaticText",SwigwxStaticTextTowxEvtHandler},
+    { "_wxEvtHandler","_wxStaticText",SwigwxStaticTextTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxStaticLine",SwigwxStaticLineTowxEvtHandler},
+    { "_wxEvtHandler","_wxStaticLine",SwigwxStaticLineTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxStaticBox",SwigwxStaticBoxTowxEvtHandler},
+    { "_wxEvtHandler","_wxStaticBox",SwigwxStaticBoxTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxGauge",SwigwxGaugeTowxEvtHandler},
+    { "_wxEvtHandler","_wxGauge",SwigwxGaugeTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxComboBox",SwigwxComboBoxTowxEvtHandler},
+    { "_wxEvtHandler","_wxComboBox",SwigwxComboBoxTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxChoice",SwigwxChoiceTowxEvtHandler},
+    { "_wxEvtHandler","_wxChoice",SwigwxChoiceTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxCheckBox",SwigwxCheckBoxTowxEvtHandler},
+    { "_wxEvtHandler","_wxCheckBox",SwigwxCheckBoxTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxBitmapButton",SwigwxBitmapButtonTowxEvtHandler},
+    { "_wxEvtHandler","_wxBitmapButton",SwigwxBitmapButtonTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxButton",SwigwxButtonTowxEvtHandler},
+    { "_wxEvtHandler","_wxButton",SwigwxButtonTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxControl",SwigwxControlTowxEvtHandler},
+    { "_wxEvtHandler","_wxControl",SwigwxControlTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxEvtHandler",0},
+    { "_wxMenuItem","_class_wxMenuItem",0},
+    { "_class_wxScrollBar","_wxScrollBar",0},
+    { "_wxDash","_unsigned_long",0},
+    { "_wxDash","_long",0},
+    { "_class_wxScrolledWindow","_wxScrolledWindow",0},
+    { "_wxKeyEvent","_class_wxKeyEvent",0},
+    { "_wxMoveEvent","_class_wxMoveEvent",0},
+    { "_class_wxPalette","_wxPalette",0},
+    { "_class_wxEraseEvent","_wxEraseEvent",0},
+    { "_wxWindow","_class_wxSlider",SwigwxSliderTowxWindow},
+    { "_wxWindow","_wxSlider",SwigwxSliderTowxWindow},
+    { "_wxWindow","_class_wxRadioButton",SwigwxRadioButtonTowxWindow},
+    { "_wxWindow","_wxRadioButton",SwigwxRadioButtonTowxWindow},
+    { "_wxWindow","_class_wxRadioBox",SwigwxRadioBoxTowxWindow},
+    { "_wxWindow","_wxRadioBox",SwigwxRadioBoxTowxWindow},
+    { "_wxWindow","_class_wxStaticBitmap",SwigwxStaticBitmapTowxWindow},
+    { "_wxWindow","_wxStaticBitmap",SwigwxStaticBitmapTowxWindow},
+    { "_wxWindow","_class_wxSpinButton",SwigwxSpinButtonTowxWindow},
+    { "_wxWindow","_wxSpinButton",SwigwxSpinButtonTowxWindow},
+    { "_wxWindow","_class_wxScrollBar",SwigwxScrollBarTowxWindow},
+    { "_wxWindow","_wxScrollBar",SwigwxScrollBarTowxWindow},
+    { "_wxWindow","_class_wxTextCtrl",SwigwxTextCtrlTowxWindow},
+    { "_wxWindow","_wxTextCtrl",SwigwxTextCtrlTowxWindow},
+    { "_wxWindow","_class_wxCheckListBox",SwigwxCheckListBoxTowxWindow},
+    { "_wxWindow","_wxCheckListBox",SwigwxCheckListBoxTowxWindow},
+    { "_wxWindow","_class_wxListBox",SwigwxListBoxTowxWindow},
+    { "_wxWindow","_wxListBox",SwigwxListBoxTowxWindow},
+    { "_wxWindow","_class_wxStaticText",SwigwxStaticTextTowxWindow},
+    { "_wxWindow","_wxStaticText",SwigwxStaticTextTowxWindow},
+    { "_wxWindow","_class_wxStaticLine",SwigwxStaticLineTowxWindow},
+    { "_wxWindow","_wxStaticLine",SwigwxStaticLineTowxWindow},
+    { "_wxWindow","_class_wxStaticBox",SwigwxStaticBoxTowxWindow},
+    { "_wxWindow","_wxStaticBox",SwigwxStaticBoxTowxWindow},
+    { "_wxWindow","_class_wxGauge",SwigwxGaugeTowxWindow},
+    { "_wxWindow","_wxGauge",SwigwxGaugeTowxWindow},
+    { "_wxWindow","_class_wxComboBox",SwigwxComboBoxTowxWindow},
+    { "_wxWindow","_wxComboBox",SwigwxComboBoxTowxWindow},
+    { "_wxWindow","_class_wxChoice",SwigwxChoiceTowxWindow},
+    { "_wxWindow","_wxChoice",SwigwxChoiceTowxWindow},
+    { "_wxWindow","_class_wxCheckBox",SwigwxCheckBoxTowxWindow},
+    { "_wxWindow","_wxCheckBox",SwigwxCheckBoxTowxWindow},
+    { "_wxWindow","_class_wxBitmapButton",SwigwxBitmapButtonTowxWindow},
+    { "_wxWindow","_wxBitmapButton",SwigwxBitmapButtonTowxWindow},
+    { "_wxWindow","_class_wxButton",SwigwxButtonTowxWindow},
+    { "_wxWindow","_wxButton",SwigwxButtonTowxWindow},
+    { "_wxWindow","_class_wxControl",SwigwxControlTowxWindow},
+    { "_wxWindow","_wxControl",SwigwxControlTowxWindow},
+    { "_wxWindow","_class_wxWindow",0},
+{0,0,0}};
+

 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif
 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif

-SWIGEXPORT(void,initcontrolsc)() {
+SWIGEXPORT(void) initcontrolsc() {

         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("controlsc", controlscMethods);
         d = PyModule_GetDict(m);
         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("controlsc", controlscMethods);
         d = PyModule_GetDict(m);

-/*
- * These are the pointer type-equivalency mappings. 
- * (Used by the SWIG pointer type-checker).
- */
-        SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_wxEvent","_class_wxEvent",0);
-        SWIG_RegisterMapping("_class_wxActivateEvent","_wxActivateEvent",0);
-        SWIG_RegisterMapping("_signed_long","_long",0);
-        SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_signed_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_unsigned_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_wxWindowID",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_uint",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_EBool",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_size_t",0);
-        SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
-        SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxSlider",SwigwxSliderTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxSlider",SwigwxSliderTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxRadioButton",SwigwxRadioButtonTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxRadioButton",SwigwxRadioButtonTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxRadioBox",SwigwxRadioBoxTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxRadioBox",SwigwxRadioBoxTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxStaticBitmap",SwigwxStaticBitmapTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxStaticBitmap",SwigwxStaticBitmapTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxSpinButton",SwigwxSpinButtonTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxSpinButton",SwigwxSpinButtonTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxScrollBar",SwigwxScrollBarTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxScrollBar",SwigwxScrollBarTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxTextCtrl",SwigwxTextCtrlTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxTextCtrl",SwigwxTextCtrlTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxCheckListBox",SwigwxCheckListBoxTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxCheckListBox",SwigwxCheckListBoxTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxListBox",SwigwxListBoxTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxListBox",SwigwxListBoxTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxStaticText",SwigwxStaticTextTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxStaticText",SwigwxStaticTextTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxStaticLine",SwigwxStaticLineTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxStaticLine",SwigwxStaticLineTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxStaticBox",SwigwxStaticBoxTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxStaticBox",SwigwxStaticBoxTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxGauge",SwigwxGaugeTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxGauge",SwigwxGaugeTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxComboBox",SwigwxComboBoxTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxComboBox",SwigwxComboBoxTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxChoice",SwigwxChoiceTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxChoice",SwigwxChoiceTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxCheckBox",SwigwxCheckBoxTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxCheckBox",SwigwxCheckBoxTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxBitmapButton",SwigwxBitmapButtonTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxBitmapButton",SwigwxBitmapButtonTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxButton",SwigwxButtonTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxButton",SwigwxButtonTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxControl",SwigwxControlTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxControl",SwigwxControlTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxEvtHandler",0);
-        SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
-        SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
-        SWIG_RegisterMapping("_wxNotifyEvent","_class_wxNotifyEvent",0);
-        SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
-        SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
-        SWIG_RegisterMapping("_wxUpdateUIEvent","_class_wxUpdateUIEvent",0);
-        SWIG_RegisterMapping("_byte","_unsigned_char",0);
-        SWIG_RegisterMapping("_wxStaticBox","_class_wxStaticBox",0);
-        SWIG_RegisterMapping("_wxChoice","_class_wxComboBox",SwigwxComboBoxTowxChoice);
-        SWIG_RegisterMapping("_wxChoice","_wxComboBox",SwigwxComboBoxTowxChoice);
-        SWIG_RegisterMapping("_wxChoice","_class_wxChoice",0);
-        SWIG_RegisterMapping("_wxSlider","_class_wxSlider",0);
-        SWIG_RegisterMapping("_long","_wxDash",0);
-        SWIG_RegisterMapping("_long","_unsigned_long",0);
-        SWIG_RegisterMapping("_long","_signed_long",0);
-        SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0);
-        SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0);
-        SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_class_wxGauge","_wxGauge",0);
-        SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
-        SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0);
-        SWIG_RegisterMapping("_size_t","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_size_t","_unsigned_int",0);
-        SWIG_RegisterMapping("_size_t","_int",0);
-        SWIG_RegisterMapping("_size_t","_wxWindowID",0);
-        SWIG_RegisterMapping("_size_t","_uint",0);
-        SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
-        SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0);
-        SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0);
-        SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0);
-        SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0);
-        SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);
-        SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
-        SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
-        SWIG_RegisterMapping("_wxPyEvent","_class_wxPyEvent",0);
-        SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);
-        SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
-        SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0);
-        SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
-        SWIG_RegisterMapping("_class_wxDialog","_wxDialog",0);
-        SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0);
-        SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0);
-        SWIG_RegisterMapping("_wxStaticLine","_class_wxStaticLine",0);
-        SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
-        SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0);
-        SWIG_RegisterMapping("_uint","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_uint","_size_t",0);
-        SWIG_RegisterMapping("_uint","_unsigned_int",0);
-        SWIG_RegisterMapping("_uint","_int",0);
-        SWIG_RegisterMapping("_uint","_wxWindowID",0);
-        SWIG_RegisterMapping("_class_wxEvent","_wxEvent",0);
-        SWIG_RegisterMapping("_wxCheckListBox","_class_wxCheckListBox",0);
-        SWIG_RegisterMapping("_wxRect","_class_wxRect",0);
-        SWIG_RegisterMapping("_wxCommandEvent","_class_wxCommandEvent",0);
-        SWIG_RegisterMapping("_wxSizeEvent","_class_wxSizeEvent",0);
-        SWIG_RegisterMapping("_wxPoint","_class_wxPoint",0);
-        SWIG_RegisterMapping("_class_wxButton","_class_wxBitmapButton",SwigwxBitmapButtonTowxButton);
-        SWIG_RegisterMapping("_class_wxButton","_wxBitmapButton",SwigwxBitmapButtonTowxButton);
-        SWIG_RegisterMapping("_class_wxButton","_wxButton",0);
-        SWIG_RegisterMapping("_wxRadioBox","_class_wxRadioBox",0);
-        SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
-        SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0);
-        SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0);
-        SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0);
-        SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_class_wxNotifyEvent","_wxNotifyEvent",0);
-        SWIG_RegisterMapping("_class_wxPyEvent","_wxPyEvent",0);
-        SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
-        SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
-        SWIG_RegisterMapping("_class_wxStaticLine","_wxStaticLine",0);
-        SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0);
-        SWIG_RegisterMapping("_EBool","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_EBool","_signed_int",0);
-        SWIG_RegisterMapping("_EBool","_int",0);
-        SWIG_RegisterMapping("_EBool","_wxWindowID",0);
-        SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
-        SWIG_RegisterMapping("_class_wxDropFilesEvent","_wxDropFilesEvent",0);
-        SWIG_RegisterMapping("_wxStaticText","_class_wxStaticText",0);
-        SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
-        SWIG_RegisterMapping("_wxCloseEvent","_class_wxCloseEvent",0);
-        SWIG_RegisterMapping("_unsigned_long","_wxDash",0);
-        SWIG_RegisterMapping("_unsigned_long","_long",0);
-        SWIG_RegisterMapping("_class_wxRect","_wxRect",0);
-        SWIG_RegisterMapping("_class_wxDC","_wxDC",0);
-        SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxFocusEvent","_class_wxFocusEvent",0);
-        SWIG_RegisterMapping("_wxMaximizeEvent","_class_wxMaximizeEvent",0);
-        SWIG_RegisterMapping("_class_wxSpinButton","_wxSpinButton",0);
-        SWIG_RegisterMapping("_wxAcceleratorEntry","_class_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_class_wxPanel","_wxPanel",0);
-        SWIG_RegisterMapping("_class_wxCheckBox","_wxCheckBox",0);
-        SWIG_RegisterMapping("_wxComboBox","_class_wxComboBox",0);
-        SWIG_RegisterMapping("_wxRadioButton","_class_wxRadioButton",0);
-        SWIG_RegisterMapping("_signed_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_signed_int","_EBool",0);
-        SWIG_RegisterMapping("_signed_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_signed_int","_int",0);
-        SWIG_RegisterMapping("_class_wxTextCtrl","_wxTextCtrl",0);
-        SWIG_RegisterMapping("_wxLayoutConstraints","_class_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_wxMetaFileDC","_class_wxMetaFileDC",0);
-        SWIG_RegisterMapping("_wxMenu","_class_wxMenu",0);
-        SWIG_RegisterMapping("_class_wxMoveEvent","_wxMoveEvent",0);
-        SWIG_RegisterMapping("_wxListBox","_class_wxCheckListBox",SwigwxCheckListBoxTowxListBox);
-        SWIG_RegisterMapping("_wxListBox","_wxCheckListBox",SwigwxCheckListBoxTowxListBox);
-        SWIG_RegisterMapping("_wxListBox","_class_wxListBox",0);
-        SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0);
-        SWIG_RegisterMapping("_WXTYPE","_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_signed_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_unsigned_short",0);
-        SWIG_RegisterMapping("_class_wxBrush","_wxBrush",0);
-        SWIG_RegisterMapping("_unsigned_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_unsigned_short","_short",0);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxSlider",SwigwxSliderTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxSlider",SwigwxSliderTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxRadioButton",SwigwxRadioButtonTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxRadioButton",SwigwxRadioButtonTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxRadioBox",SwigwxRadioBoxTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxRadioBox",SwigwxRadioBoxTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxStaticBitmap",SwigwxStaticBitmapTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxStaticBitmap",SwigwxStaticBitmapTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxSpinButton",SwigwxSpinButtonTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxSpinButton",SwigwxSpinButtonTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxScrollBar",SwigwxScrollBarTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxScrollBar",SwigwxScrollBarTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxTextCtrl",SwigwxTextCtrlTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxTextCtrl",SwigwxTextCtrlTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxCheckListBox",SwigwxCheckListBoxTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxCheckListBox",SwigwxCheckListBoxTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxListBox",SwigwxListBoxTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxListBox",SwigwxListBoxTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxStaticText",SwigwxStaticTextTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxStaticText",SwigwxStaticTextTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxStaticLine",SwigwxStaticLineTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxStaticLine",SwigwxStaticLineTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxStaticBox",SwigwxStaticBoxTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxStaticBox",SwigwxStaticBoxTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxGauge",SwigwxGaugeTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxGauge",SwigwxGaugeTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxComboBox",SwigwxComboBoxTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxComboBox",SwigwxComboBoxTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxChoice",SwigwxChoiceTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxChoice",SwigwxChoiceTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxCheckBox",SwigwxCheckBoxTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxCheckBox",SwigwxCheckBoxTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxBitmapButton",SwigwxBitmapButtonTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxBitmapButton",SwigwxBitmapButtonTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxButton",SwigwxButtonTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxButton",SwigwxButtonTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxControl",SwigwxControlTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxControl",SwigwxControlTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxWindow",0);
-        SWIG_RegisterMapping("_class_wxStaticText","_wxStaticText",0);
-        SWIG_RegisterMapping("_class_wxFont","_wxFont",0);
-        SWIG_RegisterMapping("_class_wxCloseEvent","_wxCloseEvent",0);
-        SWIG_RegisterMapping("_class_wxMenuEvent","_wxMenuEvent",0);
-        SWIG_RegisterMapping("_wxClientDC","_class_wxClientDC",0);
-        SWIG_RegisterMapping("_wxMouseEvent","_class_wxMouseEvent",0);
-        SWIG_RegisterMapping("_class_wxPoint","_wxPoint",0);
-        SWIG_RegisterMapping("_wxRealPoint","_class_wxRealPoint",0);
-        SWIG_RegisterMapping("_class_wxRadioBox","_wxRadioBox",0);
-        SWIG_RegisterMapping("_signed_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_signed_short","_short",0);
-        SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0);
-        SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
-        SWIG_RegisterMapping("_class_wxWindowDC","_wxWindowDC",0);
-        SWIG_RegisterMapping("_class_wxFocusEvent","_wxFocusEvent",0);
-        SWIG_RegisterMapping("_class_wxMaximizeEvent","_wxMaximizeEvent",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
-        SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0);
-        SWIG_RegisterMapping("_unsigned_char","_byte",0);
-        SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0);
-        SWIG_RegisterMapping("_class_wxMenu","_wxMenu",0);
-        SWIG_RegisterMapping("_wxControl","_class_wxSlider",SwigwxSliderTowxControl);
-        SWIG_RegisterMapping("_wxControl","_wxSlider",SwigwxSliderTowxControl);
-        SWIG_RegisterMapping("_wxControl","_class_wxRadioButton",SwigwxRadioButtonTowxControl);
-        SWIG_RegisterMapping("_wxControl","_wxRadioButton",SwigwxRadioButtonTowxControl);
-        SWIG_RegisterMapping("_wxControl","_class_wxRadioBox",SwigwxRadioBoxTowxControl);
-        SWIG_RegisterMapping("_wxControl","_wxRadioBox",SwigwxRadioBoxTowxControl);
-        SWIG_RegisterMapping("_wxControl","_class_wxStaticBitmap",SwigwxStaticBitmapTowxControl);
-        SWIG_RegisterMapping("_wxControl","_wxStaticBitmap",SwigwxStaticBitmapTowxControl);
-        SWIG_RegisterMapping("_wxControl","_class_wxSpinButton",SwigwxSpinButtonTowxControl);
-        SWIG_RegisterMapping("_wxControl","_wxSpinButton",SwigwxSpinButtonTowxControl);
-        SWIG_RegisterMapping("_wxControl","_class_wxScrollBar",SwigwxScrollBarTowxControl);
-        SWIG_RegisterMapping("_wxControl","_wxScrollBar",SwigwxScrollBarTowxControl);
-        SWIG_RegisterMapping("_wxControl","_class_wxTextCtrl",SwigwxTextCtrlTowxControl);
-        SWIG_RegisterMapping("_wxControl","_wxTextCtrl",SwigwxTextCtrlTowxControl);
-        SWIG_RegisterMapping("_wxControl","_class_wxCheckListBox",SwigwxCheckListBoxTowxControl);
-        SWIG_RegisterMapping("_wxControl","_wxCheckListBox",SwigwxCheckListBoxTowxControl);
-        SWIG_RegisterMapping("_wxControl","_class_wxListBox",SwigwxListBoxTowxControl);
-        SWIG_RegisterMapping("_wxControl","_wxListBox",SwigwxListBoxTowxControl);
-        SWIG_RegisterMapping("_wxControl","_class_wxStaticText",SwigwxStaticTextTowxControl);
-        SWIG_RegisterMapping("_wxControl","_wxStaticText",SwigwxStaticTextTowxControl);
-        SWIG_RegisterMapping("_wxControl","_class_wxStaticLine",SwigwxStaticLineTowxControl);
-        SWIG_RegisterMapping("_wxControl","_wxStaticLine",SwigwxStaticLineTowxControl);
-        SWIG_RegisterMapping("_wxControl","_class_wxStaticBox",SwigwxStaticBoxTowxControl);
-        SWIG_RegisterMapping("_wxControl","_wxStaticBox",SwigwxStaticBoxTowxControl);
-        SWIG_RegisterMapping("_wxControl","_class_wxGauge",SwigwxGaugeTowxControl);
-        SWIG_RegisterMapping("_wxControl","_wxGauge",SwigwxGaugeTowxControl);
-        SWIG_RegisterMapping("_wxControl","_class_wxComboBox",SwigwxComboBoxTowxControl);
-        SWIG_RegisterMapping("_wxControl","_wxComboBox",SwigwxComboBoxTowxControl);
-        SWIG_RegisterMapping("_wxControl","_class_wxChoice",SwigwxChoiceTowxControl);
-        SWIG_RegisterMapping("_wxControl","_wxChoice",SwigwxChoiceTowxControl);
-        SWIG_RegisterMapping("_wxControl","_class_wxCheckBox",SwigwxCheckBoxTowxControl);
-        SWIG_RegisterMapping("_wxControl","_wxCheckBox",SwigwxCheckBoxTowxControl);
-        SWIG_RegisterMapping("_wxControl","_class_wxBitmapButton",SwigwxBitmapButtonTowxControl);
-        SWIG_RegisterMapping("_wxControl","_wxBitmapButton",SwigwxBitmapButtonTowxControl);
-        SWIG_RegisterMapping("_wxControl","_class_wxButton",SwigwxButtonTowxControl);
-        SWIG_RegisterMapping("_wxControl","_wxButton",SwigwxButtonTowxControl);
-        SWIG_RegisterMapping("_wxControl","_class_wxControl",0);
-        SWIG_RegisterMapping("_class_wxListBox","_class_wxCheckListBox",SwigwxCheckListBoxTowxListBox);
-        SWIG_RegisterMapping("_class_wxListBox","_wxCheckListBox",SwigwxCheckListBoxTowxListBox);
-        SWIG_RegisterMapping("_class_wxListBox","_wxListBox",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_unsigned_int","_size_t",0);
-        SWIG_RegisterMapping("_unsigned_int","_uint",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_unsigned_int","_int",0);
-        SWIG_RegisterMapping("_wxIcon","_class_wxIcon",0);
-        SWIG_RegisterMapping("_wxDialog","_class_wxDialog",0);
-        SWIG_RegisterMapping("_class_wxPen","_wxPen",0);
-        SWIG_RegisterMapping("_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_short","_unsigned_short",0);
-        SWIG_RegisterMapping("_short","_signed_short",0);
-        SWIG_RegisterMapping("_class_wxStaticBox","_wxStaticBox",0);
-        SWIG_RegisterMapping("_class_wxScrollEvent","_wxScrollEvent",0);
-        SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0);
-        SWIG_RegisterMapping("_class_wxChoice","_class_wxComboBox",SwigwxComboBoxTowxChoice);
-        SWIG_RegisterMapping("_class_wxChoice","_wxComboBox",SwigwxComboBoxTowxChoice);
-        SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
-        SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);
-        SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0);
-        SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
-        SWIG_RegisterMapping("_wxWindowID","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_wxWindowID","_size_t",0);
-        SWIG_RegisterMapping("_wxWindowID","_EBool",0);
-        SWIG_RegisterMapping("_wxWindowID","_uint",0);
-        SWIG_RegisterMapping("_wxWindowID","_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_signed_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_int","_size_t",0);
-        SWIG_RegisterMapping("_int","_EBool",0);
-        SWIG_RegisterMapping("_int","_uint",0);
-        SWIG_RegisterMapping("_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_int","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_signed_int",0);
-        SWIG_RegisterMapping("_class_wxMouseEvent","_wxMouseEvent",0);
-        SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0);
-        SWIG_RegisterMapping("_wxButton","_class_wxBitmapButton",SwigwxBitmapButtonTowxButton);
-        SWIG_RegisterMapping("_wxButton","_wxBitmapButton",SwigwxBitmapButtonTowxButton);
-        SWIG_RegisterMapping("_wxButton","_class_wxButton",0);
-        SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
-        SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
-        SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
-        SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
-        SWIG_RegisterMapping("_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0);
-        SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0);
-        SWIG_RegisterMapping("_class_wxComboBox","_wxComboBox",0);
-        SWIG_RegisterMapping("_class_wxRadioButton","_wxRadioButton",0);
-        SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_wxIconizeEvent","_class_wxIconizeEvent",0);
-        SWIG_RegisterMapping("_class_wxControl","_class_wxSlider",SwigwxSliderTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_wxSlider",SwigwxSliderTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_class_wxRadioButton",SwigwxRadioButtonTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_wxRadioButton",SwigwxRadioButtonTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_class_wxRadioBox",SwigwxRadioBoxTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_wxRadioBox",SwigwxRadioBoxTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_class_wxStaticBitmap",SwigwxStaticBitmapTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_wxStaticBitmap",SwigwxStaticBitmapTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_class_wxSpinButton",SwigwxSpinButtonTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_wxSpinButton",SwigwxSpinButtonTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_class_wxScrollBar",SwigwxScrollBarTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_wxScrollBar",SwigwxScrollBarTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_class_wxTextCtrl",SwigwxTextCtrlTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_wxTextCtrl",SwigwxTextCtrlTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_class_wxCheckListBox",SwigwxCheckListBoxTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_wxCheckListBox",SwigwxCheckListBoxTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_class_wxListBox",SwigwxListBoxTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_wxListBox",SwigwxListBoxTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_class_wxStaticText",SwigwxStaticTextTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_wxStaticText",SwigwxStaticTextTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_class_wxStaticLine",SwigwxStaticLineTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_wxStaticLine",SwigwxStaticLineTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_class_wxStaticBox",SwigwxStaticBoxTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_wxStaticBox",SwigwxStaticBoxTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_class_wxGauge",SwigwxGaugeTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_wxGauge",SwigwxGaugeTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_class_wxComboBox",SwigwxComboBoxTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_wxComboBox",SwigwxComboBoxTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_class_wxChoice",SwigwxChoiceTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_wxChoice",SwigwxChoiceTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_class_wxCheckBox",SwigwxCheckBoxTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_wxCheckBox",SwigwxCheckBoxTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_class_wxBitmapButton",SwigwxBitmapButtonTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_wxBitmapButton",SwigwxBitmapButtonTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_class_wxButton",SwigwxButtonTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_wxButton",SwigwxButtonTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_wxControl",0);
-        SWIG_RegisterMapping("_wxStaticBitmap","_class_wxStaticBitmap",0);
-        SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
-        SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
-        SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
-        SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
-        SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0);
-        SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
-        SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
-        SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
-        SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
-        SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
-        SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0);
-        SWIG_RegisterMapping("_class_wxCheckListBox","_wxCheckListBox",0);
-        SWIG_RegisterMapping("_class_wxCommandEvent","_wxCommandEvent",0);
-        SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
-        SWIG_RegisterMapping("_class_wxSizeEvent","_wxSizeEvent",0);
-        SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
-        SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0);
-        SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0);
-        SWIG_RegisterMapping("_wxMenuBar","_class_wxMenuBar",0);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxSlider",SwigwxSliderTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxSlider",SwigwxSliderTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxRadioButton",SwigwxRadioButtonTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxRadioButton",SwigwxRadioButtonTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxRadioBox",SwigwxRadioBoxTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxRadioBox",SwigwxRadioBoxTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxStaticBitmap",SwigwxStaticBitmapTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxStaticBitmap",SwigwxStaticBitmapTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxSpinButton",SwigwxSpinButtonTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxSpinButton",SwigwxSpinButtonTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxScrollBar",SwigwxScrollBarTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxScrollBar",SwigwxScrollBarTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxTextCtrl",SwigwxTextCtrlTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxTextCtrl",SwigwxTextCtrlTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxCheckListBox",SwigwxCheckListBoxTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxCheckListBox",SwigwxCheckListBoxTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxListBox",SwigwxListBoxTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxListBox",SwigwxListBoxTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxStaticText",SwigwxStaticTextTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxStaticText",SwigwxStaticTextTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxStaticLine",SwigwxStaticLineTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxStaticLine",SwigwxStaticLineTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxStaticBox",SwigwxStaticBoxTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxStaticBox",SwigwxStaticBoxTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxGauge",SwigwxGaugeTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxGauge",SwigwxGaugeTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxComboBox",SwigwxComboBoxTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxComboBox",SwigwxComboBoxTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxChoice",SwigwxChoiceTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxChoice",SwigwxChoiceTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxCheckBox",SwigwxCheckBoxTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxCheckBox",SwigwxCheckBoxTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxBitmapButton",SwigwxBitmapButtonTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxBitmapButton",SwigwxBitmapButtonTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxButton",SwigwxButtonTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxButton",SwigwxButtonTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxControl",SwigwxControlTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxControl",SwigwxControlTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxEvtHandler",0);
-        SWIG_RegisterMapping("_wxMenuItem","_class_wxMenuItem",0);
-        SWIG_RegisterMapping("_class_wxScrollBar","_wxScrollBar",0);
-        SWIG_RegisterMapping("_wxDash","_unsigned_long",0);
-        SWIG_RegisterMapping("_wxDash","_long",0);
-        SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
-        SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0);
-        SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0);
-        SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
-        SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0);
-        SWIG_RegisterMapping("_wxWindow","_class_wxSlider",SwigwxSliderTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxSlider",SwigwxSliderTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxRadioButton",SwigwxRadioButtonTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxRadioButton",SwigwxRadioButtonTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxRadioBox",SwigwxRadioBoxTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxRadioBox",SwigwxRadioBoxTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxStaticBitmap",SwigwxStaticBitmapTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxStaticBitmap",SwigwxStaticBitmapTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxSpinButton",SwigwxSpinButtonTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxSpinButton",SwigwxSpinButtonTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxScrollBar",SwigwxScrollBarTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxScrollBar",SwigwxScrollBarTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxTextCtrl",SwigwxTextCtrlTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxTextCtrl",SwigwxTextCtrlTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxCheckListBox",SwigwxCheckListBoxTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxCheckListBox",SwigwxCheckListBoxTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxListBox",SwigwxListBoxTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxListBox",SwigwxListBoxTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxStaticText",SwigwxStaticTextTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxStaticText",SwigwxStaticTextTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxStaticLine",SwigwxStaticLineTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxStaticLine",SwigwxStaticLineTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxStaticBox",SwigwxStaticBoxTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxStaticBox",SwigwxStaticBoxTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxGauge",SwigwxGaugeTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxGauge",SwigwxGaugeTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxComboBox",SwigwxComboBoxTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxComboBox",SwigwxComboBoxTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxChoice",SwigwxChoiceTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxChoice",SwigwxChoiceTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxCheckBox",SwigwxCheckBoxTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxCheckBox",SwigwxCheckBoxTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxBitmapButton",SwigwxBitmapButtonTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxBitmapButton",SwigwxBitmapButtonTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxButton",SwigwxButtonTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxButton",SwigwxButtonTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxControl",SwigwxControlTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxControl",SwigwxControlTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxWindow",0);
+{
+   int i;
+   for (i = 0; _swig_mapping[i].n1; i++)
+        SWIG_RegisterMapping(_swig_mapping[i].n1,_swig_mapping[i].n2,_swig_mapping[i].pcnv);
+}

 }
 }

diff --git a/utils/wxPython/src/msw/controls.py b/utils/wxPython/src/msw/controls.py
index fb759a799ea2d6f7fc90943fa25e2d8b0a78857e..51520b42f481275e6f36edc4b33c2f50fc043086 100644 (file)
--- a/utils/wxPython/src/msw/controls.py
+++ b/utils/wxPython/src/msw/controls.py
@@ -13,17 +13,17 @@ class wxControlPtr(wxWindowPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def Command(self,arg0):
-        val = controlsc.wxControl_Command(self.this,arg0.this)
+    def Command(self, *_args, **_kwargs):
+        val = apply(controlsc.wxControl_Command,(self,) + _args, _kwargs)

         return val
         return val

-    def GetLabel(self):
-        val = controlsc.wxControl_GetLabel(self.this)
+    def GetLabel(self, *_args, **_kwargs):
+        val = apply(controlsc.wxControl_GetLabel,(self,) + _args, _kwargs)

         return val
         return val

-    def SetLabel(self,arg0):
-        val = controlsc.wxControl_SetLabel(self.this,arg0)
+    def SetLabel(self, *_args, **_kwargs):
+        val = apply(controlsc.wxControl_SetLabel,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxControl instance>"
+        return "<C wxControl instance at %s>" % (self.this,)

 class wxControl(wxControlPtr):
     def __init__(self,this):
         self.this = this
 class wxControl(wxControlPtr):
     def __init__(self,this):
         self.this = this


@@ -35,20 +35,14 @@ class wxButtonPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def SetDefault(self):
-        val = controlsc.wxButton_SetDefault(self.this)
+    def SetDefault(self, *_args, **_kwargs):
+        val = apply(controlsc.wxButton_SetDefault,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxButton instance>"
+        return "<C wxButton instance at %s>" % (self.this,)

 class wxButton(wxButtonPtr):
 class wxButton(wxButtonPtr):

-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxButton,(arg0.this,arg1,arg2,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxButton,_args,_kwargs)

         self.thisown = 1
         wx._StdWindowCallbacks(self)
 
         self.thisown = 1
         wx._StdWindowCallbacks(self)
 


@@ -59,45 +53,39 @@ class wxBitmapButtonPtr(wxButtonPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetBitmapLabel(self):
-        val = controlsc.wxBitmapButton_GetBitmapLabel(self.this)
-        val = wxBitmapPtr(val)
+    def GetBitmapLabel(self, *_args, **_kwargs):
+        val = apply(controlsc.wxBitmapButton_GetBitmapLabel,(self,) + _args, _kwargs)
+        if val: val = wxBitmapPtr(val) 

         return val
         return val

-    def GetBitmapDisabled(self):
-        val = controlsc.wxBitmapButton_GetBitmapDisabled(self.this)
-        val = wxBitmapPtr(val)
+    def GetBitmapDisabled(self, *_args, **_kwargs):
+        val = apply(controlsc.wxBitmapButton_GetBitmapDisabled,(self,) + _args, _kwargs)
+        if val: val = wxBitmapPtr(val) 

         return val
         return val

-    def GetBitmapFocus(self):
-        val = controlsc.wxBitmapButton_GetBitmapFocus(self.this)
-        val = wxBitmapPtr(val)
+    def GetBitmapFocus(self, *_args, **_kwargs):
+        val = apply(controlsc.wxBitmapButton_GetBitmapFocus,(self,) + _args, _kwargs)
+        if val: val = wxBitmapPtr(val) 

         return val
         return val

-    def GetBitmapSelected(self):
-        val = controlsc.wxBitmapButton_GetBitmapSelected(self.this)
-        val = wxBitmapPtr(val)
+    def GetBitmapSelected(self, *_args, **_kwargs):
+        val = apply(controlsc.wxBitmapButton_GetBitmapSelected,(self,) + _args, _kwargs)
+        if val: val = wxBitmapPtr(val) 

         return val
         return val

-    def SetBitmapDisabled(self,arg0):
-        val = controlsc.wxBitmapButton_SetBitmapDisabled(self.this,arg0.this)
+    def SetBitmapDisabled(self, *_args, **_kwargs):
+        val = apply(controlsc.wxBitmapButton_SetBitmapDisabled,(self,) + _args, _kwargs)

         return val
         return val

-    def SetBitmapFocus(self,arg0):
-        val = controlsc.wxBitmapButton_SetBitmapFocus(self.this,arg0.this)
+    def SetBitmapFocus(self, *_args, **_kwargs):
+        val = apply(controlsc.wxBitmapButton_SetBitmapFocus,(self,) + _args, _kwargs)

         return val
         return val

-    def SetBitmapSelected(self,arg0):
-        val = controlsc.wxBitmapButton_SetBitmapSelected(self.this,arg0.this)
+    def SetBitmapSelected(self, *_args, **_kwargs):
+        val = apply(controlsc.wxBitmapButton_SetBitmapSelected,(self,) + _args, _kwargs)

         return val
         return val

-    def SetBitmapLabel(self,arg0):
-        val = controlsc.wxBitmapButton_SetBitmapLabel(self.this,arg0.this)
+    def SetBitmapLabel(self, *_args, **_kwargs):
+        val = apply(controlsc.wxBitmapButton_SetBitmapLabel,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxBitmapButton instance>"
+        return "<C wxBitmapButton instance at %s>" % (self.this,)

 class wxBitmapButton(wxBitmapButtonPtr):
 class wxBitmapButton(wxBitmapButtonPtr):

-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxBitmapButton,(arg0.this,arg1,arg2.this,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxBitmapButton,_args,_kwargs)

         self.thisown = 1
         wx._StdWindowCallbacks(self)
 
         self.thisown = 1
         wx._StdWindowCallbacks(self)
 


@@ -108,23 +96,17 @@ class wxCheckBoxPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetValue(self):
-        val = controlsc.wxCheckBox_GetValue(self.this)
+    def GetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxCheckBox_GetValue,(self,) + _args, _kwargs)

         return val
         return val

-    def SetValue(self,arg0):
-        val = controlsc.wxCheckBox_SetValue(self.this,arg0)
+    def SetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxCheckBox_SetValue,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxCheckBox instance>"
+        return "<C wxCheckBox instance at %s>" % (self.this,)

 class wxCheckBox(wxCheckBoxPtr):
 class wxCheckBox(wxCheckBoxPtr):

-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxCheckBox,(arg0.this,arg1,arg2,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxCheckBox,_args,_kwargs)

         self.thisown = 1
         wx._StdWindowCallbacks(self)
 
         self.thisown = 1
         wx._StdWindowCallbacks(self)
 


@@ -135,50 +117,44 @@ class wxChoicePtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def Append(self,arg0):
-        val = controlsc.wxChoice_Append(self.this,arg0)
+    def Append(self, *_args, **_kwargs):
+        val = apply(controlsc.wxChoice_Append,(self,) + _args, _kwargs)

         return val
         return val

-    def Clear(self):
-        val = controlsc.wxChoice_Clear(self.this)
+    def Clear(self, *_args, **_kwargs):
+        val = apply(controlsc.wxChoice_Clear,(self,) + _args, _kwargs)

         return val
         return val

-    def FindString(self,arg0):
-        val = controlsc.wxChoice_FindString(self.this,arg0)
+    def FindString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxChoice_FindString,(self,) + _args, _kwargs)

         return val
         return val

-    def GetColumns(self):
-        val = controlsc.wxChoice_GetColumns(self.this)
+    def GetColumns(self, *_args, **_kwargs):
+        val = apply(controlsc.wxChoice_GetColumns,(self,) + _args, _kwargs)

         return val
         return val

-    def GetSelection(self):
-        val = controlsc.wxChoice_GetSelection(self.this)
+    def GetSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxChoice_GetSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def GetString(self,arg0):
-        val = controlsc.wxChoice_GetString(self.this,arg0)
+    def GetString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxChoice_GetString,(self,) + _args, _kwargs)

         return val
         return val

-    def GetStringSelection(self):
-        val = controlsc.wxChoice_GetStringSelection(self.this)
+    def GetStringSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxChoice_GetStringSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def Number(self):
-        val = controlsc.wxChoice_Number(self.this)
+    def Number(self, *_args, **_kwargs):
+        val = apply(controlsc.wxChoice_Number,(self,) + _args, _kwargs)

         return val
         return val

-    def SetColumns(self,*args):
-        val = apply(controlsc.wxChoice_SetColumns,(self.this,)+args)
+    def SetColumns(self, *_args, **_kwargs):
+        val = apply(controlsc.wxChoice_SetColumns,(self,) + _args, _kwargs)

         return val
         return val

-    def SetSelection(self,arg0):
-        val = controlsc.wxChoice_SetSelection(self.this,arg0)
+    def SetSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxChoice_SetSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def SetStringSelection(self,arg0):
-        val = controlsc.wxChoice_SetStringSelection(self.this,arg0)
+    def SetStringSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxChoice_SetStringSelection,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxChoice instance>"
+        return "<C wxChoice instance at %s>" % (self.this,)

 class wxChoice(wxChoicePtr):
 class wxChoice(wxChoicePtr):

-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxChoice,(arg0.this,arg1,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxChoice,_args,_kwargs)

         self.thisown = 1
         wx._StdWindowCallbacks(self)
 
         self.thisown = 1
         wx._StdWindowCallbacks(self)
 


@@ -189,77 +165,74 @@ class wxComboBoxPtr(wxChoicePtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def Append(self,arg0):
-        val = controlsc.wxComboBox_Append(self.this,arg0)
+    def Append(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_Append,(self,) + _args, _kwargs)

         return val
         return val

-    def Clear(self):
-        val = controlsc.wxComboBox_Clear(self.this)
+    def Clear(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_Clear,(self,) + _args, _kwargs)

         return val
         return val

-    def Copy(self):
-        val = controlsc.wxComboBox_Copy(self.this)
+    def Copy(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_Copy,(self,) + _args, _kwargs)

         return val
         return val

-    def Cut(self):
-        val = controlsc.wxComboBox_Cut(self.this)
+    def Cut(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_Cut,(self,) + _args, _kwargs)

         return val
         return val

-    def Delete(self,arg0):
-        val = controlsc.wxComboBox_Delete(self.this,arg0)
+    def Delete(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_Delete,(self,) + _args, _kwargs)

         return val
         return val

-    def FindString(self,arg0):
-        val = controlsc.wxComboBox_FindString(self.this,arg0)
+    def FindString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_FindString,(self,) + _args, _kwargs)

         return val
         return val

-    def GetInsertionPoint(self):
-        val = controlsc.wxComboBox_GetInsertionPoint(self.this)
+    def GetInsertionPoint(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_GetInsertionPoint,(self,) + _args, _kwargs)

         return val
         return val

-    def GetLastPosition(self):
-        val = controlsc.wxComboBox_GetLastPosition(self.this)
+    def GetLastPosition(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_GetLastPosition,(self,) + _args, _kwargs)

         return val
         return val

-    def GetSelection(self):
-        val = controlsc.wxComboBox_GetSelection(self.this)
+    def GetSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_GetSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def GetString(self,arg0):
-        val = controlsc.wxComboBox_GetString(self.this,arg0)
+    def GetString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_GetString,(self,) + _args, _kwargs)

         return val
         return val

-    def GetStringSelection(self):
-        val = controlsc.wxComboBox_GetStringSelection(self.this)
+    def GetStringSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_GetStringSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def GetValue(self):
-        val = controlsc.wxComboBox_GetValue(self.this)
+    def GetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_GetValue,(self,) + _args, _kwargs)

         return val
         return val

-    def Number(self):
-        val = controlsc.wxComboBox_Number(self.this)
+    def Number(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_Number,(self,) + _args, _kwargs)

         return val
         return val

-    def Paste(self):
-        val = controlsc.wxComboBox_Paste(self.this)
+    def Paste(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_Paste,(self,) + _args, _kwargs)

         return val
         return val

-    def Replace(self,arg0,arg1,arg2):
-        val = controlsc.wxComboBox_Replace(self.this,arg0,arg1,arg2)
+    def Replace(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_Replace,(self,) + _args, _kwargs)

         return val
         return val

-    def Remove(self,arg0,arg1):
-        val = controlsc.wxComboBox_Remove(self.this,arg0,arg1)
+    def Remove(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_Remove,(self,) + _args, _kwargs)

         return val
         return val

-    def SetInsertionPoint(self,arg0):
-        val = controlsc.wxComboBox_SetInsertionPoint(self.this,arg0)
+    def SetInsertionPoint(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_SetInsertionPoint,(self,) + _args, _kwargs)

         return val
         return val

-    def SetInsertionPointEnd(self):
-        val = controlsc.wxComboBox_SetInsertionPointEnd(self.this)
+    def SetInsertionPointEnd(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_SetInsertionPointEnd,(self,) + _args, _kwargs)

         return val
         return val

-    def SetMark(self,arg0,arg1):
-        val = controlsc.wxComboBox_SetMark(self.this,arg0,arg1)
+    def SetSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_SetSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def SetValue(self,arg0):
-        val = controlsc.wxComboBox_SetValue(self.this,arg0)
+    def SetMark(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_SetMark,(self,) + _args, _kwargs)
+        return val
+    def SetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_SetValue,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxComboBox instance>"
+        return "<C wxComboBox instance at %s>" % (self.this,)

 class wxComboBox(wxComboBoxPtr):
 class wxComboBox(wxComboBoxPtr):

-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[1] = argl[1].this
-        except: pass
-        try: argl[2] = argl[2].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxComboBox,(arg0.this,arg1,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxComboBox,_args,_kwargs)

         self.thisown = 1
         wx._StdWindowCallbacks(self)
 
         self.thisown = 1
         wx._StdWindowCallbacks(self)
 


@@ -270,41 +243,35 @@ class wxGaugePtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetBezelFace(self):
-        val = controlsc.wxGauge_GetBezelFace(self.this)
+    def GetBezelFace(self, *_args, **_kwargs):
+        val = apply(controlsc.wxGauge_GetBezelFace,(self,) + _args, _kwargs)

         return val
         return val

-    def GetRange(self):
-        val = controlsc.wxGauge_GetRange(self.this)
+    def GetRange(self, *_args, **_kwargs):
+        val = apply(controlsc.wxGauge_GetRange,(self,) + _args, _kwargs)

         return val
         return val

-    def GetShadowWidth(self):
-        val = controlsc.wxGauge_GetShadowWidth(self.this)
+    def GetShadowWidth(self, *_args, **_kwargs):
+        val = apply(controlsc.wxGauge_GetShadowWidth,(self,) + _args, _kwargs)

         return val
         return val

-    def GetValue(self):
-        val = controlsc.wxGauge_GetValue(self.this)
+    def GetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxGauge_GetValue,(self,) + _args, _kwargs)

         return val
         return val

-    def SetBezelFace(self,arg0):
-        val = controlsc.wxGauge_SetBezelFace(self.this,arg0)
+    def SetBezelFace(self, *_args, **_kwargs):
+        val = apply(controlsc.wxGauge_SetBezelFace,(self,) + _args, _kwargs)

         return val
         return val

-    def SetRange(self,arg0):
-        val = controlsc.wxGauge_SetRange(self.this,arg0)
+    def SetRange(self, *_args, **_kwargs):
+        val = apply(controlsc.wxGauge_SetRange,(self,) + _args, _kwargs)

         return val
         return val

-    def SetShadowWidth(self,arg0):
-        val = controlsc.wxGauge_SetShadowWidth(self.this,arg0)
+    def SetShadowWidth(self, *_args, **_kwargs):
+        val = apply(controlsc.wxGauge_SetShadowWidth,(self,) + _args, _kwargs)

         return val
         return val

-    def SetValue(self,arg0):
-        val = controlsc.wxGauge_SetValue(self.this,arg0)
+    def SetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxGauge_SetValue,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxGauge instance>"
+        return "<C wxGauge instance at %s>" % (self.this,)

 class wxGauge(wxGaugePtr):
 class wxGauge(wxGaugePtr):

-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxGauge,(arg0.this,arg1,arg2,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxGauge,_args,_kwargs)

         self.thisown = 1
         wx._StdWindowCallbacks(self)
 
         self.thisown = 1
         wx._StdWindowCallbacks(self)
 


@@ -316,16 +283,10 @@ class wxStaticBoxPtr(wxControlPtr):
         self.this = this
         self.thisown = 0
     def __repr__(self):
         self.this = this
         self.thisown = 0
     def __repr__(self):

-        return "<C wxStaticBox instance>"
+        return "<C wxStaticBox instance at %s>" % (self.this,)

 class wxStaticBox(wxStaticBoxPtr):
 class wxStaticBox(wxStaticBoxPtr):

-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxStaticBox,(arg0.this,arg1,arg2,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxStaticBox,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -336,16 +297,10 @@ class wxStaticLinePtr(wxControlPtr):
         self.this = this
         self.thisown = 0
     def __repr__(self):
         self.this = this
         self.thisown = 0
     def __repr__(self):

-        return "<C wxStaticLine instance>"
+        return "<C wxStaticLine instance at %s>" % (self.this,)

 class wxStaticLine(wxStaticLinePtr):
 class wxStaticLine(wxStaticLinePtr):

-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxStaticLine,(arg0.this,arg1,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxStaticLine,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -355,23 +310,17 @@ class wxStaticTextPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetLabel(self):
-        val = controlsc.wxStaticText_GetLabel(self.this)
+    def GetLabel(self, *_args, **_kwargs):
+        val = apply(controlsc.wxStaticText_GetLabel,(self,) + _args, _kwargs)

         return val
         return val

-    def SetLabel(self,arg0):
-        val = controlsc.wxStaticText_SetLabel(self.this,arg0)
+    def SetLabel(self, *_args, **_kwargs):
+        val = apply(controlsc.wxStaticText_SetLabel,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxStaticText instance>"
+        return "<C wxStaticText instance at %s>" % (self.this,)

 class wxStaticText(wxStaticTextPtr):
 class wxStaticText(wxStaticTextPtr):

-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxStaticText,(arg0.this,arg1,arg2,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxStaticText,_args,_kwargs)

         self.thisown = 1
         wx._StdWindowCallbacks(self)
 
         self.thisown = 1
         wx._StdWindowCallbacks(self)
 


@@ -382,68 +331,62 @@ class wxListBoxPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def Append(self,arg0):
-        val = controlsc.wxListBox_Append(self.this,arg0)
+    def Append(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_Append,(self,) + _args, _kwargs)

         return val
         return val

-    def Clear(self):
-        val = controlsc.wxListBox_Clear(self.this)
+    def Clear(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_Clear,(self,) + _args, _kwargs)

         return val
         return val

-    def Delete(self,arg0):
-        val = controlsc.wxListBox_Delete(self.this,arg0)
+    def Delete(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_Delete,(self,) + _args, _kwargs)

         return val
         return val

-    def Deselect(self,arg0):
-        val = controlsc.wxListBox_Deselect(self.this,arg0)
+    def Deselect(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_Deselect,(self,) + _args, _kwargs)

         return val
         return val

-    def FindString(self,arg0):
-        val = controlsc.wxListBox_FindString(self.this,arg0)
+    def FindString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_FindString,(self,) + _args, _kwargs)

         return val
         return val

-    def GetSelection(self):
-        val = controlsc.wxListBox_GetSelection(self.this)
+    def GetSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_GetSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def GetSelections(self):
-        val = controlsc.wxListBox_GetSelections(self.this)
+    def GetSelections(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_GetSelections,(self,) + _args, _kwargs)

         return val
         return val

-    def GetString(self,arg0):
-        val = controlsc.wxListBox_GetString(self.this,arg0)
+    def GetString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_GetString,(self,) + _args, _kwargs)

         return val
         return val

-    def GetStringSelection(self):
-        val = controlsc.wxListBox_GetStringSelection(self.this)
+    def GetStringSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_GetStringSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def Number(self):
-        val = controlsc.wxListBox_Number(self.this)
+    def Number(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_Number,(self,) + _args, _kwargs)

         return val
         return val

-    def Selected(self,arg0):
-        val = controlsc.wxListBox_Selected(self.this,arg0)
+    def Selected(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_Selected,(self,) + _args, _kwargs)

         return val
         return val

-    def Set(self,arg0,*args):
-        val = apply(controlsc.wxListBox_Set,(self.this,arg0,)+args)
+    def Set(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_Set,(self,) + _args, _kwargs)

         return val
         return val

-    def SetFirstItem(self,arg0):
-        val = controlsc.wxListBox_SetFirstItem(self.this,arg0)
+    def SetFirstItem(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_SetFirstItem,(self,) + _args, _kwargs)

         return val
         return val

-    def SetFirstItemStr(self,arg0):
-        val = controlsc.wxListBox_SetFirstItemStr(self.this,arg0)
+    def SetFirstItemStr(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_SetFirstItemStr,(self,) + _args, _kwargs)

         return val
         return val

-    def SetSelection(self,arg0,*args):
-        val = apply(controlsc.wxListBox_SetSelection,(self.this,arg0,)+args)
+    def SetSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_SetSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def SetString(self,arg0,arg1):
-        val = controlsc.wxListBox_SetString(self.this,arg0,arg1)
+    def SetString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_SetString,(self,) + _args, _kwargs)

         return val
         return val

-    def SetStringSelection(self,arg0,*args):
-        val = apply(controlsc.wxListBox_SetStringSelection,(self.this,arg0,)+args)
+    def SetStringSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_SetStringSelection,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxListBox instance>"
+        return "<C wxListBox instance at %s>" % (self.this,)

 class wxListBox(wxListBoxPtr):
 class wxListBox(wxListBoxPtr):

-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxListBox,(arg0.this,arg1,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxListBox,_args,_kwargs)

         self.thisown = 1
         wx._StdWindowCallbacks(self)
 
         self.thisown = 1
         wx._StdWindowCallbacks(self)
 


@@ -454,26 +397,20 @@ class wxCheckListBoxPtr(wxListBoxPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def IsChecked(self,arg0):
-        val = controlsc.wxCheckListBox_IsChecked(self.this,arg0)
+    def IsChecked(self, *_args, **_kwargs):
+        val = apply(controlsc.wxCheckListBox_IsChecked,(self,) + _args, _kwargs)

         return val
         return val

-    def Check(self,arg0,*args):
-        val = apply(controlsc.wxCheckListBox_Check,(self.this,arg0,)+args)
+    def Check(self, *_args, **_kwargs):
+        val = apply(controlsc.wxCheckListBox_Check,(self,) + _args, _kwargs)

         return val
         return val

-    def GetItemHeight(self):
-        val = controlsc.wxCheckListBox_GetItemHeight(self.this)
+    def GetItemHeight(self, *_args, **_kwargs):
+        val = apply(controlsc.wxCheckListBox_GetItemHeight,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxCheckListBox instance>"
+        return "<C wxCheckListBox instance at %s>" % (self.this,)

 class wxCheckListBox(wxCheckListBoxPtr):
 class wxCheckListBox(wxCheckListBoxPtr):

-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxCheckListBox,(arg0.this,arg1,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxCheckListBox,_args,_kwargs)

         self.thisown = 1
         wx._StdWindowCallbacks(self)
 
         self.thisown = 1
         wx._StdWindowCallbacks(self)
 


@@ -484,116 +421,110 @@ class wxTextCtrlPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def Clear(self):
-        val = controlsc.wxTextCtrl_Clear(self.this)
+    def Clear(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_Clear,(self,) + _args, _kwargs)

         return val
         return val

-    def Copy(self):
-        val = controlsc.wxTextCtrl_Copy(self.this)
+    def Copy(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_Copy,(self,) + _args, _kwargs)

         return val
         return val

-    def Cut(self):
-        val = controlsc.wxTextCtrl_Cut(self.this)
+    def Cut(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_Cut,(self,) + _args, _kwargs)

         return val
         return val

-    def DiscardEdits(self):
-        val = controlsc.wxTextCtrl_DiscardEdits(self.this)
+    def DiscardEdits(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_DiscardEdits,(self,) + _args, _kwargs)

         return val
         return val

-    def GetInsertionPoint(self):
-        val = controlsc.wxTextCtrl_GetInsertionPoint(self.this)
+    def GetInsertionPoint(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_GetInsertionPoint,(self,) + _args, _kwargs)

         return val
         return val

-    def GetLastPosition(self):
-        val = controlsc.wxTextCtrl_GetLastPosition(self.this)
+    def GetLastPosition(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_GetLastPosition,(self,) + _args, _kwargs)

         return val
         return val

-    def GetLineLength(self,arg0):
-        val = controlsc.wxTextCtrl_GetLineLength(self.this,arg0)
+    def GetLineLength(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_GetLineLength,(self,) + _args, _kwargs)

         return val
         return val

-    def GetLineText(self,arg0):
-        val = controlsc.wxTextCtrl_GetLineText(self.this,arg0)
+    def GetLineText(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_GetLineText,(self,) + _args, _kwargs)

         return val
         return val

-    def GetNumberOfLines(self):
-        val = controlsc.wxTextCtrl_GetNumberOfLines(self.this)
+    def GetNumberOfLines(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_GetNumberOfLines,(self,) + _args, _kwargs)

         return val
         return val

-    def GetValue(self):
-        val = controlsc.wxTextCtrl_GetValue(self.this)
+    def GetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_GetValue,(self,) + _args, _kwargs)

         return val
         return val

-    def IsModified(self):
-        val = controlsc.wxTextCtrl_IsModified(self.this)
+    def IsModified(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_IsModified,(self,) + _args, _kwargs)

         return val
         return val

-    def LoadFile(self,arg0):
-        val = controlsc.wxTextCtrl_LoadFile(self.this,arg0)
+    def LoadFile(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_LoadFile,(self,) + _args, _kwargs)

         return val
         return val

-    def Paste(self):
-        val = controlsc.wxTextCtrl_Paste(self.this)
+    def Paste(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_Paste,(self,) + _args, _kwargs)

         return val
         return val

-    def PositionToXY(self,arg0):
-        val = controlsc.wxTextCtrl_PositionToXY(self.this,arg0)
+    def PositionToXY(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_PositionToXY,(self,) + _args, _kwargs)

         return val
         return val

-    def Remove(self,arg0,arg1):
-        val = controlsc.wxTextCtrl_Remove(self.this,arg0,arg1)
+    def Remove(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_Remove,(self,) + _args, _kwargs)

         return val
         return val

-    def Replace(self,arg0,arg1,arg2):
-        val = controlsc.wxTextCtrl_Replace(self.this,arg0,arg1,arg2)
+    def Replace(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_Replace,(self,) + _args, _kwargs)

         return val
         return val

-    def SaveFile(self,arg0):
-        val = controlsc.wxTextCtrl_SaveFile(self.this,arg0)
+    def SaveFile(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SaveFile,(self,) + _args, _kwargs)

         return val
         return val

-    def SetEditable(self,arg0):
-        val = controlsc.wxTextCtrl_SetEditable(self.this,arg0)
+    def SetEditable(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SetEditable,(self,) + _args, _kwargs)

         return val
         return val

-    def SetInsertionPoint(self,arg0):
-        val = controlsc.wxTextCtrl_SetInsertionPoint(self.this,arg0)
+    def SetInsertionPoint(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SetInsertionPoint,(self,) + _args, _kwargs)

         return val
         return val

-    def SetInsertionPointEnd(self):
-        val = controlsc.wxTextCtrl_SetInsertionPointEnd(self.this)
+    def SetInsertionPointEnd(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SetInsertionPointEnd,(self,) + _args, _kwargs)

         return val
         return val

-    def SetSelection(self,arg0,arg1):
-        val = controlsc.wxTextCtrl_SetSelection(self.this,arg0,arg1)
+    def SetSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SetSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def SetValue(self,arg0):
-        val = controlsc.wxTextCtrl_SetValue(self.this,arg0)
+    def SetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SetValue,(self,) + _args, _kwargs)

         return val
         return val

-    def ShowPosition(self,arg0):
-        val = controlsc.wxTextCtrl_ShowPosition(self.this,arg0)
+    def ShowPosition(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_ShowPosition,(self,) + _args, _kwargs)

         return val
         return val

-    def WriteText(self,arg0):
-        val = controlsc.wxTextCtrl_WriteText(self.this,arg0)
+    def WriteText(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_WriteText,(self,) + _args, _kwargs)

         return val
         return val

-    def AppendText(self,arg0):
-        val = controlsc.wxTextCtrl_AppendText(self.this,arg0)
+    def AppendText(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_AppendText,(self,) + _args, _kwargs)

         return val
         return val

-    def XYToPosition(self,arg0,arg1):
-        val = controlsc.wxTextCtrl_XYToPosition(self.this,arg0,arg1)
+    def XYToPosition(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_XYToPosition,(self,) + _args, _kwargs)

         return val
         return val

-    def CanCopy(self):
-        val = controlsc.wxTextCtrl_CanCopy(self.this)
+    def CanCopy(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_CanCopy,(self,) + _args, _kwargs)

         return val
         return val

-    def CanCut(self):
-        val = controlsc.wxTextCtrl_CanCut(self.this)
+    def CanCut(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_CanCut,(self,) + _args, _kwargs)

         return val
         return val

-    def CanPaste(self):
-        val = controlsc.wxTextCtrl_CanPaste(self.this)
+    def CanPaste(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_CanPaste,(self,) + _args, _kwargs)

         return val
         return val

-    def CanRedo(self):
-        val = controlsc.wxTextCtrl_CanRedo(self.this)
+    def CanRedo(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_CanRedo,(self,) + _args, _kwargs)

         return val
         return val

-    def CanUndo(self):
-        val = controlsc.wxTextCtrl_CanUndo(self.this)
+    def CanUndo(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_CanUndo,(self,) + _args, _kwargs)

         return val
         return val

-    def GetSelection(self):
-        val = controlsc.wxTextCtrl_GetSelection(self.this)
+    def GetSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_GetSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def IsEditable(self):
-        val = controlsc.wxTextCtrl_IsEditable(self.this)
+    def IsEditable(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_IsEditable,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxTextCtrl instance>"
+        return "<C wxTextCtrl instance at %s>" % (self.this,)

 class wxTextCtrl(wxTextCtrlPtr):
 class wxTextCtrl(wxTextCtrlPtr):

-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[1] = argl[1].this
-        except: pass
-        try: argl[2] = argl[2].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxTextCtrl,(arg0.this,arg1,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxTextCtrl,_args,_kwargs)

         self.thisown = 1
         wx._StdWindowCallbacks(self)
 
         self.thisown = 1
         wx._StdWindowCallbacks(self)
 


@@ -604,35 +535,29 @@ class wxScrollBarPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetRange(self):
-        val = controlsc.wxScrollBar_GetRange(self.this)
+    def GetRange(self, *_args, **_kwargs):
+        val = apply(controlsc.wxScrollBar_GetRange,(self,) + _args, _kwargs)

         return val
         return val

-    def GetPageSize(self):
-        val = controlsc.wxScrollBar_GetPageSize(self.this)
+    def GetPageSize(self, *_args, **_kwargs):
+        val = apply(controlsc.wxScrollBar_GetPageSize,(self,) + _args, _kwargs)

         return val
         return val

-    def GetThumbPosition(self):
-        val = controlsc.wxScrollBar_GetThumbPosition(self.this)
+    def GetThumbPosition(self, *_args, **_kwargs):
+        val = apply(controlsc.wxScrollBar_GetThumbPosition,(self,) + _args, _kwargs)

         return val
         return val

-    def GetThumbSize(self):
-        val = controlsc.wxScrollBar_GetThumbSize(self.this)
+    def GetThumbSize(self, *_args, **_kwargs):
+        val = apply(controlsc.wxScrollBar_GetThumbSize,(self,) + _args, _kwargs)

         return val
         return val

-    def SetThumbPosition(self,arg0):
-        val = controlsc.wxScrollBar_SetThumbPosition(self.this,arg0)
+    def SetThumbPosition(self, *_args, **_kwargs):
+        val = apply(controlsc.wxScrollBar_SetThumbPosition,(self,) + _args, _kwargs)

         return val
         return val

-    def SetScrollbar(self,arg0,arg1,arg2,arg3,*args):
-        val = apply(controlsc.wxScrollBar_SetScrollbar,(self.this,arg0,arg1,arg2,arg3,)+args)
+    def SetScrollbar(self, *_args, **_kwargs):
+        val = apply(controlsc.wxScrollBar_SetScrollbar,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxScrollBar instance>"
+        return "<C wxScrollBar instance at %s>" % (self.this,)

 class wxScrollBar(wxScrollBarPtr):
 class wxScrollBar(wxScrollBarPtr):

-    def __init__(self,arg0,*args) :
-        argl = map(None,args)
-        try: argl[1] = argl[1].this
-        except: pass
-        try: argl[2] = argl[2].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxScrollBar,(arg0.this,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxScrollBar,_args,_kwargs)

         self.thisown = 1
         wx._StdWindowCallbacks(self)
 
         self.thisown = 1
         wx._StdWindowCallbacks(self)
 


@@ -643,32 +568,26 @@ class wxSpinButtonPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetMax(self):
-        val = controlsc.wxSpinButton_GetMax(self.this)
+    def GetMax(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSpinButton_GetMax,(self,) + _args, _kwargs)

         return val
         return val

-    def GetMin(self):
-        val = controlsc.wxSpinButton_GetMin(self.this)
+    def GetMin(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSpinButton_GetMin,(self,) + _args, _kwargs)

         return val
         return val

-    def GetValue(self):
-        val = controlsc.wxSpinButton_GetValue(self.this)
+    def GetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSpinButton_GetValue,(self,) + _args, _kwargs)

         return val
         return val

-    def SetRange(self,arg0,arg1):
-        val = controlsc.wxSpinButton_SetRange(self.this,arg0,arg1)
+    def SetRange(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSpinButton_SetRange,(self,) + _args, _kwargs)

         return val
         return val

-    def SetValue(self,arg0):
-        val = controlsc.wxSpinButton_SetValue(self.this,arg0)
+    def SetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSpinButton_SetValue,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxSpinButton instance>"
+        return "<C wxSpinButton instance at %s>" % (self.this,)

 class wxSpinButton(wxSpinButtonPtr):
 class wxSpinButton(wxSpinButtonPtr):

-    def __init__(self,arg0,*args) :
-        argl = map(None,args)
-        try: argl[1] = argl[1].this
-        except: pass
-        try: argl[2] = argl[2].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxSpinButton,(arg0.this,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxSpinButton,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -678,27 +597,21 @@ class wxStaticBitmapPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetBitmap(self):
-        val = controlsc.wxStaticBitmap_GetBitmap(self.this)
-        val = wxBitmapPtr(val)
+    def GetBitmap(self, *_args, **_kwargs):
+        val = apply(controlsc.wxStaticBitmap_GetBitmap,(self,) + _args, _kwargs)
+        if val: val = wxBitmapPtr(val) 

         return val
         return val

-    def SetBitmap(self,arg0):
-        val = controlsc.wxStaticBitmap_SetBitmap(self.this,arg0.this)
+    def SetBitmap(self, *_args, **_kwargs):
+        val = apply(controlsc.wxStaticBitmap_SetBitmap,(self,) + _args, _kwargs)

         return val
         return val

-    def SetIcon(self,arg0):
-        val = controlsc.wxStaticBitmap_SetIcon(self.this,arg0.this)
+    def SetIcon(self, *_args, **_kwargs):
+        val = apply(controlsc.wxStaticBitmap_SetIcon,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxStaticBitmap instance>"
+        return "<C wxStaticBitmap instance at %s>" % (self.this,)

 class wxStaticBitmap(wxStaticBitmapPtr):
 class wxStaticBitmap(wxStaticBitmapPtr):

-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxStaticBitmap,(arg0.this,arg1,arg2.this,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxStaticBitmap,_args,_kwargs)

         self.thisown = 1
         wx._StdWindowCallbacks(self)
 
         self.thisown = 1
         wx._StdWindowCallbacks(self)
 


@@ -709,56 +622,50 @@ class wxRadioBoxPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def Enable(self,arg0):
-        val = controlsc.wxRadioBox_Enable(self.this,arg0)
+    def Enable(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_Enable,(self,) + _args, _kwargs)

         return val
         return val

-    def EnableItem(self,arg0,arg1):
-        val = controlsc.wxRadioBox_EnableItem(self.this,arg0,arg1)
+    def EnableItem(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_EnableItem,(self,) + _args, _kwargs)

         return val
         return val

-    def FindString(self,arg0):
-        val = controlsc.wxRadioBox_FindString(self.this,arg0)
+    def FindString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_FindString,(self,) + _args, _kwargs)

         return val
         return val

-    def GetItemLabel(self,arg0):
-        val = controlsc.wxRadioBox_GetItemLabel(self.this,arg0)
+    def GetItemLabel(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_GetItemLabel,(self,) + _args, _kwargs)

         return val
         return val

-    def GetSelection(self):
-        val = controlsc.wxRadioBox_GetSelection(self.this)
+    def GetSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_GetSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def GetString(self,arg0):
-        val = controlsc.wxRadioBox_GetString(self.this,arg0)
+    def GetString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_GetString,(self,) + _args, _kwargs)

         return val
         return val

-    def GetStringSelection(self):
-        val = controlsc.wxRadioBox_GetStringSelection(self.this)
+    def GetStringSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_GetStringSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def Number(self):
-        val = controlsc.wxRadioBox_Number(self.this)
+    def Number(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_Number,(self,) + _args, _kwargs)

         return val
         return val

-    def SetItemLabel(self,arg0,arg1):
-        val = controlsc.wxRadioBox_SetItemLabel(self.this,arg0,arg1)
+    def SetItemLabel(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_SetItemLabel,(self,) + _args, _kwargs)

         return val
         return val

-    def SetSelection(self,arg0):
-        val = controlsc.wxRadioBox_SetSelection(self.this,arg0)
+    def SetSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_SetSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def SetStringSelection(self,arg0):
-        val = controlsc.wxRadioBox_SetStringSelection(self.this,arg0)
+    def SetStringSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_SetStringSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def Show(self,arg0):
-        val = controlsc.wxRadioBox_Show(self.this,arg0)
+    def Show(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_Show,(self,) + _args, _kwargs)

         return val
         return val

-    def ShowItem(self,arg0,arg1):
-        val = controlsc.wxRadioBox_ShowItem(self.this,arg0,arg1)
+    def ShowItem(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_ShowItem,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxRadioBox instance>"
+        return "<C wxRadioBox instance at %s>" % (self.this,)

 class wxRadioBox(wxRadioBoxPtr):
 class wxRadioBox(wxRadioBoxPtr):

-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxRadioBox,(arg0.this,arg1,arg2,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxRadioBox,_args,_kwargs)

         self.thisown = 1
         wx._StdWindowCallbacks(self)
 
         self.thisown = 1
         wx._StdWindowCallbacks(self)
 


@@ -769,23 +676,17 @@ class wxRadioButtonPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetValue(self):
-        val = controlsc.wxRadioButton_GetValue(self.this)
+    def GetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioButton_GetValue,(self,) + _args, _kwargs)

         return val
         return val

-    def SetValue(self,arg0):
-        val = controlsc.wxRadioButton_SetValue(self.this,arg0)
+    def SetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioButton_SetValue,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxRadioButton instance>"
+        return "<C wxRadioButton instance at %s>" % (self.this,)

 class wxRadioButton(wxRadioButtonPtr):
 class wxRadioButton(wxRadioButtonPtr):

-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxRadioButton,(arg0.this,arg1,arg2,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxRadioButton,_args,_kwargs)

         self.thisown = 1
         wx._StdWindowCallbacks(self)
 
         self.thisown = 1
         wx._StdWindowCallbacks(self)
 


@@ -796,74 +697,68 @@ class wxSliderPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def ClearSel(self):
-        val = controlsc.wxSlider_ClearSel(self.this)
+    def ClearSel(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_ClearSel,(self,) + _args, _kwargs)

         return val
         return val

-    def ClearTicks(self):
-        val = controlsc.wxSlider_ClearTicks(self.this)
+    def ClearTicks(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_ClearTicks,(self,) + _args, _kwargs)

         return val
         return val

-    def GetLineSize(self):
-        val = controlsc.wxSlider_GetLineSize(self.this)
+    def GetLineSize(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_GetLineSize,(self,) + _args, _kwargs)

         return val
         return val

-    def GetMax(self):
-        val = controlsc.wxSlider_GetMax(self.this)
+    def GetMax(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_GetMax,(self,) + _args, _kwargs)

         return val
         return val

-    def GetMin(self):
-        val = controlsc.wxSlider_GetMin(self.this)
+    def GetMin(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_GetMin,(self,) + _args, _kwargs)

         return val
         return val

-    def GetPageSize(self):
-        val = controlsc.wxSlider_GetPageSize(self.this)
+    def GetPageSize(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_GetPageSize,(self,) + _args, _kwargs)

         return val
         return val

-    def GetSelEnd(self):
-        val = controlsc.wxSlider_GetSelEnd(self.this)
+    def GetSelEnd(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_GetSelEnd,(self,) + _args, _kwargs)

         return val
         return val

-    def GetSelStart(self):
-        val = controlsc.wxSlider_GetSelStart(self.this)
+    def GetSelStart(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_GetSelStart,(self,) + _args, _kwargs)

         return val
         return val

-    def GetThumbLength(self):
-        val = controlsc.wxSlider_GetThumbLength(self.this)
+    def GetThumbLength(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_GetThumbLength,(self,) + _args, _kwargs)

         return val
         return val

-    def GetTickFreq(self):
-        val = controlsc.wxSlider_GetTickFreq(self.this)
+    def GetTickFreq(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_GetTickFreq,(self,) + _args, _kwargs)

         return val
         return val

-    def GetValue(self):
-        val = controlsc.wxSlider_GetValue(self.this)
+    def GetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_GetValue,(self,) + _args, _kwargs)

         return val
         return val

-    def SetRange(self,arg0,arg1):
-        val = controlsc.wxSlider_SetRange(self.this,arg0,arg1)
+    def SetRange(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_SetRange,(self,) + _args, _kwargs)

         return val
         return val

-    def SetTickFreq(self,arg0,arg1):
-        val = controlsc.wxSlider_SetTickFreq(self.this,arg0,arg1)
+    def SetTickFreq(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_SetTickFreq,(self,) + _args, _kwargs)

         return val
         return val

-    def SetLineSize(self,arg0):
-        val = controlsc.wxSlider_SetLineSize(self.this,arg0)
+    def SetLineSize(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_SetLineSize,(self,) + _args, _kwargs)

         return val
         return val

-    def SetPageSize(self,arg0):
-        val = controlsc.wxSlider_SetPageSize(self.this,arg0)
+    def SetPageSize(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_SetPageSize,(self,) + _args, _kwargs)

         return val
         return val

-    def SetSelection(self,arg0,arg1):
-        val = controlsc.wxSlider_SetSelection(self.this,arg0,arg1)
+    def SetSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_SetSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def SetThumbLength(self,arg0):
-        val = controlsc.wxSlider_SetThumbLength(self.this,arg0)
+    def SetThumbLength(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_SetThumbLength,(self,) + _args, _kwargs)

         return val
         return val

-    def SetTick(self,arg0):
-        val = controlsc.wxSlider_SetTick(self.this,arg0)
+    def SetTick(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_SetTick,(self,) + _args, _kwargs)

         return val
         return val

-    def SetValue(self,arg0):
-        val = controlsc.wxSlider_SetValue(self.this,arg0)
+    def SetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_SetValue,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxSlider instance>"
+        return "<C wxSlider instance at %s>" % (self.this,)

 class wxSlider(wxSliderPtr):
 class wxSlider(wxSliderPtr):

-    def __init__(self,arg0,arg1,arg2,arg3,arg4,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxSlider,(arg0.this,arg1,arg2,arg3,arg4,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxSlider,_args,_kwargs)

         self.thisown = 1
         wx._StdWindowCallbacks(self)
 
         self.thisown = 1
         wx._StdWindowCallbacks(self)
 

diff --git a/utils/wxPython/src/msw/controls2.cpp b/utils/wxPython/src/msw/controls2.cpp
index ef9d14c0d93f90937b95e92f49649e9ae02b8983..1e8dadad0d2b2f3efdbde6fb07d41a40a5f35978 100644 (file)
--- a/utils/wxPython/src/msw/controls2.cpp
+++ b/utils/wxPython/src/msw/controls2.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)

- * Version 1.1 (Patch 5)
+ * Version 1.1 (Patch 6)

  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.


@@ -24,16 +24,16 @@
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)

-#      define SWIGEXPORT(a,b) __declspec(dllexport) a b
+#      define SWIGEXPORT(a) __declspec(dllexport) a

 #   else
 #      if defined(__BORLANDC__)
 #   else
 #      if defined(__BORLANDC__)

-#          define SWIGEXPORT(a,b) a _export b
+#          define SWIGEXPORT(a) a _export 

 #      else
 #      else

-#          define SWIGEXPORT(a,b) a b
+#          define SWIGEXPORT(a) a 

 #      endif
 #   endif
 #else
 #      endif
 #   endif
 #else

-#   define SWIGEXPORT(a,b) a b
+#   define SWIGEXPORT(a) a 

 #endif
 
 #ifdef __cplusplus
 #endif
 
 #ifdef __cplusplus


@@ -43,12 +43,12 @@ extern "C" {
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);

+extern char *SWIG_GetPtrObj(PyObject *, void **, char *);

 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif
 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif

-

 #define SWIG_init    initcontrols2c
 
 #define SWIG_name    "controls2c"
 #define SWIG_init    initcontrols2c
 
 #define SWIG_name    "controls2c"


@@ -59,12 +59,13 @@ extern PyObject *SWIG_newvarlink(void);
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;

-    if (!target) {
+    PyObject*   o3;
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);
         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);


@@ -81,23 +82,23 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
     PyObject*   o3;
 
     PyObject*   o2;
     PyObject*   o3;
 

-    if (!target) {
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }
         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }

-        o3 = PyTuple_New(1);
-        PyTuple_SetItem(o3, 0, o);
+        o3 = PyTuple_New(1);            
+        PyTuple_SetItem(o3, 0, o);      

 
         o2 = target;
 
         o2 = target;

-        target = PySequence_Concat(o2, o3);
-        Py_DECREF(o2);
+        target = PySequence_Concat(o2, o3); 
+        Py_DECREF(o2);                      

         Py_DECREF(o3);
     }
     return target;
         Py_DECREF(o3);
     }
     return target;


@@ -150,19 +151,23 @@ public:
 
     PyObject* m_obj;
 };
 
     PyObject* m_obj;
 };

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

 #define wxListItem_m_mask_set(_swigobj,_swigval) (_swigobj->m_mask = _swigval,_swigval)
 static PyObject *_wrap_wxListItem_m_mask_set(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxListItem * _arg0;
     long  _arg1;
 #define wxListItem_m_mask_set(_swigobj,_swigval) (_swigobj->m_mask = _swigval,_swigval)
 static PyObject *_wrap_wxListItem_m_mask_set(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxListItem * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxListItem_m_mask_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxListItem_m_mask_set",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_mask_set. Expected _wxListItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_mask_set. Expected _wxListItem_p.");
         return NULL;
         }


@@ -181,13 +186,14 @@ static PyObject *_wrap_wxListItem_m_mask_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxListItem * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxListItem * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxListItem_m_mask_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxListItem_m_mask_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_mask_get. Expected _wxListItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_mask_get. Expected _wxListItem_p.");
         return NULL;
         }


@@ -207,13 +213,14 @@ static PyObject *_wrap_wxListItem_m_itemId_set(PyObject *self, PyObject *args) {
     long  _result;
     wxListItem * _arg0;
     long  _arg1;
     long  _result;
     wxListItem * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxListItem_m_itemId_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxListItem_m_itemId_set",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_itemId_set. Expected _wxListItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_itemId_set. Expected _wxListItem_p.");
         return NULL;
         }


@@ -232,13 +239,14 @@ static PyObject *_wrap_wxListItem_m_itemId_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxListItem * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxListItem * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxListItem_m_itemId_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxListItem_m_itemId_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_itemId_get. Expected _wxListItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_itemId_get. Expected _wxListItem_p.");
         return NULL;
         }


@@ -258,13 +266,14 @@ static PyObject *_wrap_wxListItem_m_col_set(PyObject *self, PyObject *args) {
     int  _result;
     wxListItem * _arg0;
     int  _arg1;
     int  _result;
     wxListItem * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxListItem_m_col_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxListItem_m_col_set",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_col_set. Expected _wxListItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_col_set. Expected _wxListItem_p.");
         return NULL;
         }


@@ -283,13 +292,14 @@ static PyObject *_wrap_wxListItem_m_col_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxListItem * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxListItem * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxListItem_m_col_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxListItem_m_col_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_col_get. Expected _wxListItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_col_get. Expected _wxListItem_p.");
         return NULL;
         }


@@ -309,13 +319,14 @@ static PyObject *_wrap_wxListItem_m_state_set(PyObject *self, PyObject *args) {
     long  _result;
     wxListItem * _arg0;
     long  _arg1;
     long  _result;
     wxListItem * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxListItem_m_state_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxListItem_m_state_set",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_state_set. Expected _wxListItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_state_set. Expected _wxListItem_p.");
         return NULL;
         }


@@ -334,13 +345,14 @@ static PyObject *_wrap_wxListItem_m_state_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxListItem * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxListItem * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxListItem_m_state_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxListItem_m_state_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_state_get. Expected _wxListItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_state_get. Expected _wxListItem_p.");
         return NULL;
         }


@@ -360,13 +372,14 @@ static PyObject *_wrap_wxListItem_m_stateMask_set(PyObject *self, PyObject *args
     long  _result;
     wxListItem * _arg0;
     long  _arg1;
     long  _result;
     wxListItem * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxListItem_m_stateMask_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxListItem_m_stateMask_set",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_stateMask_set. Expected _wxListItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_stateMask_set. Expected _wxListItem_p.");
         return NULL;
         }


@@ -385,13 +398,14 @@ static PyObject *_wrap_wxListItem_m_stateMask_get(PyObject *self, PyObject *args
     PyObject * _resultobj;
     long  _result;
     wxListItem * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxListItem * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxListItem_m_stateMask_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxListItem_m_stateMask_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_stateMask_get. Expected _wxListItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_stateMask_get. Expected _wxListItem_p.");
         return NULL;
         }


@@ -411,14 +425,15 @@ static PyObject *_wrap_wxListItem_m_text_set(PyObject *self, PyObject *args) {
     wxString * _result;
     wxListItem * _arg0;
     wxString * _arg1;
     wxString * _result;
     wxListItem * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxListItem_m_text_set",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxListItem_m_text_set",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_text_set. Expected _wxListItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_text_set. Expected _wxListItem_p.");
         return NULL;
         }


@@ -450,13 +465,14 @@ static PyObject *_wrap_wxListItem_m_text_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxListItem * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxListItem * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxListItem_m_text_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxListItem_m_text_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_text_get. Expected _wxListItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_text_get. Expected _wxListItem_p.");
         return NULL;
         }


@@ -478,13 +494,14 @@ static PyObject *_wrap_wxListItem_m_image_set(PyObject *self, PyObject *args) {
     int  _result;
     wxListItem * _arg0;
     int  _arg1;
     int  _result;
     wxListItem * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxListItem_m_image_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxListItem_m_image_set",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_image_set. Expected _wxListItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_image_set. Expected _wxListItem_p.");
         return NULL;
         }


@@ -503,13 +520,14 @@ static PyObject *_wrap_wxListItem_m_image_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxListItem * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxListItem * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxListItem_m_image_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxListItem_m_image_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_image_get. Expected _wxListItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_image_get. Expected _wxListItem_p.");
         return NULL;
         }


@@ -529,13 +547,14 @@ static PyObject *_wrap_wxListItem_m_data_set(PyObject *self, PyObject *args) {
     long  _result;
     wxListItem * _arg0;
     long  _arg1;
     long  _result;
     wxListItem * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxListItem_m_data_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxListItem_m_data_set",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_data_set. Expected _wxListItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_data_set. Expected _wxListItem_p.");
         return NULL;
         }


@@ -554,13 +573,14 @@ static PyObject *_wrap_wxListItem_m_data_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxListItem * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxListItem * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxListItem_m_data_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxListItem_m_data_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_data_get. Expected _wxListItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_data_get. Expected _wxListItem_p.");
         return NULL;
         }


@@ -580,13 +600,14 @@ static PyObject *_wrap_wxListItem_m_format_set(PyObject *self, PyObject *args) {
     int  _result;
     wxListItem * _arg0;
     int  _arg1;
     int  _result;
     wxListItem * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxListItem_m_format_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxListItem_m_format_set",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_format_set. Expected _wxListItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_format_set. Expected _wxListItem_p.");
         return NULL;
         }


@@ -605,13 +626,14 @@ static PyObject *_wrap_wxListItem_m_format_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxListItem * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxListItem * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxListItem_m_format_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxListItem_m_format_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_format_get. Expected _wxListItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_format_get. Expected _wxListItem_p.");
         return NULL;
         }


@@ -631,13 +653,14 @@ static PyObject *_wrap_wxListItem_m_width_set(PyObject *self, PyObject *args) {
     int  _result;
     wxListItem * _arg0;
     int  _arg1;
     int  _result;
     wxListItem * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxListItem_m_width_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxListItem_m_width_set",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_width_set. Expected _wxListItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_width_set. Expected _wxListItem_p.");
         return NULL;
         }


@@ -656,13 +679,14 @@ static PyObject *_wrap_wxListItem_m_width_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxListItem * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxListItem * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxListItem_m_width_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxListItem_m_width_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_width_get. Expected _wxListItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_width_get. Expected _wxListItem_p.");
         return NULL;
         }


@@ -690,8 +714,13 @@ static PyObject *_wrap_new_wxListItem(PyObject *self, PyObject *args) {
         _result = (wxListItem *)new_wxListItem();
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxListItem *)new_wxListItem();
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxListItem_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxListItem_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -699,13 +728,14 @@ static PyObject *_wrap_new_wxListItem(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxListItem(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxListItem * _arg0;
 static PyObject *_wrap_delete_wxListItem(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxListItem * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:delete_wxListItem",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxListItem",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxListItem. Expected _wxListItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxListItem. Expected _wxListItem_p.");
         return NULL;
         }


@@ -742,13 +772,14 @@ static PyObject *_wrap_wxListEvent_m_code_set(PyObject *self, PyObject *args) {
     int  _result;
     wxListEvent * _arg0;
     int  _arg1;
     int  _result;
     wxListEvent * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxListEvent_m_code_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxListEvent_m_code_set",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_code_set. Expected _wxListEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_code_set. Expected _wxListEvent_p.");
         return NULL;
         }


@@ -767,13 +798,14 @@ static PyObject *_wrap_wxListEvent_m_code_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxListEvent * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxListEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxListEvent_m_code_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxListEvent_m_code_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_code_get. Expected _wxListEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_code_get. Expected _wxListEvent_p.");
         return NULL;
         }


@@ -793,13 +825,14 @@ static PyObject *_wrap_wxListEvent_m_itemIndex_set(PyObject *self, PyObject *arg
     long  _result;
     wxListEvent * _arg0;
     long  _arg1;
     long  _result;
     wxListEvent * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxListEvent_m_itemIndex_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxListEvent_m_itemIndex_set",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_itemIndex_set. Expected _wxListEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_itemIndex_set. Expected _wxListEvent_p.");
         return NULL;
         }


@@ -818,13 +851,14 @@ static PyObject *_wrap_wxListEvent_m_itemIndex_get(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     long  _result;
     wxListEvent * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxListEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxListEvent_m_itemIndex_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxListEvent_m_itemIndex_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_itemIndex_get. Expected _wxListEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_itemIndex_get. Expected _wxListEvent_p.");
         return NULL;
         }


@@ -844,13 +878,14 @@ static PyObject *_wrap_wxListEvent_m_oldItemIndex_set(PyObject *self, PyObject *
     long  _result;
     wxListEvent * _arg0;
     long  _arg1;
     long  _result;
     wxListEvent * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxListEvent_m_oldItemIndex_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxListEvent_m_oldItemIndex_set",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_oldItemIndex_set. Expected _wxListEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_oldItemIndex_set. Expected _wxListEvent_p.");
         return NULL;
         }


@@ -869,13 +904,14 @@ static PyObject *_wrap_wxListEvent_m_oldItemIndex_get(PyObject *self, PyObject *
     PyObject * _resultobj;
     long  _result;
     wxListEvent * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxListEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxListEvent_m_oldItemIndex_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxListEvent_m_oldItemIndex_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_oldItemIndex_get. Expected _wxListEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_oldItemIndex_get. Expected _wxListEvent_p.");
         return NULL;
         }


@@ -895,13 +931,14 @@ static PyObject *_wrap_wxListEvent_m_col_set(PyObject *self, PyObject *args) {
     int  _result;
     wxListEvent * _arg0;
     int  _arg1;
     int  _result;
     wxListEvent * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxListEvent_m_col_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxListEvent_m_col_set",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_col_set. Expected _wxListEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_col_set. Expected _wxListEvent_p.");
         return NULL;
         }


@@ -920,13 +957,14 @@ static PyObject *_wrap_wxListEvent_m_col_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxListEvent * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxListEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxListEvent_m_col_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxListEvent_m_col_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_col_get. Expected _wxListEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_col_get. Expected _wxListEvent_p.");
         return NULL;
         }


@@ -946,14 +984,15 @@ static PyObject *_wrap_wxListEvent_m_cancelled_set(PyObject *self, PyObject *arg
     bool  _result;
     wxListEvent * _arg0;
     bool  _arg1;
     bool  _result;
     wxListEvent * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxListEvent_m_cancelled_set",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxListEvent_m_cancelled_set",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_cancelled_set. Expected _wxListEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_cancelled_set. Expected _wxListEvent_p.");
         return NULL;
         }


@@ -973,13 +1012,14 @@ static PyObject *_wrap_wxListEvent_m_cancelled_get(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     bool  _result;
     wxListEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxListEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxListEvent_m_cancelled_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxListEvent_m_cancelled_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_cancelled_get. Expected _wxListEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_cancelled_get. Expected _wxListEvent_p.");
         return NULL;
         }


@@ -999,21 +1039,23 @@ static PyObject *_wrap_wxListEvent_m_pointDrag_set(PyObject *self, PyObject *arg
     wxPoint * _result;
     wxListEvent * _arg0;
     wxPoint * _arg1;
     wxPoint * _result;
     wxListEvent * _arg0;
     wxPoint * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxListEvent_m_pointDrag_set",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxListEvent_m_pointDrag_set",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_pointDrag_set. Expected _wxListEvent_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_pointDrag_set. Expected _wxListEvent_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPoint_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxListEvent_m_pointDrag_set. Expected _wxPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxListEvent_m_pointDrag_set. Expected _wxPoint_p.");
         return NULL;
         }


@@ -1023,8 +1065,13 @@ static PyObject *_wrap_wxListEvent_m_pointDrag_set(PyObject *self, PyObject *arg
         _result = (wxPoint *)wxListEvent_m_pointDrag_set(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxPoint *)wxListEvent_m_pointDrag_set(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPoint_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPoint_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1033,14 +1080,15 @@ static PyObject *_wrap_wxListEvent_m_pointDrag_get(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     wxPoint * _result;
     wxListEvent * _arg0;
     PyObject * _resultobj;
     wxPoint * _result;
     wxListEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxListEvent_m_pointDrag_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxListEvent_m_pointDrag_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_pointDrag_get. Expected _wxListEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_pointDrag_get. Expected _wxListEvent_p.");
         return NULL;
         }


@@ -1050,8 +1098,13 @@ static PyObject *_wrap_wxListEvent_m_pointDrag_get(PyObject *self, PyObject *arg
         _result = (wxPoint *)wxListEvent_m_pointDrag_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxPoint *)wxListEvent_m_pointDrag_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPoint_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPoint_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1061,21 +1114,23 @@ static PyObject *_wrap_wxListEvent_m_item_set(PyObject *self, PyObject *args) {
     wxListItem * _result;
     wxListEvent * _arg0;
     wxListItem * _arg1;
     wxListItem * _result;
     wxListEvent * _arg0;
     wxListItem * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxListEvent_m_item_set",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxListEvent_m_item_set",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_item_set. Expected _wxListEvent_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_item_set. Expected _wxListEvent_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxListItem_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxListItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxListEvent_m_item_set. Expected _wxListItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxListEvent_m_item_set. Expected _wxListItem_p.");
         return NULL;
         }


@@ -1085,8 +1140,13 @@ static PyObject *_wrap_wxListEvent_m_item_set(PyObject *self, PyObject *args) {
         _result = (wxListItem *)wxListEvent_m_item_set(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxListItem *)wxListEvent_m_item_set(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxListItem_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxListItem_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1095,14 +1155,15 @@ static PyObject *_wrap_wxListEvent_m_item_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxListItem * _result;
     wxListEvent * _arg0;
     PyObject * _resultobj;
     wxListItem * _result;
     wxListEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxListEvent_m_item_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxListEvent_m_item_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_item_get. Expected _wxListEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_item_get. Expected _wxListEvent_p.");
         return NULL;
         }


@@ -1112,8 +1173,13 @@ static PyObject *_wrap_wxListEvent_m_item_get(PyObject *self, PyObject *args) {
         _result = (wxListItem *)wxListEvent_m_item_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxListItem *)wxListEvent_m_item_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxListItem_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxListItem_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1147,40 +1213,44 @@ static PyObject *_wrap_new_wxListCtrl(PyObject *self, PyObject *args) {
     wxListCtrl * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxListCtrl * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;

-    wxPoint * _arg2 = &wxPyDefaultPosition;
-    wxSize * _arg3 = &wxPyDefaultSize;
-    long  _arg4 = (wxLC_ICON);
-    wxValidator * _arg5 = &wxPyDefaultValidator;
-    char * _arg6 = "listCtrl";
-    char * _argc0 = 0;
-    char * _argc2 = 0;
-    char * _argc3 = 0;
-    char * _argc5 = 0;
+    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    long  _arg4 = (long ) wxLC_ICON;
+    wxValidator * _arg5 = (wxValidator *) &wxPyDefaultValidator;
+    char * _arg6 = (char *) "listCtrl";
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;
+    PyObject * _argo3 = 0;
+    PyObject * _argo5 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si|sslss:new_wxListCtrl",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_argc5,&_arg6)) 
+    if(!PyArg_ParseTuple(args,"Oi|OOlOs:new_wxListCtrl",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_argo5,&_arg6)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxListCtrl. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxListCtrl. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxListCtrl. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxListCtrl. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxSize_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxListCtrl. Expected _wxSize_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxListCtrl. Expected _wxSize_p.");
         return NULL;
         }
     }

-    if (_argc5) {
-        if (SWIG_GetPtr(_argc5,(void **) &_arg5,"_wxValidator_p")) {
+    if (_argo5) {
+        if (_argo5 == Py_None) { _arg5 = NULL; }
+        else if (SWIG_GetPtrObj(_argo5,(void **) &_arg5,"_wxValidator_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of new_wxListCtrl. Expected _wxValidator_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of new_wxListCtrl. Expected _wxValidator_p.");
         return NULL;
         }


@@ -1190,8 +1260,13 @@ static PyObject *_wrap_new_wxListCtrl(PyObject *self, PyObject *args) {
         _result = (wxListCtrl *)new_wxListCtrl(_arg0,_arg1,*_arg2,*_arg3,_arg4,*_arg5,_arg6);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxListCtrl *)new_wxListCtrl(_arg0,_arg1,*_arg2,*_arg3,_arg4,*_arg5,_arg6);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxListCtrl_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxListCtrl_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1200,14 +1275,15 @@ static PyObject *_wrap_wxListCtrl_Arrange(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxListCtrl * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxListCtrl * _arg0;

-    int  _arg1 = (wxLIST_ALIGN_DEFAULT);
-    char * _argc0 = 0;
+    int  _arg1 = (int ) (wxLIST_ALIGN_DEFAULT);
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxListCtrl_Arrange",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"O|i:wxListCtrl_Arrange",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_Arrange. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_Arrange. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -1227,13 +1303,14 @@ static PyObject *_wrap_wxListCtrl_DeleteItem(PyObject *self, PyObject *args) {
     bool  _result;
     wxListCtrl * _arg0;
     long  _arg1;
     bool  _result;
     wxListCtrl * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxListCtrl_DeleteItem",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxListCtrl_DeleteItem",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_DeleteItem. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_DeleteItem. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -1252,13 +1329,14 @@ static PyObject *_wrap_wxListCtrl_DeleteAllItems(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     bool  _result;
     wxListCtrl * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxListCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxListCtrl_DeleteAllItems",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxListCtrl_DeleteAllItems",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_DeleteAllItems. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_DeleteAllItems. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -1278,13 +1356,14 @@ static PyObject *_wrap_wxListCtrl_DeleteColumn(PyObject *self, PyObject *args) {
     bool  _result;
     wxListCtrl * _arg0;
     int  _arg1;
     bool  _result;
     wxListCtrl * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxListCtrl_DeleteColumn",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxListCtrl_DeleteColumn",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_DeleteColumn. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_DeleteColumn. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -1303,13 +1382,14 @@ static PyObject *_wrap_wxListCtrl_DeleteAllColumns(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     bool  _result;
     wxListCtrl * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxListCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxListCtrl_DeleteAllColumns",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxListCtrl_DeleteAllColumns",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_DeleteAllColumns. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_DeleteAllColumns. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -1327,13 +1407,14 @@ static PyObject *_wrap_wxListCtrl_DeleteAllColumns(PyObject *self, PyObject *arg
 static PyObject *_wrap_wxListCtrl_ClearAll(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxListCtrl * _arg0;
 static PyObject *_wrap_wxListCtrl_ClearAll(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxListCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxListCtrl_ClearAll",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxListCtrl_ClearAll",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_ClearAll. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_ClearAll. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -1354,14 +1435,15 @@ static PyObject *_wrap_wxListCtrl_EditLabel(PyObject *self, PyObject *args) {
     wxTextCtrl * _result;
     wxListCtrl * _arg0;
     long  _arg1;
     wxTextCtrl * _result;
     wxListCtrl * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxListCtrl_EditLabel",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxListCtrl_EditLabel",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_EditLabel. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_EditLabel. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -1371,8 +1453,13 @@ static PyObject *_wrap_wxListCtrl_EditLabel(PyObject *self, PyObject *args) {
         _result = (wxTextCtrl *)wxListCtrl_EditLabel(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxTextCtrl *)wxListCtrl_EditLabel(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxTextCtrl_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxTextCtrl_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1382,14 +1469,15 @@ static PyObject *_wrap_wxListCtrl_EndEditLabel(PyObject *self, PyObject *args) {
     bool  _result;
     wxListCtrl * _arg0;
     bool  _arg1;
     bool  _result;
     wxListCtrl * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxListCtrl_EndEditLabel",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxListCtrl_EndEditLabel",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_EndEditLabel. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_EndEditLabel. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -1409,14 +1497,15 @@ static PyObject *_wrap_wxListCtrl_GetEditControl(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxTextCtrl * _result;
     wxListCtrl * _arg0;
     PyObject * _resultobj;
     wxTextCtrl * _result;
     wxListCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxListCtrl_GetEditControl",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxListCtrl_GetEditControl",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetEditControl. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetEditControl. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -1426,8 +1515,13 @@ static PyObject *_wrap_wxListCtrl_GetEditControl(PyObject *self, PyObject *args)
         _result = (wxTextCtrl *)wxListCtrl_GetEditControl(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxTextCtrl *)wxListCtrl_GetEditControl(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxTextCtrl_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxTextCtrl_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1437,13 +1531,14 @@ static PyObject *_wrap_wxListCtrl_EnsureVisible(PyObject *self, PyObject *args)
     bool  _result;
     wxListCtrl * _arg0;
     long  _arg1;
     bool  _result;
     wxListCtrl * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxListCtrl_EnsureVisible",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxListCtrl_EnsureVisible",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_EnsureVisible. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_EnsureVisible. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -1464,16 +1559,17 @@ static PyObject *_wrap_wxListCtrl_FindItem(PyObject *self, PyObject *args) {
     wxListCtrl * _arg0;
     long  _arg1;
     wxString * _arg2;
     wxListCtrl * _arg0;
     long  _arg1;
     wxString * _arg2;

-    bool  _arg3 = (0);
-    char * _argc0 = 0;
+    bool  _arg3 = (bool ) FALSE;
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
     PyObject * _obj2 = 0;

-    int tempbool3;
+    int tempbool3 = (int) FALSE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"slO|i:wxListCtrl_FindItem",&_argc0,&_arg1,&_obj2,&tempbool3)) 
+    if(!PyArg_ParseTuple(args,"OlO|i:wxListCtrl_FindItem",&_argo0,&_arg1,&_obj2,&tempbool3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_FindItem. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_FindItem. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -1506,13 +1602,14 @@ static PyObject *_wrap_wxListCtrl_FindItemData(PyObject *self, PyObject *args) {
     wxListCtrl * _arg0;
     long  _arg1;
     long  _arg2;
     wxListCtrl * _arg0;
     long  _arg1;
     long  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sll:wxListCtrl_FindItemData",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oll:wxListCtrl_FindItemData",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_FindItemData. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_FindItemData. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -1534,20 +1631,22 @@ static PyObject *_wrap_wxListCtrl_FindItemAtPos(PyObject *self, PyObject *args)
     long  _arg1;
     wxPoint * _arg2;
     int  _arg3;
     long  _arg1;
     wxPoint * _arg2;
     int  _arg3;

-    char * _argc0 = 0;
-    char * _argc2 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"slsi:wxListCtrl_FindItemAtPos",&_argc0,&_arg1,&_argc2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"OlOi:wxListCtrl_FindItemAtPos",&_argo0,&_arg1,&_argo2,&_arg3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_FindItemAtPos. Expected _wxListCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_FindItemAtPos. Expected _wxListCtrl_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxListCtrl_FindItemAtPos. Expected _wxPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxListCtrl_FindItemAtPos. Expected _wxPoint_p.");
         return NULL;
         }


@@ -1568,20 +1667,22 @@ static PyObject *_wrap_wxListCtrl_GetColumn(PyObject *self, PyObject *args) {
     wxListCtrl * _arg0;
     int  _arg1;
     wxListItem * _arg2;
     wxListCtrl * _arg0;
     int  _arg1;
     wxListItem * _arg2;

-    char * _argc0 = 0;
-    char * _argc2 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sis:wxListCtrl_GetColumn",&_argc0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"OiO:wxListCtrl_GetColumn",&_argo0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetColumn. Expected _wxListCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetColumn. Expected _wxListCtrl_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxListItem_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxListItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxListCtrl_GetColumn. Expected _wxListItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxListCtrl_GetColumn. Expected _wxListItem_p.");
         return NULL;
         }


@@ -1601,13 +1702,14 @@ static PyObject *_wrap_wxListCtrl_GetColumnWidth(PyObject *self, PyObject *args)
     int  _result;
     wxListCtrl * _arg0;
     int  _arg1;
     int  _result;
     wxListCtrl * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxListCtrl_GetColumnWidth",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxListCtrl_GetColumnWidth",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetColumnWidth. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetColumnWidth. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -1626,13 +1728,14 @@ static PyObject *_wrap_wxListCtrl_GetCountPerPage(PyObject *self, PyObject *args
     PyObject * _resultobj;
     int  _result;
     wxListCtrl * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxListCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxListCtrl_GetCountPerPage",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxListCtrl_GetCountPerPage",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetCountPerPage. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetCountPerPage. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -1652,14 +1755,15 @@ static PyObject *_wrap_wxListCtrl_GetImageList(PyObject *self, PyObject *args) {
     wxImageList * _result;
     wxListCtrl * _arg0;
     int  _arg1;
     wxImageList * _result;
     wxListCtrl * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxListCtrl_GetImageList",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxListCtrl_GetImageList",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetImageList. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetImageList. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -1669,8 +1773,13 @@ static PyObject *_wrap_wxListCtrl_GetImageList(PyObject *self, PyObject *args) {
         _result = (wxImageList *)wxListCtrl_GetImageList(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxImageList *)wxListCtrl_GetImageList(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxImageList_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxImageList_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1680,13 +1789,14 @@ static PyObject *_wrap_wxListCtrl_GetItemData(PyObject *self, PyObject *args) {
     long  _result;
     wxListCtrl * _arg0;
     long  _arg1;
     long  _result;
     wxListCtrl * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxListCtrl_GetItemData",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxListCtrl_GetItemData",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetItemData. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetItemData. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -1711,14 +1821,15 @@ static PyObject *_wrap_wxListCtrl_GetItem(PyObject *self, PyObject *args) {
     wxListItem * _result;
     wxListCtrl * _arg0;
     long  _arg1;
     wxListItem * _result;
     wxListCtrl * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxListCtrl_GetItem",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxListCtrl_GetItem",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetItem. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetItem. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -1728,8 +1839,13 @@ static PyObject *_wrap_wxListCtrl_GetItem(PyObject *self, PyObject *args) {
         _result = (wxListItem *)wxListCtrl_GetItem(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxListItem *)wxListCtrl_GetItem(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxListItem_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxListItem_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1743,14 +1859,15 @@ static PyObject *_wrap_wxListCtrl_GetItemPosition(PyObject *self, PyObject *args
     wxPoint * _result;
     wxListCtrl * _arg0;
     long  _arg1;
     wxPoint * _result;
     wxListCtrl * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxListCtrl_GetItemPosition",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxListCtrl_GetItemPosition",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetItemPosition. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetItemPosition. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -1760,8 +1877,13 @@ static PyObject *_wrap_wxListCtrl_GetItemPosition(PyObject *self, PyObject *args
         _result = (wxPoint *)wxListCtrl_GetItemPosition(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxPoint *)wxListCtrl_GetItemPosition(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPoint_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPoint_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1775,15 +1897,16 @@ static PyObject *_wrap_wxListCtrl_GetItemRect(PyObject *self, PyObject *args) {
     wxRect * _result;
     wxListCtrl * _arg0;
     long  _arg1;
     wxRect * _result;
     wxListCtrl * _arg0;
     long  _arg1;

-    int  _arg2 = (wxLIST_RECT_BOUNDS);
-    char * _argc0 = 0;
+    int  _arg2 = (int ) (wxLIST_RECT_BOUNDS);
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl|i:wxListCtrl_GetItemRect",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Ol|i:wxListCtrl_GetItemRect",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetItemRect. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetItemRect. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -1793,8 +1916,13 @@ static PyObject *_wrap_wxListCtrl_GetItemRect(PyObject *self, PyObject *args) {
         _result = (wxRect *)wxListCtrl_GetItemRect(_arg0,_arg1,_arg2);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxRect *)wxListCtrl_GetItemRect(_arg0,_arg1,_arg2);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxRect_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxRect_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1805,13 +1933,14 @@ static PyObject *_wrap_wxListCtrl_GetItemState(PyObject *self, PyObject *args) {
     wxListCtrl * _arg0;
     long  _arg1;
     long  _arg2;
     wxListCtrl * _arg0;
     long  _arg1;
     long  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sll:wxListCtrl_GetItemState",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oll:wxListCtrl_GetItemState",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetItemState. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetItemState. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -1830,13 +1959,14 @@ static PyObject *_wrap_wxListCtrl_GetItemCount(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxListCtrl * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxListCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxListCtrl_GetItemCount",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxListCtrl_GetItemCount",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetItemCount. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetItemCount. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -1856,14 +1986,15 @@ static PyObject *_wrap_wxListCtrl_GetItemSpacing(PyObject *self, PyObject *args)
     int  _result;
     wxListCtrl * _arg0;
     bool  _arg1;
     int  _result;
     wxListCtrl * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxListCtrl_GetItemSpacing",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxListCtrl_GetItemSpacing",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetItemSpacing. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetItemSpacing. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -1884,13 +2015,14 @@ static PyObject *_wrap_wxListCtrl_GetItemText(PyObject *self, PyObject *args) {
     wxString * _result;
     wxListCtrl * _arg0;
     long  _arg1;
     wxString * _result;
     wxListCtrl * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxListCtrl_GetItemText",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxListCtrl_GetItemText",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetItemText. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetItemText. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -1915,15 +2047,16 @@ static PyObject *_wrap_wxListCtrl_GetNextItem(PyObject *self, PyObject *args) {
     long  _result;
     wxListCtrl * _arg0;
     long  _arg1;
     long  _result;
     wxListCtrl * _arg0;
     long  _arg1;

-    int  _arg2 = (wxLIST_NEXT_ALL);
-    int  _arg3 = (wxLIST_STATE_DONTCARE);
-    char * _argc0 = 0;
+    int  _arg2 = (int ) (wxLIST_NEXT_ALL);
+    int  _arg3 = (int ) (wxLIST_STATE_DONTCARE);
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl|ii:wxListCtrl_GetNextItem",&_argc0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"Ol|ii:wxListCtrl_GetNextItem",&_argo0,&_arg1,&_arg2,&_arg3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetNextItem. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetNextItem. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -1942,13 +2075,14 @@ static PyObject *_wrap_wxListCtrl_GetSelectedItemCount(PyObject *self, PyObject
     PyObject * _resultobj;
     int  _result;
     wxListCtrl * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxListCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxListCtrl_GetSelectedItemCount",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxListCtrl_GetSelectedItemCount",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetSelectedItemCount. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetSelectedItemCount. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -1967,14 +2101,15 @@ static PyObject *_wrap_wxListCtrl_GetTextColour(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxColour * _result;
     wxListCtrl * _arg0;
     PyObject * _resultobj;
     wxColour * _result;
     wxListCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxListCtrl_GetTextColour",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxListCtrl_GetTextColour",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetTextColour. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetTextColour. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -1994,20 +2129,22 @@ static PyObject *_wrap_wxListCtrl_SetTextColour(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxListCtrl * _arg0;
     wxColour * _arg1;
     PyObject * _resultobj;
     wxListCtrl * _arg0;
     wxColour * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxListCtrl_SetTextColour",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxListCtrl_SetTextColour",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_SetTextColour. Expected _wxListCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_SetTextColour. Expected _wxListCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxColour_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxListCtrl_SetTextColour. Expected _wxColour_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxListCtrl_SetTextColour. Expected _wxColour_p.");
         return NULL;
         }


@@ -2027,13 +2164,14 @@ static PyObject *_wrap_wxListCtrl_GetTopItem(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxListCtrl * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxListCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxListCtrl_GetTopItem",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxListCtrl_GetTopItem",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetTopItem. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetTopItem. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -2055,23 +2193,25 @@ static PyObject *_wrap_wxListCtrl_HitTest(PyObject *self, PyObject *args) {
     wxPoint * _arg1;
     int * _arg2;
     int  temp;
     wxPoint * _arg1;
     int * _arg2;
     int  temp;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 {
   _arg2 = &temp;
 }
 
     self = self;
 {
   _arg2 = &temp;
 }

-    if(!PyArg_ParseTuple(args,"ss:wxListCtrl_HitTest",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxListCtrl_HitTest",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_HitTest. Expected _wxListCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_HitTest. Expected _wxListCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPoint_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxListCtrl_HitTest. Expected _wxPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxListCtrl_HitTest. Expected _wxPoint_p.");
         return NULL;
         }


@@ -2097,20 +2237,22 @@ static PyObject *_wrap_wxListCtrl_InsertColumnWith(PyObject *self, PyObject *arg
     wxListCtrl * _arg0;
     long  _arg1;
     wxListItem * _arg2;
     wxListCtrl * _arg0;
     long  _arg1;
     wxListItem * _arg2;

-    char * _argc0 = 0;
-    char * _argc2 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sls:wxListCtrl_InsertColumnWith",&_argc0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"OlO:wxListCtrl_InsertColumnWith",&_argo0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_InsertColumnWith. Expected _wxListCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_InsertColumnWith. Expected _wxListCtrl_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxListItem_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxListItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxListCtrl_InsertColumnWith. Expected _wxListItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxListCtrl_InsertColumnWith. Expected _wxListItem_p.");
         return NULL;
         }


@@ -2131,16 +2273,17 @@ static PyObject *_wrap_wxListCtrl_InsertColumn(PyObject *self, PyObject *args) {
     wxListCtrl * _arg0;
     long  _arg1;
     wxString * _arg2;
     wxListCtrl * _arg0;
     long  _arg1;
     wxString * _arg2;

-    int  _arg3 = (wxLIST_FORMAT_LEFT);
-    int  _arg4 = -1;
-    char * _argc0 = 0;
+    int  _arg3 = (int ) (wxLIST_FORMAT_LEFT);
+    int  _arg4 = (int ) -1;
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
 
     self = self;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"slO|ii:wxListCtrl_InsertColumn",&_argc0,&_arg1,&_obj2,&_arg3,&_arg4)) 
+    if(!PyArg_ParseTuple(args,"OlO|ii:wxListCtrl_InsertColumn",&_argo0,&_arg1,&_obj2,&_arg3,&_arg4)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_InsertColumn. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_InsertColumn. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -2171,20 +2314,22 @@ static PyObject *_wrap_wxListCtrl_InsertItem(PyObject *self, PyObject *args) {
     long  _result;
     wxListCtrl * _arg0;
     wxListItem * _arg1;
     long  _result;
     wxListCtrl * _arg0;
     wxListItem * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxListCtrl_InsertItem",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxListCtrl_InsertItem",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_InsertItem. Expected _wxListCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_InsertItem. Expected _wxListCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxListItem_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxListItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxListCtrl_InsertItem. Expected _wxListItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxListCtrl_InsertItem. Expected _wxListItem_p.");
         return NULL;
         }


@@ -2205,14 +2350,15 @@ static PyObject *_wrap_wxListCtrl_InsertStringItem(PyObject *self, PyObject *arg
     wxListCtrl * _arg0;
     long  _arg1;
     wxString * _arg2;
     wxListCtrl * _arg0;
     long  _arg1;
     wxString * _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
 
     self = self;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"slO:wxListCtrl_InsertStringItem",&_argc0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"OlO:wxListCtrl_InsertStringItem",&_argo0,&_arg1,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_InsertStringItem. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_InsertStringItem. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -2244,13 +2390,14 @@ static PyObject *_wrap_wxListCtrl_InsertImageItem(PyObject *self, PyObject *args
     wxListCtrl * _arg0;
     long  _arg1;
     int  _arg2;
     wxListCtrl * _arg0;
     long  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sli:wxListCtrl_InsertImageItem",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oli:wxListCtrl_InsertImageItem",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_InsertImageItem. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_InsertImageItem. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -2272,14 +2419,15 @@ static PyObject *_wrap_wxListCtrl_InsertImageStringItem(PyObject *self, PyObject
     long  _arg1;
     wxString * _arg2;
     int  _arg3;
     long  _arg1;
     wxString * _arg2;
     int  _arg3;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
 
     self = self;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"slOi:wxListCtrl_InsertImageStringItem",&_argc0,&_arg1,&_obj2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"OlOi:wxListCtrl_InsertImageStringItem",&_argo0,&_arg1,&_obj2,&_arg3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_InsertImageStringItem. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_InsertImageStringItem. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -2311,13 +2459,14 @@ static PyObject *_wrap_wxListCtrl_ScrollList(PyObject *self, PyObject *args) {
     wxListCtrl * _arg0;
     int  _arg1;
     int  _arg2;
     wxListCtrl * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxListCtrl_ScrollList",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxListCtrl_ScrollList",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_ScrollList. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_ScrollList. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -2336,20 +2485,22 @@ static PyObject *_wrap_wxListCtrl_SetBackgroundColour(PyObject *self, PyObject *
     PyObject * _resultobj;
     wxListCtrl * _arg0;
     wxColour * _arg1;
     PyObject * _resultobj;
     wxListCtrl * _arg0;
     wxColour * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxListCtrl_SetBackgroundColour",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxListCtrl_SetBackgroundColour",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_SetBackgroundColour. Expected _wxListCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_SetBackgroundColour. Expected _wxListCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxColour_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxListCtrl_SetBackgroundColour. Expected _wxColour_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxListCtrl_SetBackgroundColour. Expected _wxColour_p.");
         return NULL;
         }


@@ -2371,20 +2522,22 @@ static PyObject *_wrap_wxListCtrl_SetColumn(PyObject *self, PyObject *args) {
     wxListCtrl * _arg0;
     int  _arg1;
     wxListItem * _arg2;
     wxListCtrl * _arg0;
     int  _arg1;
     wxListItem * _arg2;

-    char * _argc0 = 0;
-    char * _argc2 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sis:wxListCtrl_SetColumn",&_argc0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"OiO:wxListCtrl_SetColumn",&_argo0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_SetColumn. Expected _wxListCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_SetColumn. Expected _wxListCtrl_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxListItem_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxListItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxListCtrl_SetColumn. Expected _wxListItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxListCtrl_SetColumn. Expected _wxListItem_p.");
         return NULL;
         }


@@ -2405,13 +2558,14 @@ static PyObject *_wrap_wxListCtrl_SetColumnWidth(PyObject *self, PyObject *args)
     wxListCtrl * _arg0;
     int  _arg1;
     int  _arg2;
     wxListCtrl * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxListCtrl_SetColumnWidth",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxListCtrl_SetColumnWidth",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_SetColumnWidth. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_SetColumnWidth. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -2431,20 +2585,22 @@ static PyObject *_wrap_wxListCtrl_SetImageList(PyObject *self, PyObject *args) {
     wxListCtrl * _arg0;
     wxImageList * _arg1;
     int  _arg2;
     wxListCtrl * _arg0;
     wxImageList * _arg1;
     int  _arg2;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ssi:wxListCtrl_SetImageList",&_argc0,&_argc1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"OOi:wxListCtrl_SetImageList",&_argo0,&_argo1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_SetImageList. Expected _wxListCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_SetImageList. Expected _wxListCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxImageList_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxImageList_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxListCtrl_SetImageList. Expected _wxImageList_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxListCtrl_SetImageList. Expected _wxImageList_p.");
         return NULL;
         }


@@ -2465,20 +2621,22 @@ static PyObject *_wrap_wxListCtrl_SetItem(PyObject *self, PyObject *args) {
     bool  _result;
     wxListCtrl * _arg0;
     wxListItem * _arg1;
     bool  _result;
     wxListCtrl * _arg0;
     wxListItem * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxListCtrl_SetItem",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxListCtrl_SetItem",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_SetItem. Expected _wxListCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_SetItem. Expected _wxListCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxListItem_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxListItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxListCtrl_SetItem. Expected _wxListItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxListCtrl_SetItem. Expected _wxListItem_p.");
         return NULL;
         }


@@ -2500,15 +2658,16 @@ static PyObject *_wrap_wxListCtrl_SetStringItem(PyObject *self, PyObject *args)
     long  _arg1;
     int  _arg2;
     wxString * _arg3;
     long  _arg1;
     int  _arg2;
     wxString * _arg3;

-    int  _arg4 = -1;
-    char * _argc0 = 0;
+    int  _arg4 = (int ) -1;
+    PyObject * _argo0 = 0;

     PyObject * _obj3 = 0;
 
     self = self;
     PyObject * _obj3 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sliO|i:wxListCtrl_SetStringItem",&_argc0,&_arg1,&_arg2,&_obj3,&_arg4)) 
+    if(!PyArg_ParseTuple(args,"OliO|i:wxListCtrl_SetStringItem",&_argo0,&_arg1,&_arg2,&_obj3,&_arg4)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_SetStringItem. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_SetStringItem. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -2540,13 +2699,14 @@ static PyObject *_wrap_wxListCtrl_SetItemData(PyObject *self, PyObject *args) {
     wxListCtrl * _arg0;
     long  _arg1;
     long  _arg2;
     wxListCtrl * _arg0;
     long  _arg1;
     long  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sll:wxListCtrl_SetItemData",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oll:wxListCtrl_SetItemData",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_SetItemData. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_SetItemData. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -2568,13 +2728,14 @@ static PyObject *_wrap_wxListCtrl_SetItemImage(PyObject *self, PyObject *args) {
     long  _arg1;
     int  _arg2;
     int  _arg3;
     long  _arg1;
     int  _arg2;
     int  _arg3;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"slii:wxListCtrl_SetItemImage",&_argc0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"Olii:wxListCtrl_SetItemImage",&_argo0,&_arg1,&_arg2,&_arg3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_SetItemImage. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_SetItemImage. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -2595,20 +2756,22 @@ static PyObject *_wrap_wxListCtrl_SetItemPosition(PyObject *self, PyObject *args
     wxListCtrl * _arg0;
     long  _arg1;
     wxPoint * _arg2;
     wxListCtrl * _arg0;
     long  _arg1;
     wxPoint * _arg2;

-    char * _argc0 = 0;
-    char * _argc2 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sls:wxListCtrl_SetItemPosition",&_argc0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"OlO:wxListCtrl_SetItemPosition",&_argo0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_SetItemPosition. Expected _wxListCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_SetItemPosition. Expected _wxListCtrl_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxListCtrl_SetItemPosition. Expected _wxPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxListCtrl_SetItemPosition. Expected _wxPoint_p.");
         return NULL;
         }


@@ -2630,13 +2793,14 @@ static PyObject *_wrap_wxListCtrl_SetItemState(PyObject *self, PyObject *args) {
     long  _arg1;
     long  _arg2;
     long  _arg3;
     long  _arg1;
     long  _arg2;
     long  _arg3;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"slll:wxListCtrl_SetItemState",&_argc0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"Olll:wxListCtrl_SetItemState",&_argo0,&_arg1,&_arg2,&_arg3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_SetItemState. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_SetItemState. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -2656,14 +2820,15 @@ static PyObject *_wrap_wxListCtrl_SetItemText(PyObject *self, PyObject *args) {
     wxListCtrl * _arg0;
     long  _arg1;
     wxString * _arg2;
     wxListCtrl * _arg0;
     long  _arg1;
     wxString * _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
 
     self = self;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"slO:wxListCtrl_SetItemText",&_argc0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"OlO:wxListCtrl_SetItemText",&_argo0,&_arg1,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_SetItemText. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_SetItemText. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -2694,15 +2859,16 @@ static PyObject *_wrap_wxListCtrl_SetSingleStyle(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxListCtrl * _arg0;
     long  _arg1;
     PyObject * _resultobj;
     wxListCtrl * _arg0;
     long  _arg1;

-    bool  _arg2 = (1);
-    char * _argc0 = 0;
-    int tempbool2;
+    bool  _arg2 = (bool ) TRUE;
+    PyObject * _argo0 = 0;
+    int tempbool2 = (int) TRUE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl|i:wxListCtrl_SetSingleStyle",&_argc0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTuple(args,"Ol|i:wxListCtrl_SetSingleStyle",&_argo0,&_arg1,&tempbool2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_SetSingleStyle. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_SetSingleStyle. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -2723,13 +2889,14 @@ static PyObject *_wrap_wxListCtrl_SetWindowStyleFlag(PyObject *self, PyObject *a
     PyObject * _resultobj;
     wxListCtrl * _arg0;
     long  _arg1;
     PyObject * _resultobj;
     wxListCtrl * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxListCtrl_SetWindowStyleFlag",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxListCtrl_SetWindowStyleFlag",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_SetWindowStyleFlag. Expected _wxListCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_SetWindowStyleFlag. Expected _wxListCtrl_p.");
         return NULL;
         }


@@ -2758,8 +2925,13 @@ static PyObject *_wrap_new_wxTreeItemId(PyObject *self, PyObject *args) {
         _result = (wxTreeItemId *)new_wxTreeItemId();
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxTreeItemId *)new_wxTreeItemId();
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxTreeItemId_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxTreeItemId_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -2767,13 +2939,14 @@ static PyObject *_wrap_new_wxTreeItemId(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxTreeItemId(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTreeItemId * _arg0;
 static PyObject *_wrap_delete_wxTreeItemId(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTreeItemId * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:delete_wxTreeItemId",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxTreeItemId",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeItemId_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxTreeItemId. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxTreeItemId. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -2793,13 +2966,14 @@ static PyObject *_wrap_wxTreeItemId_IsOk(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxTreeItemId * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxTreeItemId * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTreeItemId_IsOk",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTreeItemId_IsOk",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeItemId_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeItemId_IsOk. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeItemId_IsOk. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -2817,7 +2991,7 @@ static PyObject *_wrap_wxTreeItemId_IsOk(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_wxTreeItemData(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyTreeItemData * _result;
 static PyObject *_wrap_new_wxTreeItemData(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyTreeItemData * _result;

-    PyObject * _arg0 = NULL;
+    PyObject * _arg0 = (PyObject *) NULL;

     PyObject * _obj0 = 0;
     char _ptemp[128];
 
     PyObject * _obj0 = 0;
     char _ptemp[128];
 


@@ -2833,8 +3007,13 @@ static PyObject *_wrap_new_wxTreeItemData(PyObject *self, PyObject *args) {
         _result = (wxPyTreeItemData *)new_wxTreeItemData(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxPyTreeItemData *)new_wxTreeItemData(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyTreeItemData_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyTreeItemData_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -2843,13 +3022,14 @@ static PyObject *_wrap_wxTreeItemData_GetData(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     PyObject * _result;
     wxPyTreeItemData * _arg0;
     PyObject * _resultobj;
     PyObject * _result;
     wxPyTreeItemData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTreeItemData_GetData",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTreeItemData_GetData",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyTreeItemData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyTreeItemData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeItemData_GetData. Expected _wxPyTreeItemData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeItemData_GetData. Expected _wxPyTreeItemData_p.");
         return NULL;
         }


@@ -2870,14 +3050,15 @@ static PyObject *_wrap_wxTreeItemData_SetData(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyTreeItemData * _arg0;
     PyObject * _arg1;
     PyObject * _resultobj;
     wxPyTreeItemData * _arg0;
     PyObject * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxTreeItemData_SetData",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTreeItemData_SetData",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyTreeItemData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyTreeItemData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeItemData_SetData. Expected _wxPyTreeItemData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeItemData_SetData. Expected _wxPyTreeItemData_p.");
         return NULL;
         }


@@ -2900,14 +3081,15 @@ static PyObject *_wrap_wxTreeItemData_GetId(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTreeItemId * _result;
     wxPyTreeItemData * _arg0;
     PyObject * _resultobj;
     wxTreeItemId * _result;
     wxPyTreeItemData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTreeItemData_GetId",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTreeItemData_GetId",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyTreeItemData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyTreeItemData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeItemData_GetId. Expected _wxPyTreeItemData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeItemData_GetId. Expected _wxPyTreeItemData_p.");
         return NULL;
         }


@@ -2918,8 +3100,13 @@ static PyObject *_wrap_wxTreeItemData_GetId(PyObject *self, PyObject *args) {
     _result = (wxTreeItemId *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxTreeItemId *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxTreeItemId_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxTreeItemId_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -2928,20 +3115,22 @@ static PyObject *_wrap_wxTreeItemData_SetId(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyTreeItemData * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _resultobj;
     wxPyTreeItemData * _arg0;
     wxTreeItemId * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxTreeItemData_SetId",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTreeItemData_SetId",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyTreeItemData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyTreeItemData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeItemData_SetId. Expected _wxPyTreeItemData_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeItemData_SetId. Expected _wxPyTreeItemData_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeItemData_SetId. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeItemData_SetId. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -2985,14 +3174,15 @@ static PyObject *_wrap_wxTreeEvent_GetItem(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTreeItemId * _result;
     wxTreeEvent * _arg0;
     PyObject * _resultobj;
     wxTreeItemId * _result;
     wxTreeEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTreeEvent_GetItem",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTreeEvent_GetItem",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeEvent_GetItem. Expected _wxTreeEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeEvent_GetItem. Expected _wxTreeEvent_p.");
         return NULL;
         }


@@ -3012,14 +3202,15 @@ static PyObject *_wrap_wxTreeEvent_GetOldItem(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTreeItemId * _result;
     wxTreeEvent * _arg0;
     PyObject * _resultobj;
     wxTreeItemId * _result;
     wxTreeEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTreeEvent_GetOldItem",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTreeEvent_GetOldItem",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeEvent_GetOldItem. Expected _wxTreeEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeEvent_GetOldItem. Expected _wxTreeEvent_p.");
         return NULL;
         }


@@ -3039,14 +3230,15 @@ static PyObject *_wrap_wxTreeEvent_GetPoint(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPoint * _result;
     wxTreeEvent * _arg0;
     PyObject * _resultobj;
     wxPoint * _result;
     wxTreeEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTreeEvent_GetPoint",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTreeEvent_GetPoint",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeEvent_GetPoint. Expected _wxTreeEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeEvent_GetPoint. Expected _wxTreeEvent_p.");
         return NULL;
         }


@@ -3066,13 +3258,14 @@ static PyObject *_wrap_wxTreeEvent_GetCode(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxTreeEvent * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxTreeEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTreeEvent_GetCode",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTreeEvent_GetCode",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeEvent_GetCode. Expected _wxTreeEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeEvent_GetCode. Expected _wxTreeEvent_p.");
         return NULL;
         }


@@ -3091,13 +3284,14 @@ static PyObject *_wrap_wxTreeEvent_GetLabel(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxTreeEvent * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxTreeEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTreeEvent_GetLabel",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTreeEvent_GetLabel",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeEvent_GetLabel. Expected _wxTreeEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeEvent_GetLabel. Expected _wxTreeEvent_p.");
         return NULL;
         }


@@ -3143,41 +3337,45 @@ static PyObject *_wrap_new_wxTreeCtrl(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTreeCtrl * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxTreeCtrl * _result;
     wxWindow * _arg0;

-    wxWindowID  _arg1 = -1;
-    wxPoint * _arg2 = &wxPyDefaultPosition;
-    wxSize * _arg3 = &wxPyDefaultSize;
-    long  _arg4 = (wxTR_HAS_BUTTONS)|(wxTR_LINES_AT_ROOT);
-    wxValidator * _arg5 = &wxPyDefaultValidator;
-    char * _arg6 = "wxTreeCtrl";
-    char * _argc0 = 0;
-    char * _argc2 = 0;
-    char * _argc3 = 0;
-    char * _argc5 = 0;
+    wxWindowID  _arg1 = (wxWindowID ) -1;
+    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    long  _arg4 = (long ) wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT;
+    wxValidator * _arg5 = (wxValidator *) &wxPyDefaultValidator;
+    char * _arg6 = (char *) "wxTreeCtrl";
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;
+    PyObject * _argo3 = 0;
+    PyObject * _argo5 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|isslss:new_wxTreeCtrl",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_argc5,&_arg6)) 
+    if(!PyArg_ParseTuple(args,"O|iOOlOs:new_wxTreeCtrl",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_argo5,&_arg6)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxTreeCtrl. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxTreeCtrl. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxTreeCtrl. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxTreeCtrl. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxSize_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxTreeCtrl. Expected _wxSize_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxTreeCtrl. Expected _wxSize_p.");
         return NULL;
         }
     }

-    if (_argc5) {
-        if (SWIG_GetPtr(_argc5,(void **) &_arg5,"_wxValidator_p")) {
+    if (_argo5) {
+        if (_argo5 == Py_None) { _arg5 = NULL; }
+        else if (SWIG_GetPtrObj(_argo5,(void **) &_arg5,"_wxValidator_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of new_wxTreeCtrl. Expected _wxValidator_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of new_wxTreeCtrl. Expected _wxValidator_p.");
         return NULL;
         }


@@ -3187,8 +3385,13 @@ static PyObject *_wrap_new_wxTreeCtrl(PyObject *self, PyObject *args) {
         _result = (wxTreeCtrl *)new_wxTreeCtrl(_arg0,_arg1,*_arg2,*_arg3,_arg4,*_arg5,_arg6);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxTreeCtrl *)new_wxTreeCtrl(_arg0,_arg1,*_arg2,*_arg3,_arg4,*_arg5,_arg6);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxTreeCtrl_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxTreeCtrl_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3197,13 +3400,14 @@ static PyObject *_wrap_wxTreeCtrl_GetCount(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     size_t  _result;
     wxTreeCtrl * _arg0;
     PyObject * _resultobj;
     size_t  _result;
     wxTreeCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTreeCtrl_GetCount",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTreeCtrl_GetCount",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetCount. Expected _wxTreeCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetCount. Expected _wxTreeCtrl_p.");
         return NULL;
         }


@@ -3222,13 +3426,14 @@ static PyObject *_wrap_wxTreeCtrl_GetIndent(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     unsigned int  _result;
     wxTreeCtrl * _arg0;
     PyObject * _resultobj;
     unsigned int  _result;
     wxTreeCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTreeCtrl_GetIndent",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTreeCtrl_GetIndent",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetIndent. Expected _wxTreeCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetIndent. Expected _wxTreeCtrl_p.");
         return NULL;
         }


@@ -3247,13 +3452,14 @@ static PyObject *_wrap_wxTreeCtrl_SetIndent(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     unsigned int  _arg1;
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     unsigned int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxTreeCtrl_SetIndent",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxTreeCtrl_SetIndent",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetIndent. Expected _wxTreeCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetIndent. Expected _wxTreeCtrl_p.");
         return NULL;
         }


@@ -3273,14 +3479,15 @@ static PyObject *_wrap_wxTreeCtrl_GetImageList(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxImageList * _result;
     wxTreeCtrl * _arg0;
     PyObject * _resultobj;
     wxImageList * _result;
     wxTreeCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTreeCtrl_GetImageList",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTreeCtrl_GetImageList",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetImageList. Expected _wxTreeCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetImageList. Expected _wxTreeCtrl_p.");
         return NULL;
         }


@@ -3290,8 +3497,13 @@ static PyObject *_wrap_wxTreeCtrl_GetImageList(PyObject *self, PyObject *args) {
         _result = (wxImageList *)wxTreeCtrl_GetImageList(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxImageList *)wxTreeCtrl_GetImageList(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxImageList_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxImageList_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3300,14 +3512,15 @@ static PyObject *_wrap_wxTreeCtrl_GetStateImageList(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     wxImageList * _result;
     wxTreeCtrl * _arg0;
     PyObject * _resultobj;
     wxImageList * _result;
     wxTreeCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTreeCtrl_GetStateImageList",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTreeCtrl_GetStateImageList",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetStateImageList. Expected _wxTreeCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetStateImageList. Expected _wxTreeCtrl_p.");
         return NULL;
         }


@@ -3317,8 +3530,13 @@ static PyObject *_wrap_wxTreeCtrl_GetStateImageList(PyObject *self, PyObject *ar
         _result = (wxImageList *)wxTreeCtrl_GetStateImageList(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxImageList *)wxTreeCtrl_GetStateImageList(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxImageList_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxImageList_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3327,20 +3545,22 @@ static PyObject *_wrap_wxTreeCtrl_SetImageList(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxImageList * _arg1;
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxImageList * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_SetImageList",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_SetImageList",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetImageList. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetImageList. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxImageList_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxImageList_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SetImageList. Expected _wxImageList_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SetImageList. Expected _wxImageList_p.");
         return NULL;
         }


@@ -3360,20 +3580,22 @@ static PyObject *_wrap_wxTreeCtrl_SetStateImageList(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxImageList * _arg1;
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxImageList * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_SetStateImageList",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_SetStateImageList",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetStateImageList. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetStateImageList. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxImageList_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxImageList_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SetStateImageList. Expected _wxImageList_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SetStateImageList. Expected _wxImageList_p.");
         return NULL;
         }


@@ -3394,20 +3616,22 @@ static PyObject *_wrap_wxTreeCtrl_GetItemText(PyObject *self, PyObject *args) {
     wxString * _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     wxString * _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_GetItemText",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_GetItemText",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetItemText. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetItemText. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetItemText. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetItemText. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -3432,20 +3656,22 @@ static PyObject *_wrap_wxTreeCtrl_GetItemImage(PyObject *self, PyObject *args) {
     int  _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     int  _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_GetItemImage",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_GetItemImage",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetItemImage. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetItemImage. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetItemImage. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetItemImage. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -3465,20 +3691,22 @@ static PyObject *_wrap_wxTreeCtrl_GetItemSelectedImage(PyObject *self, PyObject
     int  _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     int  _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_GetItemSelectedImage",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_GetItemSelectedImage",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetItemSelectedImage. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetItemSelectedImage. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetItemSelectedImage. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetItemSelectedImage. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -3498,21 +3726,23 @@ static PyObject *_wrap_wxTreeCtrl_SetItemText(PyObject *self, PyObject *args) {
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     wxString * _arg2;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     wxString * _arg2;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     PyObject * _obj2 = 0;
 
     self = self;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ssO:wxTreeCtrl_SetItemText",&_argc0,&_argc1,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"OOO:wxTreeCtrl_SetItemText",&_argo0,&_argo1,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetItemText. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetItemText. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SetItemText. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SetItemText. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -3544,20 +3774,22 @@ static PyObject *_wrap_wxTreeCtrl_SetItemImage(PyObject *self, PyObject *args) {
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     int  _arg2;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     int  _arg2;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ssi:wxTreeCtrl_SetItemImage",&_argc0,&_argc1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"OOi:wxTreeCtrl_SetItemImage",&_argo0,&_argo1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetItemImage. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetItemImage. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SetItemImage. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SetItemImage. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -3578,20 +3810,22 @@ static PyObject *_wrap_wxTreeCtrl_SetItemSelectedImage(PyObject *self, PyObject
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     int  _arg2;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     int  _arg2;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ssi:wxTreeCtrl_SetItemSelectedImage",&_argc0,&_argc1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"OOi:wxTreeCtrl_SetItemSelectedImage",&_argo0,&_argo1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetItemSelectedImage. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetItemSelectedImage. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SetItemSelectedImage. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SetItemSelectedImage. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -3611,22 +3845,24 @@ static PyObject *_wrap_wxTreeCtrl_SetItemHasChildren(PyObject *self, PyObject *a
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;

-    bool  _arg2 = (1);
-    char * _argc0 = 0;
-    char * _argc1 = 0;
-    int tempbool2;
+    bool  _arg2 = (bool ) TRUE;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    int tempbool2 = (int) TRUE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss|i:wxTreeCtrl_SetItemHasChildren",&_argc0,&_argc1,&tempbool2)) 
+    if(!PyArg_ParseTuple(args,"OO|i:wxTreeCtrl_SetItemHasChildren",&_argo0,&_argo1,&tempbool2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetItemHasChildren. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetItemHasChildren. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SetItemHasChildren. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SetItemHasChildren. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -3655,21 +3891,23 @@ static PyObject *_wrap_wxTreeCtrl_GetItemData(PyObject *self, PyObject *args) {
     wxPyTreeItemData * _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     wxPyTreeItemData * _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_GetItemData",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_GetItemData",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetItemData. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetItemData. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetItemData. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetItemData. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -3679,8 +3917,13 @@ static PyObject *_wrap_wxTreeCtrl_GetItemData(PyObject *self, PyObject *args) {
         _result = (wxPyTreeItemData *)wxTreeCtrl_GetItemData(_arg0,*_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxPyTreeItemData *)wxTreeCtrl_GetItemData(_arg0,*_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyTreeItemData_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyTreeItemData_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3692,27 +3935,30 @@ static PyObject *_wrap_wxTreeCtrl_SetItemData(PyObject *self, PyObject *args) {
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     wxPyTreeItemData * _arg2;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     wxPyTreeItemData * _arg2;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
-    char * _argc2 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sss:wxTreeCtrl_SetItemData",&_argc0,&_argc1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"OOO:wxTreeCtrl_SetItemData",&_argo0,&_argo1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetItemData. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetItemData. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SetItemData. Expected _wxTreeItemId_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SetItemData. Expected _wxTreeItemId_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPyTreeItemData_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPyTreeItemData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxTreeCtrl_SetItemData. Expected _wxPyTreeItemData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxTreeCtrl_SetItemData. Expected _wxPyTreeItemData_p.");
         return NULL;
         }


@@ -3740,20 +3986,22 @@ static PyObject *_wrap_wxTreeCtrl_GetPyData(PyObject *self, PyObject *args) {
     PyObject * _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_GetPyData",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_GetPyData",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetPyData. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetPyData. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetPyData. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetPyData. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -3782,21 +4030,23 @@ static PyObject *_wrap_wxTreeCtrl_SetPyData(PyObject *self, PyObject *args) {
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _arg2;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _arg2;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     PyObject * _obj2 = 0;
 
     self = self;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ssO:wxTreeCtrl_SetPyData",&_argc0,&_argc1,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"OOO:wxTreeCtrl_SetPyData",&_argo0,&_argo1,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetPyData. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetPyData. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SetPyData. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SetPyData. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -3820,20 +4070,22 @@ static PyObject *_wrap_wxTreeCtrl_IsVisible(PyObject *self, PyObject *args) {
     bool  _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     bool  _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_IsVisible",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_IsVisible",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_IsVisible. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_IsVisible. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_IsVisible. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_IsVisible. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -3853,20 +4105,22 @@ static PyObject *_wrap_wxTreeCtrl_ItemHasChildren(PyObject *self, PyObject *args
     bool  _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     bool  _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_ItemHasChildren",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_ItemHasChildren",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_ItemHasChildren. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_ItemHasChildren. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_ItemHasChildren. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_ItemHasChildren. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -3886,20 +4140,22 @@ static PyObject *_wrap_wxTreeCtrl_IsExpanded(PyObject *self, PyObject *args) {
     bool  _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     bool  _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_IsExpanded",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_IsExpanded",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_IsExpanded. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_IsExpanded. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_IsExpanded. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_IsExpanded. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -3919,20 +4175,22 @@ static PyObject *_wrap_wxTreeCtrl_IsSelected(PyObject *self, PyObject *args) {
     bool  _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     bool  _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_IsSelected",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_IsSelected",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_IsSelected. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_IsSelected. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_IsSelected. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_IsSelected. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -3951,14 +4209,15 @@ static PyObject *_wrap_wxTreeCtrl_GetRootItem(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;
     PyObject * _resultobj;
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTreeCtrl_GetRootItem",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTreeCtrl_GetRootItem",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetRootItem. Expected _wxTreeCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetRootItem. Expected _wxTreeCtrl_p.");
         return NULL;
         }


@@ -3978,14 +4237,15 @@ static PyObject *_wrap_wxTreeCtrl_GetSelection(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;
     PyObject * _resultobj;
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTreeCtrl_GetSelection",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTreeCtrl_GetSelection",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetSelection. Expected _wxTreeCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetSelection. Expected _wxTreeCtrl_p.");
         return NULL;
         }


@@ -4006,21 +4266,23 @@ static PyObject *_wrap_wxTreeCtrl_GetParent(PyObject *self, PyObject *args) {
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_GetParent",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_GetParent",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetParent. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetParent. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetParent. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetParent. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -4041,22 +4303,24 @@ static PyObject *_wrap_wxTreeCtrl_GetChildrenCount(PyObject *self, PyObject *arg
     size_t  _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     size_t  _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;

-    bool  _arg2 = (1);
-    char * _argc0 = 0;
-    char * _argc1 = 0;
-    int tempbool2;
+    bool  _arg2 = (bool ) TRUE;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    int tempbool2 = (int) TRUE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss|i:wxTreeCtrl_GetChildrenCount",&_argc0,&_argc1,&tempbool2)) 
+    if(!PyArg_ParseTuple(args,"OO|i:wxTreeCtrl_GetChildrenCount",&_argo0,&_argo1,&tempbool2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetChildrenCount. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetChildrenCount. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetChildrenCount. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetChildrenCount. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -4078,23 +4342,25 @@ static PyObject *_wrap_wxTreeCtrl_GetFirstChild(PyObject *self, PyObject *args)
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     long * _arg2;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     long * _arg2;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     long  temp;
     PyObject * _obj2 = 0;
     char _ptemp[128];
 
     self = self;
     long  temp;
     PyObject * _obj2 = 0;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ssO:wxTreeCtrl_GetFirstChild",&_argc0,&_argc1,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"OOO:wxTreeCtrl_GetFirstChild",&_argo0,&_argo1,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetFirstChild. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetFirstChild. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetFirstChild. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetFirstChild. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -4125,23 +4391,25 @@ static PyObject *_wrap_wxTreeCtrl_GetNextChild(PyObject *self, PyObject *args) {
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     long * _arg2;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     long * _arg2;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     long  temp;
     PyObject * _obj2 = 0;
     char _ptemp[128];
 
     self = self;
     long  temp;
     PyObject * _obj2 = 0;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ssO:wxTreeCtrl_GetNextChild",&_argc0,&_argc1,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"OOO:wxTreeCtrl_GetNextChild",&_argo0,&_argo1,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetNextChild. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetNextChild. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetNextChild. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetNextChild. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -4171,21 +4439,23 @@ static PyObject *_wrap_wxTreeCtrl_GetNextSibling(PyObject *self, PyObject *args)
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_GetNextSibling",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_GetNextSibling",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetNextSibling. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetNextSibling. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetNextSibling. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetNextSibling. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -4206,21 +4476,23 @@ static PyObject *_wrap_wxTreeCtrl_GetPrevSibling(PyObject *self, PyObject *args)
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_GetPrevSibling",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_GetPrevSibling",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetPrevSibling. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetPrevSibling. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetPrevSibling. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetPrevSibling. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -4240,14 +4512,15 @@ static PyObject *_wrap_wxTreeCtrl_GetFirstVisibleItem(PyObject *self, PyObject *
     PyObject * _resultobj;
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;
     PyObject * _resultobj;
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTreeCtrl_GetFirstVisibleItem",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTreeCtrl_GetFirstVisibleItem",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetFirstVisibleItem. Expected _wxTreeCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetFirstVisibleItem. Expected _wxTreeCtrl_p.");
         return NULL;
         }


@@ -4268,21 +4541,23 @@ static PyObject *_wrap_wxTreeCtrl_GetNextVisible(PyObject *self, PyObject *args)
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_GetNextVisible",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_GetNextVisible",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetNextVisible. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetNextVisible. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetNextVisible. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetNextVisible. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -4303,21 +4578,23 @@ static PyObject *_wrap_wxTreeCtrl_GetPrevVisible(PyObject *self, PyObject *args)
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_GetPrevVisible",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_GetPrevVisible",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetPrevVisible. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetPrevVisible. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetPrevVisible. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetPrevVisible. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -4338,19 +4615,20 @@ static PyObject *_wrap_wxTreeCtrl_AddRoot(PyObject *self, PyObject *args) {
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;
     wxString * _arg1;
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;
     wxString * _arg1;

-    int  _arg2 = -1;
-    int  _arg3 = -1;
-    wxPyTreeItemData * _arg4 = NULL;
-    char * _argc0 = 0;
+    int  _arg2 = (int ) -1;
+    int  _arg3 = (int ) -1;
+    wxPyTreeItemData * _arg4 = (wxPyTreeItemData *) NULL;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
     PyObject * _obj1 = 0;

-    char * _argc4 = 0;
+    PyObject * _argo4 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO|iis:wxTreeCtrl_AddRoot",&_argc0,&_obj1,&_arg2,&_arg3,&_argc4)) 
+    if(!PyArg_ParseTuple(args,"OO|iiO:wxTreeCtrl_AddRoot",&_argo0,&_obj1,&_arg2,&_arg3,&_argo4)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_AddRoot. Expected _wxTreeCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_AddRoot. Expected _wxTreeCtrl_p.");
         return NULL;
         }


@@ -4362,8 +4640,9 @@ static PyObject *_wrap_wxTreeCtrl_AddRoot(PyObject *self, PyObject *args) {
     }
     _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }
     }
     _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }

-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_wxPyTreeItemData_p")) {
+    if (_argo4) {
+        if (_argo4 == Py_None) { _arg4 = NULL; }
+        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxPyTreeItemData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of wxTreeCtrl_AddRoot. Expected _wxPyTreeItemData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of wxTreeCtrl_AddRoot. Expected _wxPyTreeItemData_p.");
         return NULL;
         }


@@ -4389,26 +4668,28 @@ static PyObject *_wrap_wxTreeCtrl_PrependItem(PyObject *self, PyObject *args) {
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     wxString * _arg2;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     wxString * _arg2;

-    int  _arg3 = -1;
-    int  _arg4 = -1;
-    wxPyTreeItemData * _arg5 = NULL;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    int  _arg3 = (int ) -1;
+    int  _arg4 = (int ) -1;
+    wxPyTreeItemData * _arg5 = (wxPyTreeItemData *) NULL;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     PyObject * _obj2 = 0;
     PyObject * _obj2 = 0;

-    char * _argc5 = 0;
+    PyObject * _argo5 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ssO|iis:wxTreeCtrl_PrependItem",&_argc0,&_argc1,&_obj2,&_arg3,&_arg4,&_argc5)) 
+    if(!PyArg_ParseTuple(args,"OOO|iiO:wxTreeCtrl_PrependItem",&_argo0,&_argo1,&_obj2,&_arg3,&_arg4,&_argo5)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_PrependItem. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_PrependItem. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_PrependItem. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_PrependItem. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -4420,8 +4701,9 @@ static PyObject *_wrap_wxTreeCtrl_PrependItem(PyObject *self, PyObject *args) {
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }

-    if (_argc5) {
-        if (SWIG_GetPtr(_argc5,(void **) &_arg5,"_wxPyTreeItemData_p")) {
+    if (_argo5) {
+        if (_argo5 == Py_None) { _arg5 = NULL; }
+        else if (SWIG_GetPtrObj(_argo5,(void **) &_arg5,"_wxPyTreeItemData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of wxTreeCtrl_PrependItem. Expected _wxPyTreeItemData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of wxTreeCtrl_PrependItem. Expected _wxPyTreeItemData_p.");
         return NULL;
         }


@@ -4448,33 +4730,36 @@ static PyObject *_wrap_wxTreeCtrl_InsertItem(PyObject *self, PyObject *args) {
     wxTreeItemId * _arg1;
     wxTreeItemId * _arg2;
     wxString * _arg3;
     wxTreeItemId * _arg1;
     wxTreeItemId * _arg2;
     wxString * _arg3;

-    int  _arg4 = -1;
-    int  _arg5 = -1;
-    wxPyTreeItemData * _arg6 = NULL;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
-    char * _argc2 = 0;
+    int  _arg4 = (int ) -1;
+    int  _arg5 = (int ) -1;
+    wxPyTreeItemData * _arg6 = (wxPyTreeItemData *) NULL;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    PyObject * _argo2 = 0;

     PyObject * _obj3 = 0;
     PyObject * _obj3 = 0;

-    char * _argc6 = 0;
+    PyObject * _argo6 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sssO|iis:wxTreeCtrl_InsertItem",&_argc0,&_argc1,&_argc2,&_obj3,&_arg4,&_arg5,&_argc6)) 
+    if(!PyArg_ParseTuple(args,"OOOO|iiO:wxTreeCtrl_InsertItem",&_argo0,&_argo1,&_argo2,&_obj3,&_arg4,&_arg5,&_argo6)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_InsertItem. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_InsertItem. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_InsertItem. Expected _wxTreeItemId_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_InsertItem. Expected _wxTreeItemId_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxTreeItemId_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxTreeCtrl_InsertItem. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxTreeCtrl_InsertItem. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -4486,8 +4771,9 @@ static PyObject *_wrap_wxTreeCtrl_InsertItem(PyObject *self, PyObject *args) {
     }
     _arg3 = new wxString(PyString_AsString(_obj3), PyString_Size(_obj3));
 }
     }
     _arg3 = new wxString(PyString_AsString(_obj3), PyString_Size(_obj3));
 }

-    if (_argc6) {
-        if (SWIG_GetPtr(_argc6,(void **) &_arg6,"_wxPyTreeItemData_p")) {
+    if (_argo6) {
+        if (_argo6 == Py_None) { _arg6 = NULL; }
+        else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxPyTreeItemData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of wxTreeCtrl_InsertItem. Expected _wxPyTreeItemData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of wxTreeCtrl_InsertItem. Expected _wxPyTreeItemData_p.");
         return NULL;
         }


@@ -4513,26 +4799,28 @@ static PyObject *_wrap_wxTreeCtrl_AppendItem(PyObject *self, PyObject *args) {
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     wxString * _arg2;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     wxString * _arg2;

-    int  _arg3 = -1;
-    int  _arg4 = -1;
-    wxPyTreeItemData * _arg5 = NULL;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    int  _arg3 = (int ) -1;
+    int  _arg4 = (int ) -1;
+    wxPyTreeItemData * _arg5 = (wxPyTreeItemData *) NULL;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     PyObject * _obj2 = 0;
     PyObject * _obj2 = 0;

-    char * _argc5 = 0;
+    PyObject * _argo5 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ssO|iis:wxTreeCtrl_AppendItem",&_argc0,&_argc1,&_obj2,&_arg3,&_arg4,&_argc5)) 
+    if(!PyArg_ParseTuple(args,"OOO|iiO:wxTreeCtrl_AppendItem",&_argo0,&_argo1,&_obj2,&_arg3,&_arg4,&_argo5)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_AppendItem. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_AppendItem. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_AppendItem. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_AppendItem. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -4544,8 +4832,9 @@ static PyObject *_wrap_wxTreeCtrl_AppendItem(PyObject *self, PyObject *args) {
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }

-    if (_argc5) {
-        if (SWIG_GetPtr(_argc5,(void **) &_arg5,"_wxPyTreeItemData_p")) {
+    if (_argo5) {
+        if (_argo5 == Py_None) { _arg5 = NULL; }
+        else if (SWIG_GetPtrObj(_argo5,(void **) &_arg5,"_wxPyTreeItemData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of wxTreeCtrl_AppendItem. Expected _wxPyTreeItemData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of wxTreeCtrl_AppendItem. Expected _wxPyTreeItemData_p.");
         return NULL;
         }


@@ -4569,20 +4858,22 @@ static PyObject *_wrap_wxTreeCtrl_Delete(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_Delete",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_Delete",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_Delete. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_Delete. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_Delete. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_Delete. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -4602,20 +4893,22 @@ static PyObject *_wrap_wxTreeCtrl_DeleteChildren(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_DeleteChildren",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_DeleteChildren",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_DeleteChildren. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_DeleteChildren. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_DeleteChildren. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_DeleteChildren. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -4634,13 +4927,14 @@ static PyObject *_wrap_wxTreeCtrl_DeleteChildren(PyObject *self, PyObject *args)
 static PyObject *_wrap_wxTreeCtrl_DeleteAllItems(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
 static PyObject *_wrap_wxTreeCtrl_DeleteAllItems(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTreeCtrl_DeleteAllItems",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTreeCtrl_DeleteAllItems",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_DeleteAllItems. Expected _wxTreeCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_DeleteAllItems. Expected _wxTreeCtrl_p.");
         return NULL;
         }


@@ -4660,20 +4954,22 @@ static PyObject *_wrap_wxTreeCtrl_Expand(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_Expand",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_Expand",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_Expand. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_Expand. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_Expand. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_Expand. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -4693,20 +4989,22 @@ static PyObject *_wrap_wxTreeCtrl_Collapse(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_Collapse",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_Collapse",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_Collapse. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_Collapse. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_Collapse. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_Collapse. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -4726,20 +5024,22 @@ static PyObject *_wrap_wxTreeCtrl_CollapseAndReset(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_CollapseAndReset",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_CollapseAndReset",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_CollapseAndReset. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_CollapseAndReset. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_CollapseAndReset. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_CollapseAndReset. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -4759,20 +5059,22 @@ static PyObject *_wrap_wxTreeCtrl_Toggle(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_Toggle",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_Toggle",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_Toggle. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_Toggle. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_Toggle. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_Toggle. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -4791,13 +5093,14 @@ static PyObject *_wrap_wxTreeCtrl_Toggle(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxTreeCtrl_Unselect(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
 static PyObject *_wrap_wxTreeCtrl_Unselect(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTreeCtrl_Unselect",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTreeCtrl_Unselect",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_Unselect. Expected _wxTreeCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_Unselect. Expected _wxTreeCtrl_p.");
         return NULL;
         }


@@ -4816,13 +5119,14 @@ static PyObject *_wrap_wxTreeCtrl_Unselect(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxTreeCtrl_UnselectAll(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
 static PyObject *_wrap_wxTreeCtrl_UnselectAll(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTreeCtrl_UnselectAll",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTreeCtrl_UnselectAll",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_UnselectAll. Expected _wxTreeCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_UnselectAll. Expected _wxTreeCtrl_p.");
         return NULL;
         }


@@ -4842,20 +5146,22 @@ static PyObject *_wrap_wxTreeCtrl_SelectItem(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_SelectItem",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_SelectItem",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SelectItem. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SelectItem. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SelectItem. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SelectItem. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -4875,20 +5181,22 @@ static PyObject *_wrap_wxTreeCtrl_EnsureVisible(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_EnsureVisible",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_EnsureVisible",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_EnsureVisible. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_EnsureVisible. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_EnsureVisible. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_EnsureVisible. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -4908,20 +5216,22 @@ static PyObject *_wrap_wxTreeCtrl_ScrollTo(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_ScrollTo",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_ScrollTo",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_ScrollTo. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_ScrollTo. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_ScrollTo. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_ScrollTo. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -4942,21 +5252,23 @@ static PyObject *_wrap_wxTreeCtrl_EditLabel(PyObject *self, PyObject *args) {
     wxTextCtrl * _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     wxTextCtrl * _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_EditLabel",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_EditLabel",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_EditLabel. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_EditLabel. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_EditLabel. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_EditLabel. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -4966,8 +5278,13 @@ static PyObject *_wrap_wxTreeCtrl_EditLabel(PyObject *self, PyObject *args) {
         _result = (wxTextCtrl *)wxTreeCtrl_EditLabel(_arg0,*_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxTextCtrl *)wxTreeCtrl_EditLabel(_arg0,*_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxTextCtrl_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxTextCtrl_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -4976,14 +5293,15 @@ static PyObject *_wrap_wxTreeCtrl_GetEditControl(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxTextCtrl * _result;
     wxTreeCtrl * _arg0;
     PyObject * _resultobj;
     wxTextCtrl * _result;
     wxTreeCtrl * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTreeCtrl_GetEditControl",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTreeCtrl_GetEditControl",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetEditControl. Expected _wxTreeCtrl_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetEditControl. Expected _wxTreeCtrl_p.");
         return NULL;
         }


@@ -4993,8 +5311,13 @@ static PyObject *_wrap_wxTreeCtrl_GetEditControl(PyObject *self, PyObject *args)
         _result = (wxTextCtrl *)wxTreeCtrl_GetEditControl(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxTextCtrl *)wxTreeCtrl_GetEditControl(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxTextCtrl_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxTextCtrl_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -5003,22 +5326,24 @@ static PyObject *_wrap_wxTreeCtrl_EndEditLabel(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;

-    bool  _arg2 = (0);
-    char * _argc0 = 0;
-    char * _argc1 = 0;
-    int tempbool2;
+    bool  _arg2 = (bool ) FALSE;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    int tempbool2 = (int) FALSE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss|i:wxTreeCtrl_EndEditLabel",&_argc0,&_argc1,&tempbool2)) 
+    if(!PyArg_ParseTuple(args,"OO|i:wxTreeCtrl_EndEditLabel",&_argo0,&_argo1,&tempbool2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_EndEditLabel. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_EndEditLabel. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_EndEditLabel. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_EndEditLabel. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -5039,22 +5364,24 @@ static PyObject *_wrap_wxTreeCtrl_SetItemBold(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;

-    bool  _arg2 = (1);
-    char * _argc0 = 0;
-    char * _argc1 = 0;
-    int tempbool2;
+    bool  _arg2 = (bool ) TRUE;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    int tempbool2 = (int) TRUE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss|i:wxTreeCtrl_SetItemBold",&_argc0,&_argc1,&tempbool2)) 
+    if(!PyArg_ParseTuple(args,"OO|i:wxTreeCtrl_SetItemBold",&_argo0,&_argo1,&tempbool2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetItemBold. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetItemBold. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SetItemBold. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SetItemBold. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -5076,20 +5403,22 @@ static PyObject *_wrap_wxTreeCtrl_IsBold(PyObject *self, PyObject *args) {
     bool  _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     bool  _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_IsBold",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_IsBold",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_IsBold. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_IsBold. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_IsBold. Expected _wxTreeItemId_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_IsBold. Expected _wxTreeItemId_p.");
         return NULL;
         }


@@ -5109,21 +5438,23 @@ static PyObject *_wrap_wxTreeCtrl_HitTest(PyObject *self, PyObject *args) {
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;
     wxPoint * _arg1;
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;
     wxPoint * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_HitTest",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_HitTest",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_HitTest. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_HitTest. Expected _wxTreeCtrl_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPoint_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_HitTest. Expected _wxPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_HitTest. Expected _wxPoint_p.");
         return NULL;
         }


@@ -5139,170 +5470,463 @@ static PyObject *_wrap_wxTreeCtrl_HitTest(PyObject *self, PyObject *args) {
 }
 
 static PyMethodDef controls2cMethods[] = {
 }
 
 static PyMethodDef controls2cMethods[] = {

-        { "wxTreeCtrl_HitTest", _wrap_wxTreeCtrl_HitTest, 1 },
-        { "wxTreeCtrl_IsBold", _wrap_wxTreeCtrl_IsBold, 1 },
-        { "wxTreeCtrl_SetItemBold", _wrap_wxTreeCtrl_SetItemBold, 1 },
-        { "wxTreeCtrl_EndEditLabel", _wrap_wxTreeCtrl_EndEditLabel, 1 },
-        { "wxTreeCtrl_GetEditControl", _wrap_wxTreeCtrl_GetEditControl, 1 },
-        { "wxTreeCtrl_EditLabel", _wrap_wxTreeCtrl_EditLabel, 1 },
-        { "wxTreeCtrl_ScrollTo", _wrap_wxTreeCtrl_ScrollTo, 1 },
-        { "wxTreeCtrl_EnsureVisible", _wrap_wxTreeCtrl_EnsureVisible, 1 },
-        { "wxTreeCtrl_SelectItem", _wrap_wxTreeCtrl_SelectItem, 1 },
-        { "wxTreeCtrl_UnselectAll", _wrap_wxTreeCtrl_UnselectAll, 1 },
-        { "wxTreeCtrl_Unselect", _wrap_wxTreeCtrl_Unselect, 1 },
-        { "wxTreeCtrl_Toggle", _wrap_wxTreeCtrl_Toggle, 1 },
-        { "wxTreeCtrl_CollapseAndReset", _wrap_wxTreeCtrl_CollapseAndReset, 1 },
-        { "wxTreeCtrl_Collapse", _wrap_wxTreeCtrl_Collapse, 1 },
-        { "wxTreeCtrl_Expand", _wrap_wxTreeCtrl_Expand, 1 },
-        { "wxTreeCtrl_DeleteAllItems", _wrap_wxTreeCtrl_DeleteAllItems, 1 },
-        { "wxTreeCtrl_DeleteChildren", _wrap_wxTreeCtrl_DeleteChildren, 1 },
-        { "wxTreeCtrl_Delete", _wrap_wxTreeCtrl_Delete, 1 },
-        { "wxTreeCtrl_AppendItem", _wrap_wxTreeCtrl_AppendItem, 1 },
-        { "wxTreeCtrl_InsertItem", _wrap_wxTreeCtrl_InsertItem, 1 },
-        { "wxTreeCtrl_PrependItem", _wrap_wxTreeCtrl_PrependItem, 1 },
-        { "wxTreeCtrl_AddRoot", _wrap_wxTreeCtrl_AddRoot, 1 },
-        { "wxTreeCtrl_GetPrevVisible", _wrap_wxTreeCtrl_GetPrevVisible, 1 },
-        { "wxTreeCtrl_GetNextVisible", _wrap_wxTreeCtrl_GetNextVisible, 1 },
-        { "wxTreeCtrl_GetFirstVisibleItem", _wrap_wxTreeCtrl_GetFirstVisibleItem, 1 },
-        { "wxTreeCtrl_GetPrevSibling", _wrap_wxTreeCtrl_GetPrevSibling, 1 },
-        { "wxTreeCtrl_GetNextSibling", _wrap_wxTreeCtrl_GetNextSibling, 1 },
-        { "wxTreeCtrl_GetNextChild", _wrap_wxTreeCtrl_GetNextChild, 1 },
-        { "wxTreeCtrl_GetFirstChild", _wrap_wxTreeCtrl_GetFirstChild, 1 },
-        { "wxTreeCtrl_GetChildrenCount", _wrap_wxTreeCtrl_GetChildrenCount, 1 },
-        { "wxTreeCtrl_GetParent", _wrap_wxTreeCtrl_GetParent, 1 },
-        { "wxTreeCtrl_GetSelection", _wrap_wxTreeCtrl_GetSelection, 1 },
-        { "wxTreeCtrl_GetRootItem", _wrap_wxTreeCtrl_GetRootItem, 1 },
-        { "wxTreeCtrl_IsSelected", _wrap_wxTreeCtrl_IsSelected, 1 },
-        { "wxTreeCtrl_IsExpanded", _wrap_wxTreeCtrl_IsExpanded, 1 },
-        { "wxTreeCtrl_ItemHasChildren", _wrap_wxTreeCtrl_ItemHasChildren, 1 },
-        { "wxTreeCtrl_IsVisible", _wrap_wxTreeCtrl_IsVisible, 1 },
-        { "wxTreeCtrl_SetPyData", _wrap_wxTreeCtrl_SetPyData, 1 },
-        { "wxTreeCtrl_GetPyData", _wrap_wxTreeCtrl_GetPyData, 1 },
-        { "wxTreeCtrl_SetItemData", _wrap_wxTreeCtrl_SetItemData, 1 },
-        { "wxTreeCtrl_GetItemData", _wrap_wxTreeCtrl_GetItemData, 1 },
-        { "wxTreeCtrl_SetItemHasChildren", _wrap_wxTreeCtrl_SetItemHasChildren, 1 },
-        { "wxTreeCtrl_SetItemSelectedImage", _wrap_wxTreeCtrl_SetItemSelectedImage, 1 },
-        { "wxTreeCtrl_SetItemImage", _wrap_wxTreeCtrl_SetItemImage, 1 },
-        { "wxTreeCtrl_SetItemText", _wrap_wxTreeCtrl_SetItemText, 1 },
-        { "wxTreeCtrl_GetItemSelectedImage", _wrap_wxTreeCtrl_GetItemSelectedImage, 1 },
-        { "wxTreeCtrl_GetItemImage", _wrap_wxTreeCtrl_GetItemImage, 1 },
-        { "wxTreeCtrl_GetItemText", _wrap_wxTreeCtrl_GetItemText, 1 },
-        { "wxTreeCtrl_SetStateImageList", _wrap_wxTreeCtrl_SetStateImageList, 1 },
-        { "wxTreeCtrl_SetImageList", _wrap_wxTreeCtrl_SetImageList, 1 },
-        { "wxTreeCtrl_GetStateImageList", _wrap_wxTreeCtrl_GetStateImageList, 1 },
-        { "wxTreeCtrl_GetImageList", _wrap_wxTreeCtrl_GetImageList, 1 },
-        { "wxTreeCtrl_SetIndent", _wrap_wxTreeCtrl_SetIndent, 1 },
-        { "wxTreeCtrl_GetIndent", _wrap_wxTreeCtrl_GetIndent, 1 },
-        { "wxTreeCtrl_GetCount", _wrap_wxTreeCtrl_GetCount, 1 },
-        { "new_wxTreeCtrl", _wrap_new_wxTreeCtrl, 1 },
-        { "wxTreeEvent_GetLabel", _wrap_wxTreeEvent_GetLabel, 1 },
-        { "wxTreeEvent_GetCode", _wrap_wxTreeEvent_GetCode, 1 },
-        { "wxTreeEvent_GetPoint", _wrap_wxTreeEvent_GetPoint, 1 },
-        { "wxTreeEvent_GetOldItem", _wrap_wxTreeEvent_GetOldItem, 1 },
-        { "wxTreeEvent_GetItem", _wrap_wxTreeEvent_GetItem, 1 },
-        { "wxTreeItemData_SetId", _wrap_wxTreeItemData_SetId, 1 },
-        { "wxTreeItemData_GetId", _wrap_wxTreeItemData_GetId, 1 },
-        { "wxTreeItemData_SetData", _wrap_wxTreeItemData_SetData, 1 },
-        { "wxTreeItemData_GetData", _wrap_wxTreeItemData_GetData, 1 },
-        { "new_wxTreeItemData", _wrap_new_wxTreeItemData, 1 },
-        { "wxTreeItemId_IsOk", _wrap_wxTreeItemId_IsOk, 1 },
-        { "delete_wxTreeItemId", _wrap_delete_wxTreeItemId, 1 },
-        { "new_wxTreeItemId", _wrap_new_wxTreeItemId, 1 },
-        { "wxListCtrl_SetWindowStyleFlag", _wrap_wxListCtrl_SetWindowStyleFlag, 1 },
-        { "wxListCtrl_SetSingleStyle", _wrap_wxListCtrl_SetSingleStyle, 1 },
-        { "wxListCtrl_SetItemText", _wrap_wxListCtrl_SetItemText, 1 },
-        { "wxListCtrl_SetItemState", _wrap_wxListCtrl_SetItemState, 1 },
-        { "wxListCtrl_SetItemPosition", _wrap_wxListCtrl_SetItemPosition, 1 },
-        { "wxListCtrl_SetItemImage", _wrap_wxListCtrl_SetItemImage, 1 },
-        { "wxListCtrl_SetItemData", _wrap_wxListCtrl_SetItemData, 1 },
-        { "wxListCtrl_SetStringItem", _wrap_wxListCtrl_SetStringItem, 1 },
-        { "wxListCtrl_SetItem", _wrap_wxListCtrl_SetItem, 1 },
-        { "wxListCtrl_SetImageList", _wrap_wxListCtrl_SetImageList, 1 },
-        { "wxListCtrl_SetColumnWidth", _wrap_wxListCtrl_SetColumnWidth, 1 },
-        { "wxListCtrl_SetColumn", _wrap_wxListCtrl_SetColumn, 1 },
-        { "wxListCtrl_SetBackgroundColour", _wrap_wxListCtrl_SetBackgroundColour, 1 },
-        { "wxListCtrl_ScrollList", _wrap_wxListCtrl_ScrollList, 1 },
-        { "wxListCtrl_InsertImageStringItem", _wrap_wxListCtrl_InsertImageStringItem, 1 },
-        { "wxListCtrl_InsertImageItem", _wrap_wxListCtrl_InsertImageItem, 1 },
-        { "wxListCtrl_InsertStringItem", _wrap_wxListCtrl_InsertStringItem, 1 },
-        { "wxListCtrl_InsertItem", _wrap_wxListCtrl_InsertItem, 1 },
-        { "wxListCtrl_InsertColumn", _wrap_wxListCtrl_InsertColumn, 1 },
-        { "wxListCtrl_InsertColumnWith", _wrap_wxListCtrl_InsertColumnWith, 1 },
-        { "wxListCtrl_HitTest", _wrap_wxListCtrl_HitTest, 1 },
-        { "wxListCtrl_GetTopItem", _wrap_wxListCtrl_GetTopItem, 1 },
-        { "wxListCtrl_SetTextColour", _wrap_wxListCtrl_SetTextColour, 1 },
-        { "wxListCtrl_GetTextColour", _wrap_wxListCtrl_GetTextColour, 1 },
-        { "wxListCtrl_GetSelectedItemCount", _wrap_wxListCtrl_GetSelectedItemCount, 1 },
-        { "wxListCtrl_GetNextItem", _wrap_wxListCtrl_GetNextItem, 1 },
-        { "wxListCtrl_GetItemText", _wrap_wxListCtrl_GetItemText, 1 },
-        { "wxListCtrl_GetItemSpacing", _wrap_wxListCtrl_GetItemSpacing, 1 },
-        { "wxListCtrl_GetItemCount", _wrap_wxListCtrl_GetItemCount, 1 },
-        { "wxListCtrl_GetItemState", _wrap_wxListCtrl_GetItemState, 1 },
-        { "wxListCtrl_GetItemRect", _wrap_wxListCtrl_GetItemRect, 1 },
-        { "wxListCtrl_GetItemPosition", _wrap_wxListCtrl_GetItemPosition, 1 },
-        { "wxListCtrl_GetItem", _wrap_wxListCtrl_GetItem, 1 },
-        { "wxListCtrl_GetItemData", _wrap_wxListCtrl_GetItemData, 1 },
-        { "wxListCtrl_GetImageList", _wrap_wxListCtrl_GetImageList, 1 },
-        { "wxListCtrl_GetCountPerPage", _wrap_wxListCtrl_GetCountPerPage, 1 },
-        { "wxListCtrl_GetColumnWidth", _wrap_wxListCtrl_GetColumnWidth, 1 },
-        { "wxListCtrl_GetColumn", _wrap_wxListCtrl_GetColumn, 1 },
-        { "wxListCtrl_FindItemAtPos", _wrap_wxListCtrl_FindItemAtPos, 1 },
-        { "wxListCtrl_FindItemData", _wrap_wxListCtrl_FindItemData, 1 },
-        { "wxListCtrl_FindItem", _wrap_wxListCtrl_FindItem, 1 },
-        { "wxListCtrl_EnsureVisible", _wrap_wxListCtrl_EnsureVisible, 1 },
-        { "wxListCtrl_GetEditControl", _wrap_wxListCtrl_GetEditControl, 1 },
-        { "wxListCtrl_EndEditLabel", _wrap_wxListCtrl_EndEditLabel, 1 },
-        { "wxListCtrl_EditLabel", _wrap_wxListCtrl_EditLabel, 1 },
-        { "wxListCtrl_ClearAll", _wrap_wxListCtrl_ClearAll, 1 },
-        { "wxListCtrl_DeleteAllColumns", _wrap_wxListCtrl_DeleteAllColumns, 1 },
-        { "wxListCtrl_DeleteColumn", _wrap_wxListCtrl_DeleteColumn, 1 },
-        { "wxListCtrl_DeleteAllItems", _wrap_wxListCtrl_DeleteAllItems, 1 },
-        { "wxListCtrl_DeleteItem", _wrap_wxListCtrl_DeleteItem, 1 },
-        { "wxListCtrl_Arrange", _wrap_wxListCtrl_Arrange, 1 },
-        { "new_wxListCtrl", _wrap_new_wxListCtrl, 1 },
-        { "wxListEvent_m_item_get", _wrap_wxListEvent_m_item_get, 1 },
-        { "wxListEvent_m_item_set", _wrap_wxListEvent_m_item_set, 1 },
-        { "wxListEvent_m_pointDrag_get", _wrap_wxListEvent_m_pointDrag_get, 1 },
-        { "wxListEvent_m_pointDrag_set", _wrap_wxListEvent_m_pointDrag_set, 1 },
-        { "wxListEvent_m_cancelled_get", _wrap_wxListEvent_m_cancelled_get, 1 },
-        { "wxListEvent_m_cancelled_set", _wrap_wxListEvent_m_cancelled_set, 1 },
-        { "wxListEvent_m_col_get", _wrap_wxListEvent_m_col_get, 1 },
-        { "wxListEvent_m_col_set", _wrap_wxListEvent_m_col_set, 1 },
-        { "wxListEvent_m_oldItemIndex_get", _wrap_wxListEvent_m_oldItemIndex_get, 1 },
-        { "wxListEvent_m_oldItemIndex_set", _wrap_wxListEvent_m_oldItemIndex_set, 1 },
-        { "wxListEvent_m_itemIndex_get", _wrap_wxListEvent_m_itemIndex_get, 1 },
-        { "wxListEvent_m_itemIndex_set", _wrap_wxListEvent_m_itemIndex_set, 1 },
-        { "wxListEvent_m_code_get", _wrap_wxListEvent_m_code_get, 1 },
-        { "wxListEvent_m_code_set", _wrap_wxListEvent_m_code_set, 1 },
-        { "delete_wxListItem", _wrap_delete_wxListItem, 1 },
-        { "new_wxListItem", _wrap_new_wxListItem, 1 },
-        { "wxListItem_m_width_get", _wrap_wxListItem_m_width_get, 1 },
-        { "wxListItem_m_width_set", _wrap_wxListItem_m_width_set, 1 },
-        { "wxListItem_m_format_get", _wrap_wxListItem_m_format_get, 1 },
-        { "wxListItem_m_format_set", _wrap_wxListItem_m_format_set, 1 },
-        { "wxListItem_m_data_get", _wrap_wxListItem_m_data_get, 1 },
-        { "wxListItem_m_data_set", _wrap_wxListItem_m_data_set, 1 },
-        { "wxListItem_m_image_get", _wrap_wxListItem_m_image_get, 1 },
-        { "wxListItem_m_image_set", _wrap_wxListItem_m_image_set, 1 },
-        { "wxListItem_m_text_get", _wrap_wxListItem_m_text_get, 1 },
-        { "wxListItem_m_text_set", _wrap_wxListItem_m_text_set, 1 },
-        { "wxListItem_m_stateMask_get", _wrap_wxListItem_m_stateMask_get, 1 },
-        { "wxListItem_m_stateMask_set", _wrap_wxListItem_m_stateMask_set, 1 },
-        { "wxListItem_m_state_get", _wrap_wxListItem_m_state_get, 1 },
-        { "wxListItem_m_state_set", _wrap_wxListItem_m_state_set, 1 },
-        { "wxListItem_m_col_get", _wrap_wxListItem_m_col_get, 1 },
-        { "wxListItem_m_col_set", _wrap_wxListItem_m_col_set, 1 },
-        { "wxListItem_m_itemId_get", _wrap_wxListItem_m_itemId_get, 1 },
-        { "wxListItem_m_itemId_set", _wrap_wxListItem_m_itemId_set, 1 },
-        { "wxListItem_m_mask_get", _wrap_wxListItem_m_mask_get, 1 },
-        { "wxListItem_m_mask_set", _wrap_wxListItem_m_mask_set, 1 },
+        { "wxTreeCtrl_HitTest", _wrap_wxTreeCtrl_HitTest, METH_VARARGS },
+        { "wxTreeCtrl_IsBold", _wrap_wxTreeCtrl_IsBold, METH_VARARGS },
+        { "wxTreeCtrl_SetItemBold", _wrap_wxTreeCtrl_SetItemBold, METH_VARARGS },
+        { "wxTreeCtrl_EndEditLabel", _wrap_wxTreeCtrl_EndEditLabel, METH_VARARGS },
+        { "wxTreeCtrl_GetEditControl", _wrap_wxTreeCtrl_GetEditControl, METH_VARARGS },
+        { "wxTreeCtrl_EditLabel", _wrap_wxTreeCtrl_EditLabel, METH_VARARGS },
+        { "wxTreeCtrl_ScrollTo", _wrap_wxTreeCtrl_ScrollTo, METH_VARARGS },
+        { "wxTreeCtrl_EnsureVisible", _wrap_wxTreeCtrl_EnsureVisible, METH_VARARGS },
+        { "wxTreeCtrl_SelectItem", _wrap_wxTreeCtrl_SelectItem, METH_VARARGS },
+        { "wxTreeCtrl_UnselectAll", _wrap_wxTreeCtrl_UnselectAll, METH_VARARGS },
+        { "wxTreeCtrl_Unselect", _wrap_wxTreeCtrl_Unselect, METH_VARARGS },
+        { "wxTreeCtrl_Toggle", _wrap_wxTreeCtrl_Toggle, METH_VARARGS },
+        { "wxTreeCtrl_CollapseAndReset", _wrap_wxTreeCtrl_CollapseAndReset, METH_VARARGS },
+        { "wxTreeCtrl_Collapse", _wrap_wxTreeCtrl_Collapse, METH_VARARGS },
+        { "wxTreeCtrl_Expand", _wrap_wxTreeCtrl_Expand, METH_VARARGS },
+        { "wxTreeCtrl_DeleteAllItems", _wrap_wxTreeCtrl_DeleteAllItems, METH_VARARGS },
+        { "wxTreeCtrl_DeleteChildren", _wrap_wxTreeCtrl_DeleteChildren, METH_VARARGS },
+        { "wxTreeCtrl_Delete", _wrap_wxTreeCtrl_Delete, METH_VARARGS },
+        { "wxTreeCtrl_AppendItem", _wrap_wxTreeCtrl_AppendItem, METH_VARARGS },
+        { "wxTreeCtrl_InsertItem", _wrap_wxTreeCtrl_InsertItem, METH_VARARGS },
+        { "wxTreeCtrl_PrependItem", _wrap_wxTreeCtrl_PrependItem, METH_VARARGS },
+        { "wxTreeCtrl_AddRoot", _wrap_wxTreeCtrl_AddRoot, METH_VARARGS },
+        { "wxTreeCtrl_GetPrevVisible", _wrap_wxTreeCtrl_GetPrevVisible, METH_VARARGS },
+        { "wxTreeCtrl_GetNextVisible", _wrap_wxTreeCtrl_GetNextVisible, METH_VARARGS },
+        { "wxTreeCtrl_GetFirstVisibleItem", _wrap_wxTreeCtrl_GetFirstVisibleItem, METH_VARARGS },
+        { "wxTreeCtrl_GetPrevSibling", _wrap_wxTreeCtrl_GetPrevSibling, METH_VARARGS },
+        { "wxTreeCtrl_GetNextSibling", _wrap_wxTreeCtrl_GetNextSibling, METH_VARARGS },
+        { "wxTreeCtrl_GetNextChild", _wrap_wxTreeCtrl_GetNextChild, METH_VARARGS },
+        { "wxTreeCtrl_GetFirstChild", _wrap_wxTreeCtrl_GetFirstChild, METH_VARARGS },
+        { "wxTreeCtrl_GetChildrenCount", _wrap_wxTreeCtrl_GetChildrenCount, METH_VARARGS },
+        { "wxTreeCtrl_GetParent", _wrap_wxTreeCtrl_GetParent, METH_VARARGS },
+        { "wxTreeCtrl_GetSelection", _wrap_wxTreeCtrl_GetSelection, METH_VARARGS },
+        { "wxTreeCtrl_GetRootItem", _wrap_wxTreeCtrl_GetRootItem, METH_VARARGS },
+        { "wxTreeCtrl_IsSelected", _wrap_wxTreeCtrl_IsSelected, METH_VARARGS },
+        { "wxTreeCtrl_IsExpanded", _wrap_wxTreeCtrl_IsExpanded, METH_VARARGS },
+        { "wxTreeCtrl_ItemHasChildren", _wrap_wxTreeCtrl_ItemHasChildren, METH_VARARGS },
+        { "wxTreeCtrl_IsVisible", _wrap_wxTreeCtrl_IsVisible, METH_VARARGS },
+        { "wxTreeCtrl_SetPyData", _wrap_wxTreeCtrl_SetPyData, METH_VARARGS },
+        { "wxTreeCtrl_GetPyData", _wrap_wxTreeCtrl_GetPyData, METH_VARARGS },
+        { "wxTreeCtrl_SetItemData", _wrap_wxTreeCtrl_SetItemData, METH_VARARGS },
+        { "wxTreeCtrl_GetItemData", _wrap_wxTreeCtrl_GetItemData, METH_VARARGS },
+        { "wxTreeCtrl_SetItemHasChildren", _wrap_wxTreeCtrl_SetItemHasChildren, METH_VARARGS },
+        { "wxTreeCtrl_SetItemSelectedImage", _wrap_wxTreeCtrl_SetItemSelectedImage, METH_VARARGS },
+        { "wxTreeCtrl_SetItemImage", _wrap_wxTreeCtrl_SetItemImage, METH_VARARGS },
+        { "wxTreeCtrl_SetItemText", _wrap_wxTreeCtrl_SetItemText, METH_VARARGS },
+        { "wxTreeCtrl_GetItemSelectedImage", _wrap_wxTreeCtrl_GetItemSelectedImage, METH_VARARGS },
+        { "wxTreeCtrl_GetItemImage", _wrap_wxTreeCtrl_GetItemImage, METH_VARARGS },
+        { "wxTreeCtrl_GetItemText", _wrap_wxTreeCtrl_GetItemText, METH_VARARGS },
+        { "wxTreeCtrl_SetStateImageList", _wrap_wxTreeCtrl_SetStateImageList, METH_VARARGS },
+        { "wxTreeCtrl_SetImageList", _wrap_wxTreeCtrl_SetImageList, METH_VARARGS },
+        { "wxTreeCtrl_GetStateImageList", _wrap_wxTreeCtrl_GetStateImageList, METH_VARARGS },
+        { "wxTreeCtrl_GetImageList", _wrap_wxTreeCtrl_GetImageList, METH_VARARGS },
+        { "wxTreeCtrl_SetIndent", _wrap_wxTreeCtrl_SetIndent, METH_VARARGS },
+        { "wxTreeCtrl_GetIndent", _wrap_wxTreeCtrl_GetIndent, METH_VARARGS },
+        { "wxTreeCtrl_GetCount", _wrap_wxTreeCtrl_GetCount, METH_VARARGS },
+        { "new_wxTreeCtrl", _wrap_new_wxTreeCtrl, METH_VARARGS },
+        { "wxTreeEvent_GetLabel", _wrap_wxTreeEvent_GetLabel, METH_VARARGS },
+        { "wxTreeEvent_GetCode", _wrap_wxTreeEvent_GetCode, METH_VARARGS },
+        { "wxTreeEvent_GetPoint", _wrap_wxTreeEvent_GetPoint, METH_VARARGS },
+        { "wxTreeEvent_GetOldItem", _wrap_wxTreeEvent_GetOldItem, METH_VARARGS },
+        { "wxTreeEvent_GetItem", _wrap_wxTreeEvent_GetItem, METH_VARARGS },
+        { "wxTreeItemData_SetId", _wrap_wxTreeItemData_SetId, METH_VARARGS },
+        { "wxTreeItemData_GetId", _wrap_wxTreeItemData_GetId, METH_VARARGS },
+        { "wxTreeItemData_SetData", _wrap_wxTreeItemData_SetData, METH_VARARGS },
+        { "wxTreeItemData_GetData", _wrap_wxTreeItemData_GetData, METH_VARARGS },
+        { "new_wxTreeItemData", _wrap_new_wxTreeItemData, METH_VARARGS },
+        { "wxTreeItemId_IsOk", _wrap_wxTreeItemId_IsOk, METH_VARARGS },
+        { "delete_wxTreeItemId", _wrap_delete_wxTreeItemId, METH_VARARGS },
+        { "new_wxTreeItemId", _wrap_new_wxTreeItemId, METH_VARARGS },
+        { "wxListCtrl_SetWindowStyleFlag", _wrap_wxListCtrl_SetWindowStyleFlag, METH_VARARGS },
+        { "wxListCtrl_SetSingleStyle", _wrap_wxListCtrl_SetSingleStyle, METH_VARARGS },
+        { "wxListCtrl_SetItemText", _wrap_wxListCtrl_SetItemText, METH_VARARGS },
+        { "wxListCtrl_SetItemState", _wrap_wxListCtrl_SetItemState, METH_VARARGS },
+        { "wxListCtrl_SetItemPosition", _wrap_wxListCtrl_SetItemPosition, METH_VARARGS },
+        { "wxListCtrl_SetItemImage", _wrap_wxListCtrl_SetItemImage, METH_VARARGS },
+        { "wxListCtrl_SetItemData", _wrap_wxListCtrl_SetItemData, METH_VARARGS },
+        { "wxListCtrl_SetStringItem", _wrap_wxListCtrl_SetStringItem, METH_VARARGS },
+        { "wxListCtrl_SetItem", _wrap_wxListCtrl_SetItem, METH_VARARGS },
+        { "wxListCtrl_SetImageList", _wrap_wxListCtrl_SetImageList, METH_VARARGS },
+        { "wxListCtrl_SetColumnWidth", _wrap_wxListCtrl_SetColumnWidth, METH_VARARGS },
+        { "wxListCtrl_SetColumn", _wrap_wxListCtrl_SetColumn, METH_VARARGS },
+        { "wxListCtrl_SetBackgroundColour", _wrap_wxListCtrl_SetBackgroundColour, METH_VARARGS },
+        { "wxListCtrl_ScrollList", _wrap_wxListCtrl_ScrollList, METH_VARARGS },
+        { "wxListCtrl_InsertImageStringItem", _wrap_wxListCtrl_InsertImageStringItem, METH_VARARGS },
+        { "wxListCtrl_InsertImageItem", _wrap_wxListCtrl_InsertImageItem, METH_VARARGS },
+        { "wxListCtrl_InsertStringItem", _wrap_wxListCtrl_InsertStringItem, METH_VARARGS },
+        { "wxListCtrl_InsertItem", _wrap_wxListCtrl_InsertItem, METH_VARARGS },
+        { "wxListCtrl_InsertColumn", _wrap_wxListCtrl_InsertColumn, METH_VARARGS },
+        { "wxListCtrl_InsertColumnWith", _wrap_wxListCtrl_InsertColumnWith, METH_VARARGS },
+        { "wxListCtrl_HitTest", _wrap_wxListCtrl_HitTest, METH_VARARGS },
+        { "wxListCtrl_GetTopItem", _wrap_wxListCtrl_GetTopItem, METH_VARARGS },
+        { "wxListCtrl_SetTextColour", _wrap_wxListCtrl_SetTextColour, METH_VARARGS },
+        { "wxListCtrl_GetTextColour", _wrap_wxListCtrl_GetTextColour, METH_VARARGS },
+        { "wxListCtrl_GetSelectedItemCount", _wrap_wxListCtrl_GetSelectedItemCount, METH_VARARGS },
+        { "wxListCtrl_GetNextItem", _wrap_wxListCtrl_GetNextItem, METH_VARARGS },
+        { "wxListCtrl_GetItemText", _wrap_wxListCtrl_GetItemText, METH_VARARGS },
+        { "wxListCtrl_GetItemSpacing", _wrap_wxListCtrl_GetItemSpacing, METH_VARARGS },
+        { "wxListCtrl_GetItemCount", _wrap_wxListCtrl_GetItemCount, METH_VARARGS },
+        { "wxListCtrl_GetItemState", _wrap_wxListCtrl_GetItemState, METH_VARARGS },
+        { "wxListCtrl_GetItemRect", _wrap_wxListCtrl_GetItemRect, METH_VARARGS },
+        { "wxListCtrl_GetItemPosition", _wrap_wxListCtrl_GetItemPosition, METH_VARARGS },
+        { "wxListCtrl_GetItem", _wrap_wxListCtrl_GetItem, METH_VARARGS },
+        { "wxListCtrl_GetItemData", _wrap_wxListCtrl_GetItemData, METH_VARARGS },
+        { "wxListCtrl_GetImageList", _wrap_wxListCtrl_GetImageList, METH_VARARGS },
+        { "wxListCtrl_GetCountPerPage", _wrap_wxListCtrl_GetCountPerPage, METH_VARARGS },
+        { "wxListCtrl_GetColumnWidth", _wrap_wxListCtrl_GetColumnWidth, METH_VARARGS },
+        { "wxListCtrl_GetColumn", _wrap_wxListCtrl_GetColumn, METH_VARARGS },
+        { "wxListCtrl_FindItemAtPos", _wrap_wxListCtrl_FindItemAtPos, METH_VARARGS },
+        { "wxListCtrl_FindItemData", _wrap_wxListCtrl_FindItemData, METH_VARARGS },
+        { "wxListCtrl_FindItem", _wrap_wxListCtrl_FindItem, METH_VARARGS },
+        { "wxListCtrl_EnsureVisible", _wrap_wxListCtrl_EnsureVisible, METH_VARARGS },
+        { "wxListCtrl_GetEditControl", _wrap_wxListCtrl_GetEditControl, METH_VARARGS },
+        { "wxListCtrl_EndEditLabel", _wrap_wxListCtrl_EndEditLabel, METH_VARARGS },
+        { "wxListCtrl_EditLabel", _wrap_wxListCtrl_EditLabel, METH_VARARGS },
+        { "wxListCtrl_ClearAll", _wrap_wxListCtrl_ClearAll, METH_VARARGS },
+        { "wxListCtrl_DeleteAllColumns", _wrap_wxListCtrl_DeleteAllColumns, METH_VARARGS },
+        { "wxListCtrl_DeleteColumn", _wrap_wxListCtrl_DeleteColumn, METH_VARARGS },
+        { "wxListCtrl_DeleteAllItems", _wrap_wxListCtrl_DeleteAllItems, METH_VARARGS },
+        { "wxListCtrl_DeleteItem", _wrap_wxListCtrl_DeleteItem, METH_VARARGS },
+        { "wxListCtrl_Arrange", _wrap_wxListCtrl_Arrange, METH_VARARGS },
+        { "new_wxListCtrl", _wrap_new_wxListCtrl, METH_VARARGS },
+        { "wxListEvent_m_item_get", _wrap_wxListEvent_m_item_get, METH_VARARGS },
+        { "wxListEvent_m_item_set", _wrap_wxListEvent_m_item_set, METH_VARARGS },
+        { "wxListEvent_m_pointDrag_get", _wrap_wxListEvent_m_pointDrag_get, METH_VARARGS },
+        { "wxListEvent_m_pointDrag_set", _wrap_wxListEvent_m_pointDrag_set, METH_VARARGS },
+        { "wxListEvent_m_cancelled_get", _wrap_wxListEvent_m_cancelled_get, METH_VARARGS },
+        { "wxListEvent_m_cancelled_set", _wrap_wxListEvent_m_cancelled_set, METH_VARARGS },
+        { "wxListEvent_m_col_get", _wrap_wxListEvent_m_col_get, METH_VARARGS },
+        { "wxListEvent_m_col_set", _wrap_wxListEvent_m_col_set, METH_VARARGS },
+        { "wxListEvent_m_oldItemIndex_get", _wrap_wxListEvent_m_oldItemIndex_get, METH_VARARGS },
+        { "wxListEvent_m_oldItemIndex_set", _wrap_wxListEvent_m_oldItemIndex_set, METH_VARARGS },
+        { "wxListEvent_m_itemIndex_get", _wrap_wxListEvent_m_itemIndex_get, METH_VARARGS },
+        { "wxListEvent_m_itemIndex_set", _wrap_wxListEvent_m_itemIndex_set, METH_VARARGS },
+        { "wxListEvent_m_code_get", _wrap_wxListEvent_m_code_get, METH_VARARGS },
+        { "wxListEvent_m_code_set", _wrap_wxListEvent_m_code_set, METH_VARARGS },
+        { "delete_wxListItem", _wrap_delete_wxListItem, METH_VARARGS },
+        { "new_wxListItem", _wrap_new_wxListItem, METH_VARARGS },
+        { "wxListItem_m_width_get", _wrap_wxListItem_m_width_get, METH_VARARGS },
+        { "wxListItem_m_width_set", _wrap_wxListItem_m_width_set, METH_VARARGS },
+        { "wxListItem_m_format_get", _wrap_wxListItem_m_format_get, METH_VARARGS },
+        { "wxListItem_m_format_set", _wrap_wxListItem_m_format_set, METH_VARARGS },
+        { "wxListItem_m_data_get", _wrap_wxListItem_m_data_get, METH_VARARGS },
+        { "wxListItem_m_data_set", _wrap_wxListItem_m_data_set, METH_VARARGS },
+        { "wxListItem_m_image_get", _wrap_wxListItem_m_image_get, METH_VARARGS },
+        { "wxListItem_m_image_set", _wrap_wxListItem_m_image_set, METH_VARARGS },
+        { "wxListItem_m_text_get", _wrap_wxListItem_m_text_get, METH_VARARGS },
+        { "wxListItem_m_text_set", _wrap_wxListItem_m_text_set, METH_VARARGS },
+        { "wxListItem_m_stateMask_get", _wrap_wxListItem_m_stateMask_get, METH_VARARGS },
+        { "wxListItem_m_stateMask_set", _wrap_wxListItem_m_stateMask_set, METH_VARARGS },
+        { "wxListItem_m_state_get", _wrap_wxListItem_m_state_get, METH_VARARGS },
+        { "wxListItem_m_state_set", _wrap_wxListItem_m_state_set, METH_VARARGS },
+        { "wxListItem_m_col_get", _wrap_wxListItem_m_col_get, METH_VARARGS },
+        { "wxListItem_m_col_set", _wrap_wxListItem_m_col_set, METH_VARARGS },
+        { "wxListItem_m_itemId_get", _wrap_wxListItem_m_itemId_get, METH_VARARGS },
+        { "wxListItem_m_itemId_set", _wrap_wxListItem_m_itemId_set, METH_VARARGS },
+        { "wxListItem_m_mask_get", _wrap_wxListItem_m_mask_get, METH_VARARGS },
+        { "wxListItem_m_mask_set", _wrap_wxListItem_m_mask_set, METH_VARARGS },

         { NULL, NULL }
 };
         { NULL, NULL }
 };

+#ifdef __cplusplus
+}
+#endif
+/*
+ * This table is used by the pointer type-checker
+ */
+static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
+    { "_wxAcceleratorTable","_class_wxAcceleratorTable",0},
+    { "_wxEvent","_class_wxTreeEvent",SwigwxTreeEventTowxEvent},
+    { "_wxEvent","_wxTreeEvent",SwigwxTreeEventTowxEvent},
+    { "_wxEvent","_class_wxListEvent",SwigwxListEventTowxEvent},
+    { "_wxEvent","_wxListEvent",SwigwxListEventTowxEvent},
+    { "_wxEvent","_class_wxEvent",0},
+    { "_class_wxActivateEvent","_wxActivateEvent",0},
+    { "_signed_long","_long",0},
+    { "_wxMenuEvent","_class_wxMenuEvent",0},
+    { "_wxPrintQuality","_int",0},
+    { "_wxPrintQuality","_signed_int",0},
+    { "_wxPrintQuality","_unsigned_int",0},
+    { "_wxPrintQuality","_wxWindowID",0},
+    { "_wxPrintQuality","_uint",0},
+    { "_wxPrintQuality","_EBool",0},
+    { "_wxPrintQuality","_size_t",0},
+    { "_class_wxRegionIterator","_wxRegionIterator",0},
+    { "_class_wxMenuBar","_wxMenuBar",0},
+    { "_class_wxPyTreeItemData","_wxPyTreeItemData",0},
+    { "_class_wxEvtHandler","_class_wxTreeCtrl",SwigwxTreeCtrlTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxTreeCtrl",SwigwxTreeCtrlTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxListCtrl",SwigwxListCtrlTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxListCtrl",SwigwxListCtrlTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxEvtHandler",0},
+    { "_wxPaintEvent","_class_wxPaintEvent",0},
+    { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
+    { "_wxCursor","_class_wxCursor",0},
+    { "_wxNotifyEvent","_class_wxTreeEvent",SwigwxTreeEventTowxNotifyEvent},
+    { "_wxNotifyEvent","_wxTreeEvent",SwigwxTreeEventTowxNotifyEvent},
+    { "_wxNotifyEvent","_class_wxNotifyEvent",0},
+    { "_class_wxTreeCtrl","_wxTreeCtrl",0},
+    { "_wxMask","_class_wxMask",0},
+    { "_wxPen","_class_wxPen",0},
+    { "_wxUpdateUIEvent","_class_wxUpdateUIEvent",0},
+    { "_byte","_unsigned_char",0},
+    { "_wxStaticBox","_class_wxStaticBox",0},
+    { "_wxChoice","_class_wxChoice",0},
+    { "_wxSlider","_class_wxSlider",0},
+    { "_long","_wxDash",0},
+    { "_long","_unsigned_long",0},
+    { "_long","_signed_long",0},
+    { "_wxImageList","_class_wxImageList",0},
+    { "_wxDropFilesEvent","_class_wxDropFilesEvent",0},
+    { "_wxBitmapButton","_class_wxBitmapButton",0},
+    { "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
+    { "_class_wxGauge","_wxGauge",0},
+    { "_wxDC","_class_wxDC",0},
+    { "_wxListEvent","_class_wxListEvent",0},
+    { "_wxSpinEvent","_class_wxSpinEvent",0},
+    { "_size_t","_wxPrintQuality",0},
+    { "_size_t","_unsigned_int",0},
+    { "_size_t","_int",0},
+    { "_size_t","_wxWindowID",0},
+    { "_size_t","_uint",0},
+    { "_class_wxRealPoint","_wxRealPoint",0},
+    { "_wxPrinterDC","_class_wxPrinterDC",0},
+    { "_class_wxMenuItem","_wxMenuItem",0},
+    { "_class_wxPaintEvent","_wxPaintEvent",0},
+    { "_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0},
+    { "_wxPanel","_class_wxPanel",0},
+    { "_wxInitDialogEvent","_class_wxInitDialogEvent",0},
+    { "_wxCheckBox","_class_wxCheckBox",0},
+    { "_wxPyEvent","_class_wxPyEvent",0},
+    { "_wxTextCtrl","_class_wxTextCtrl",0},
+    { "_class_wxMask","_wxMask",0},
+    { "_class_wxKeyEvent","_wxKeyEvent",0},
+    { "_wxColour","_class_wxColour",0},
+    { "_class_wxDialog","_wxDialog",0},
+    { "_wxIdleEvent","_class_wxIdleEvent",0},
+    { "_class_wxUpdateUIEvent","_wxUpdateUIEvent",0},
+    { "_wxStaticLine","_class_wxStaticLine",0},
+    { "_wxBrush","_class_wxBrush",0},
+    { "_wxShowEvent","_class_wxShowEvent",0},
+    { "_uint","_wxPrintQuality",0},
+    { "_uint","_size_t",0},
+    { "_uint","_unsigned_int",0},
+    { "_uint","_int",0},
+    { "_uint","_wxWindowID",0},
+    { "_class_wxEvent","_class_wxTreeEvent",SwigwxTreeEventTowxEvent},
+    { "_class_wxEvent","_wxTreeEvent",SwigwxTreeEventTowxEvent},
+    { "_class_wxEvent","_class_wxListEvent",SwigwxListEventTowxEvent},
+    { "_class_wxEvent","_wxListEvent",SwigwxListEventTowxEvent},
+    { "_class_wxEvent","_wxEvent",0},
+    { "_wxCheckListBox","_class_wxCheckListBox",0},
+    { "_wxRect","_class_wxRect",0},
+    { "_wxCommandEvent","_class_wxTreeEvent",SwigwxTreeEventTowxCommandEvent},
+    { "_wxCommandEvent","_wxTreeEvent",SwigwxTreeEventTowxCommandEvent},
+    { "_wxCommandEvent","_class_wxListEvent",SwigwxListEventTowxCommandEvent},
+    { "_wxCommandEvent","_wxListEvent",SwigwxListEventTowxCommandEvent},
+    { "_wxCommandEvent","_class_wxCommandEvent",0},
+    { "_wxSizeEvent","_class_wxSizeEvent",0},
+    { "_wxPoint","_class_wxPoint",0},
+    { "_class_wxButton","_wxButton",0},
+    { "_wxRadioBox","_class_wxRadioBox",0},
+    { "_wxBitmap","_class_wxBitmap",0},
+    { "_wxPyTimer","_class_wxPyTimer",0},
+    { "_wxWindowDC","_class_wxWindowDC",0},
+    { "_wxScrollBar","_class_wxScrollBar",0},
+    { "_wxSpinButton","_class_wxSpinButton",0},
+    { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
+    { "_class_wxNotifyEvent","_class_wxTreeEvent",SwigwxTreeEventTowxNotifyEvent},
+    { "_class_wxNotifyEvent","_wxTreeEvent",SwigwxTreeEventTowxNotifyEvent},
+    { "_class_wxNotifyEvent","_wxNotifyEvent",0},
+    { "_class_wxPyEvent","_wxPyEvent",0},
+    { "_class_wxIconizeEvent","_wxIconizeEvent",0},
+    { "_class_wxStaticBitmap","_wxStaticBitmap",0},
+    { "_wxListItem","_class_wxListItem",0},
+    { "_class_wxStaticLine","_wxStaticLine",0},
+    { "_wxScrollEvent","_class_wxScrollEvent",0},
+    { "_EBool","_wxPrintQuality",0},
+    { "_EBool","_signed_int",0},
+    { "_EBool","_int",0},
+    { "_EBool","_wxWindowID",0},
+    { "_class_wxRegion","_wxRegion",0},
+    { "_class_wxDropFilesEvent","_wxDropFilesEvent",0},
+    { "_wxStaticText","_class_wxStaticText",0},
+    { "_wxFont","_class_wxFont",0},
+    { "_wxCloseEvent","_class_wxCloseEvent",0},
+    { "_unsigned_long","_wxDash",0},
+    { "_unsigned_long","_long",0},
+    { "_class_wxRect","_wxRect",0},
+    { "_class_wxDC","_wxDC",0},
+    { "_class_wxTreeEvent","_wxTreeEvent",0},
+    { "_class_wxPyTimer","_wxPyTimer",0},
+    { "_wxFocusEvent","_class_wxFocusEvent",0},
+    { "_wxMaximizeEvent","_class_wxMaximizeEvent",0},
+    { "_class_wxSpinButton","_wxSpinButton",0},
+    { "_wxAcceleratorEntry","_class_wxAcceleratorEntry",0},
+    { "_class_wxPanel","_wxPanel",0},
+    { "_class_wxCheckBox","_wxCheckBox",0},
+    { "_wxComboBox","_class_wxComboBox",0},
+    { "_wxRadioButton","_class_wxRadioButton",0},
+    { "_signed_int","_wxPrintQuality",0},
+    { "_signed_int","_EBool",0},
+    { "_signed_int","_wxWindowID",0},
+    { "_signed_int","_int",0},
+    { "_class_wxTextCtrl","_wxTextCtrl",0},
+    { "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
+    { "_wxMetaFileDC","_class_wxMetaFileDC",0},
+    { "_wxMenu","_class_wxMenu",0},
+    { "_class_wxMoveEvent","_wxMoveEvent",0},
+    { "_wxListBox","_class_wxListBox",0},
+    { "_wxScreenDC","_class_wxScreenDC",0},
+    { "_WXTYPE","_short",0},
+    { "_WXTYPE","_signed_short",0},
+    { "_WXTYPE","_unsigned_short",0},
+    { "_class_wxBrush","_wxBrush",0},
+    { "_unsigned_short","_WXTYPE",0},
+    { "_unsigned_short","_short",0},
+    { "_class_wxWindow","_class_wxTreeCtrl",SwigwxTreeCtrlTowxWindow},
+    { "_class_wxWindow","_wxTreeCtrl",SwigwxTreeCtrlTowxWindow},
+    { "_class_wxWindow","_class_wxListCtrl",SwigwxListCtrlTowxWindow},
+    { "_class_wxWindow","_wxListCtrl",SwigwxListCtrlTowxWindow},
+    { "_class_wxWindow","_wxWindow",0},
+    { "_class_wxStaticText","_wxStaticText",0},
+    { "_class_wxFont","_wxFont",0},
+    { "_class_wxCloseEvent","_wxCloseEvent",0},
+    { "_class_wxMenuEvent","_wxMenuEvent",0},
+    { "_wxClientDC","_class_wxClientDC",0},
+    { "_wxMouseEvent","_class_wxMouseEvent",0},
+    { "_wxListCtrl","_class_wxListCtrl",0},
+    { "_class_wxPoint","_wxPoint",0},
+    { "_wxRealPoint","_class_wxRealPoint",0},
+    { "_class_wxRadioBox","_wxRadioBox",0},
+    { "_signed_short","_WXTYPE",0},
+    { "_signed_short","_short",0},
+    { "_wxMemoryDC","_class_wxMemoryDC",0},
+    { "_wxPaintDC","_class_wxPaintDC",0},
+    { "_class_wxWindowDC","_wxWindowDC",0},
+    { "_class_wxFocusEvent","_wxFocusEvent",0},
+    { "_class_wxMaximizeEvent","_wxMaximizeEvent",0},
+    { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
+    { "_class_wxCursor","_wxCursor",0},
+    { "_wxScrolledWindow","_class_wxScrolledWindow",0},
+    { "_wxTreeItemId","_class_wxTreeItemId",0},
+    { "_unsigned_char","_byte",0},
+    { "_class_wxMetaFileDC","_wxMetaFileDC",0},
+    { "_class_wxMenu","_wxMenu",0},
+    { "_wxControl","_class_wxTreeCtrl",SwigwxTreeCtrlTowxControl},
+    { "_wxControl","_wxTreeCtrl",SwigwxTreeCtrlTowxControl},
+    { "_wxControl","_class_wxListCtrl",SwigwxListCtrlTowxControl},
+    { "_wxControl","_wxListCtrl",SwigwxListCtrlTowxControl},
+    { "_wxControl","_class_wxControl",0},
+    { "_class_wxListBox","_wxListBox",0},
+    { "_unsigned_int","_wxPrintQuality",0},
+    { "_unsigned_int","_size_t",0},
+    { "_unsigned_int","_uint",0},
+    { "_unsigned_int","_wxWindowID",0},
+    { "_unsigned_int","_int",0},
+    { "_wxIcon","_class_wxIcon",0},
+    { "_wxDialog","_class_wxDialog",0},
+    { "_class_wxListItem","_wxListItem",0},
+    { "_class_wxPen","_wxPen",0},
+    { "_short","_WXTYPE",0},
+    { "_short","_unsigned_short",0},
+    { "_short","_signed_short",0},
+    { "_class_wxStaticBox","_wxStaticBox",0},
+    { "_class_wxScrollEvent","_wxScrollEvent",0},
+    { "_wxJoystickEvent","_class_wxJoystickEvent",0},
+    { "_class_wxChoice","_wxChoice",0},
+    { "_class_wxSlider","_wxSlider",0},
+    { "_class_wxImageList","_wxImageList",0},
+    { "_class_wxBitmapButton","_wxBitmapButton",0},
+    { "_wxWindowID","_wxPrintQuality",0},
+    { "_wxWindowID","_size_t",0},
+    { "_wxWindowID","_EBool",0},
+    { "_wxWindowID","_uint",0},
+    { "_wxWindowID","_int",0},
+    { "_wxWindowID","_signed_int",0},
+    { "_wxWindowID","_unsigned_int",0},
+    { "_int","_wxPrintQuality",0},
+    { "_int","_size_t",0},
+    { "_int","_EBool",0},
+    { "_int","_uint",0},
+    { "_int","_wxWindowID",0},
+    { "_int","_unsigned_int",0},
+    { "_int","_signed_int",0},
+    { "_class_wxMouseEvent","_wxMouseEvent",0},
+    { "_class_wxListEvent","_wxListEvent",0},
+    { "_class_wxSpinEvent","_wxSpinEvent",0},
+    { "_wxButton","_class_wxButton",0},
+    { "_wxSize","_class_wxSize",0},
+    { "_wxRegionIterator","_class_wxRegionIterator",0},
+    { "_class_wxPrinterDC","_wxPrinterDC",0},
+    { "_wxPyTreeItemData","_class_wxPyTreeItemData",0},
+    { "_class_wxPaintDC","_wxPaintDC",0},
+    { "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0},
+    { "_class_wxInitDialogEvent","_wxInitDialogEvent",0},
+    { "_class_wxComboBox","_wxComboBox",0},
+    { "_class_wxRadioButton","_wxRadioButton",0},
+    { "_class_wxTreeItemId","_wxTreeItemId",0},
+    { "_wxTreeCtrl","_class_wxTreeCtrl",0},
+    { "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
+    { "_wxIconizeEvent","_class_wxIconizeEvent",0},
+    { "_class_wxControl","_class_wxTreeCtrl",SwigwxTreeCtrlTowxControl},
+    { "_class_wxControl","_wxTreeCtrl",SwigwxTreeCtrlTowxControl},
+    { "_class_wxControl","_class_wxListCtrl",SwigwxListCtrlTowxControl},
+    { "_class_wxControl","_wxListCtrl",SwigwxListCtrlTowxControl},
+    { "_class_wxControl","_wxControl",0},
+    { "_wxStaticBitmap","_class_wxStaticBitmap",0},
+    { "_class_wxIcon","_wxIcon",0},
+    { "_class_wxColour","_wxColour",0},
+    { "_class_wxScreenDC","_wxScreenDC",0},
+    { "_wxPalette","_class_wxPalette",0},
+    { "_class_wxIdleEvent","_wxIdleEvent",0},
+    { "_wxEraseEvent","_class_wxEraseEvent",0},
+    { "_class_wxJoystickEvent","_wxJoystickEvent",0},
+    { "_wxRegion","_class_wxRegion",0},
+    { "_class_wxShowEvent","_wxShowEvent",0},
+    { "_wxActivateEvent","_class_wxActivateEvent",0},
+    { "_wxGauge","_class_wxGauge",0},
+    { "_class_wxCheckListBox","_wxCheckListBox",0},
+    { "_class_wxCommandEvent","_class_wxTreeEvent",SwigwxTreeEventTowxCommandEvent},
+    { "_class_wxCommandEvent","_wxTreeEvent",SwigwxTreeEventTowxCommandEvent},
+    { "_class_wxCommandEvent","_class_wxListEvent",SwigwxListEventTowxCommandEvent},
+    { "_class_wxCommandEvent","_wxListEvent",SwigwxListEventTowxCommandEvent},
+    { "_class_wxCommandEvent","_wxCommandEvent",0},
+    { "_class_wxClientDC","_wxClientDC",0},
+    { "_class_wxSizeEvent","_wxSizeEvent",0},
+    { "_class_wxListCtrl","_wxListCtrl",0},
+    { "_class_wxSize","_wxSize",0},
+    { "_class_wxBitmap","_wxBitmap",0},
+    { "_class_wxMemoryDC","_wxMemoryDC",0},
+    { "_wxMenuBar","_class_wxMenuBar",0},
+    { "_wxTreeEvent","_class_wxTreeEvent",0},
+    { "_wxEvtHandler","_class_wxTreeCtrl",SwigwxTreeCtrlTowxEvtHandler},
+    { "_wxEvtHandler","_wxTreeCtrl",SwigwxTreeCtrlTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxListCtrl",SwigwxListCtrlTowxEvtHandler},
+    { "_wxEvtHandler","_wxListCtrl",SwigwxListCtrlTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxEvtHandler",0},
+    { "_wxMenuItem","_class_wxMenuItem",0},
+    { "_class_wxScrollBar","_wxScrollBar",0},
+    { "_wxDash","_unsigned_long",0},
+    { "_wxDash","_long",0},
+    { "_class_wxScrolledWindow","_wxScrolledWindow",0},
+    { "_wxKeyEvent","_class_wxKeyEvent",0},
+    { "_wxMoveEvent","_class_wxMoveEvent",0},
+    { "_class_wxPalette","_wxPalette",0},
+    { "_class_wxEraseEvent","_wxEraseEvent",0},
+    { "_wxWindow","_class_wxTreeCtrl",SwigwxTreeCtrlTowxWindow},
+    { "_wxWindow","_wxTreeCtrl",SwigwxTreeCtrlTowxWindow},
+    { "_wxWindow","_class_wxListCtrl",SwigwxListCtrlTowxWindow},
+    { "_wxWindow","_wxListCtrl",SwigwxListCtrlTowxWindow},
+    { "_wxWindow","_class_wxWindow",0},
+{0,0,0}};
+

 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif
 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif

-SWIGEXPORT(void,initcontrols2c)() {
+SWIGEXPORT(void) initcontrols2c() {

         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("controls2c", controls2cMethods);
         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("controls2c", controls2cMethods);


@@ -5350,292 +5974,9 @@ SWIGEXPORT(void,initcontrols2c)() {
         PyDict_SetItemString(d,"wxLIST_FIND_DOWN", PyInt_FromLong((long) wxLIST_FIND_DOWN));
         PyDict_SetItemString(d,"wxLIST_FIND_LEFT", PyInt_FromLong((long) wxLIST_FIND_LEFT));
         PyDict_SetItemString(d,"wxLIST_FIND_RIGHT", PyInt_FromLong((long) wxLIST_FIND_RIGHT));
         PyDict_SetItemString(d,"wxLIST_FIND_DOWN", PyInt_FromLong((long) wxLIST_FIND_DOWN));
         PyDict_SetItemString(d,"wxLIST_FIND_LEFT", PyInt_FromLong((long) wxLIST_FIND_LEFT));
         PyDict_SetItemString(d,"wxLIST_FIND_RIGHT", PyInt_FromLong((long) wxLIST_FIND_RIGHT));

-/*
- * These are the pointer type-equivalency mappings. 
- * (Used by the SWIG pointer type-checker).
- */
-        SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_wxEvent","_class_wxTreeEvent",SwigwxTreeEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_wxTreeEvent",SwigwxTreeEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_class_wxListEvent",SwigwxListEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_wxListEvent",SwigwxListEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_class_wxEvent",0);
-        SWIG_RegisterMapping("_class_wxActivateEvent","_wxActivateEvent",0);
-        SWIG_RegisterMapping("_signed_long","_long",0);
-        SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_signed_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_unsigned_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_wxWindowID",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_uint",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_EBool",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_size_t",0);
-        SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
-        SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
-        SWIG_RegisterMapping("_class_wxPyTreeItemData","_wxPyTreeItemData",0);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxTreeCtrl",SwigwxTreeCtrlTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxTreeCtrl",SwigwxTreeCtrlTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxListCtrl",SwigwxListCtrlTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxListCtrl",SwigwxListCtrlTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxEvtHandler",0);
-        SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
-        SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
-        SWIG_RegisterMapping("_wxNotifyEvent","_class_wxTreeEvent",SwigwxTreeEventTowxNotifyEvent);
-        SWIG_RegisterMapping("_wxNotifyEvent","_wxTreeEvent",SwigwxTreeEventTowxNotifyEvent);
-        SWIG_RegisterMapping("_wxNotifyEvent","_class_wxNotifyEvent",0);
-        SWIG_RegisterMapping("_class_wxTreeCtrl","_wxTreeCtrl",0);
-        SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
-        SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
-        SWIG_RegisterMapping("_wxUpdateUIEvent","_class_wxUpdateUIEvent",0);
-        SWIG_RegisterMapping("_byte","_unsigned_char",0);
-        SWIG_RegisterMapping("_wxStaticBox","_class_wxStaticBox",0);
-        SWIG_RegisterMapping("_wxChoice","_class_wxChoice",0);
-        SWIG_RegisterMapping("_wxSlider","_class_wxSlider",0);
-        SWIG_RegisterMapping("_long","_wxDash",0);
-        SWIG_RegisterMapping("_long","_unsigned_long",0);
-        SWIG_RegisterMapping("_long","_signed_long",0);
-        SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0);
-        SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0);
-        SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_class_wxGauge","_wxGauge",0);
-        SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
-        SWIG_RegisterMapping("_wxListEvent","_class_wxListEvent",0);
-        SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0);
-        SWIG_RegisterMapping("_size_t","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_size_t","_unsigned_int",0);
-        SWIG_RegisterMapping("_size_t","_int",0);
-        SWIG_RegisterMapping("_size_t","_wxWindowID",0);
-        SWIG_RegisterMapping("_size_t","_uint",0);
-        SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
-        SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0);
-        SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0);
-        SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0);
-        SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0);
-        SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);
-        SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
-        SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
-        SWIG_RegisterMapping("_wxPyEvent","_class_wxPyEvent",0);
-        SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);
-        SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
-        SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0);
-        SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
-        SWIG_RegisterMapping("_class_wxDialog","_wxDialog",0);
-        SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0);
-        SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0);
-        SWIG_RegisterMapping("_wxStaticLine","_class_wxStaticLine",0);
-        SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
-        SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0);
-        SWIG_RegisterMapping("_uint","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_uint","_size_t",0);
-        SWIG_RegisterMapping("_uint","_unsigned_int",0);
-        SWIG_RegisterMapping("_uint","_int",0);
-        SWIG_RegisterMapping("_uint","_wxWindowID",0);
-        SWIG_RegisterMapping("_class_wxEvent","_class_wxTreeEvent",SwigwxTreeEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxTreeEvent",SwigwxTreeEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_class_wxListEvent",SwigwxListEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxListEvent",SwigwxListEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxEvent",0);
-        SWIG_RegisterMapping("_wxCheckListBox","_class_wxCheckListBox",0);
-        SWIG_RegisterMapping("_wxRect","_class_wxRect",0);
-        SWIG_RegisterMapping("_wxCommandEvent","_class_wxTreeEvent",SwigwxTreeEventTowxCommandEvent);
-        SWIG_RegisterMapping("_wxCommandEvent","_wxTreeEvent",SwigwxTreeEventTowxCommandEvent);
-        SWIG_RegisterMapping("_wxCommandEvent","_class_wxListEvent",SwigwxListEventTowxCommandEvent);
-        SWIG_RegisterMapping("_wxCommandEvent","_wxListEvent",SwigwxListEventTowxCommandEvent);
-        SWIG_RegisterMapping("_wxCommandEvent","_class_wxCommandEvent",0);
-        SWIG_RegisterMapping("_wxSizeEvent","_class_wxSizeEvent",0);
-        SWIG_RegisterMapping("_wxPoint","_class_wxPoint",0);
-        SWIG_RegisterMapping("_class_wxButton","_wxButton",0);
-        SWIG_RegisterMapping("_wxRadioBox","_class_wxRadioBox",0);
-        SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
-        SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0);
-        SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0);
-        SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0);
-        SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_class_wxNotifyEvent","_class_wxTreeEvent",SwigwxTreeEventTowxNotifyEvent);
-        SWIG_RegisterMapping("_class_wxNotifyEvent","_wxTreeEvent",SwigwxTreeEventTowxNotifyEvent);
-        SWIG_RegisterMapping("_class_wxNotifyEvent","_wxNotifyEvent",0);
-        SWIG_RegisterMapping("_class_wxPyEvent","_wxPyEvent",0);
-        SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
-        SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
-        SWIG_RegisterMapping("_wxListItem","_class_wxListItem",0);
-        SWIG_RegisterMapping("_class_wxStaticLine","_wxStaticLine",0);
-        SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0);
-        SWIG_RegisterMapping("_EBool","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_EBool","_signed_int",0);
-        SWIG_RegisterMapping("_EBool","_int",0);
-        SWIG_RegisterMapping("_EBool","_wxWindowID",0);
-        SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
-        SWIG_RegisterMapping("_class_wxDropFilesEvent","_wxDropFilesEvent",0);
-        SWIG_RegisterMapping("_wxStaticText","_class_wxStaticText",0);
-        SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
-        SWIG_RegisterMapping("_wxCloseEvent","_class_wxCloseEvent",0);
-        SWIG_RegisterMapping("_unsigned_long","_wxDash",0);
-        SWIG_RegisterMapping("_unsigned_long","_long",0);
-        SWIG_RegisterMapping("_class_wxRect","_wxRect",0);
-        SWIG_RegisterMapping("_class_wxDC","_wxDC",0);
-        SWIG_RegisterMapping("_class_wxTreeEvent","_wxTreeEvent",0);
-        SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxFocusEvent","_class_wxFocusEvent",0);
-        SWIG_RegisterMapping("_wxMaximizeEvent","_class_wxMaximizeEvent",0);
-        SWIG_RegisterMapping("_class_wxSpinButton","_wxSpinButton",0);
-        SWIG_RegisterMapping("_wxAcceleratorEntry","_class_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_class_wxPanel","_wxPanel",0);
-        SWIG_RegisterMapping("_class_wxCheckBox","_wxCheckBox",0);
-        SWIG_RegisterMapping("_wxComboBox","_class_wxComboBox",0);
-        SWIG_RegisterMapping("_wxRadioButton","_class_wxRadioButton",0);
-        SWIG_RegisterMapping("_signed_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_signed_int","_EBool",0);
-        SWIG_RegisterMapping("_signed_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_signed_int","_int",0);
-        SWIG_RegisterMapping("_class_wxTextCtrl","_wxTextCtrl",0);
-        SWIG_RegisterMapping("_wxLayoutConstraints","_class_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_wxMetaFileDC","_class_wxMetaFileDC",0);
-        SWIG_RegisterMapping("_wxMenu","_class_wxMenu",0);
-        SWIG_RegisterMapping("_class_wxMoveEvent","_wxMoveEvent",0);
-        SWIG_RegisterMapping("_wxListBox","_class_wxListBox",0);
-        SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0);
-        SWIG_RegisterMapping("_WXTYPE","_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_signed_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_unsigned_short",0);
-        SWIG_RegisterMapping("_class_wxBrush","_wxBrush",0);
-        SWIG_RegisterMapping("_unsigned_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_unsigned_short","_short",0);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxTreeCtrl",SwigwxTreeCtrlTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxTreeCtrl",SwigwxTreeCtrlTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxListCtrl",SwigwxListCtrlTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxListCtrl",SwigwxListCtrlTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxWindow",0);
-        SWIG_RegisterMapping("_class_wxStaticText","_wxStaticText",0);
-        SWIG_RegisterMapping("_class_wxFont","_wxFont",0);
-        SWIG_RegisterMapping("_class_wxCloseEvent","_wxCloseEvent",0);
-        SWIG_RegisterMapping("_class_wxMenuEvent","_wxMenuEvent",0);
-        SWIG_RegisterMapping("_wxClientDC","_class_wxClientDC",0);
-        SWIG_RegisterMapping("_wxMouseEvent","_class_wxMouseEvent",0);
-        SWIG_RegisterMapping("_wxListCtrl","_class_wxListCtrl",0);
-        SWIG_RegisterMapping("_class_wxPoint","_wxPoint",0);
-        SWIG_RegisterMapping("_wxRealPoint","_class_wxRealPoint",0);
-        SWIG_RegisterMapping("_class_wxRadioBox","_wxRadioBox",0);
-        SWIG_RegisterMapping("_signed_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_signed_short","_short",0);
-        SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0);
-        SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
-        SWIG_RegisterMapping("_class_wxWindowDC","_wxWindowDC",0);
-        SWIG_RegisterMapping("_class_wxFocusEvent","_wxFocusEvent",0);
-        SWIG_RegisterMapping("_class_wxMaximizeEvent","_wxMaximizeEvent",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
-        SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0);
-        SWIG_RegisterMapping("_wxTreeItemId","_class_wxTreeItemId",0);
-        SWIG_RegisterMapping("_unsigned_char","_byte",0);
-        SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0);
-        SWIG_RegisterMapping("_class_wxMenu","_wxMenu",0);
-        SWIG_RegisterMapping("_wxControl","_class_wxTreeCtrl",SwigwxTreeCtrlTowxControl);
-        SWIG_RegisterMapping("_wxControl","_wxTreeCtrl",SwigwxTreeCtrlTowxControl);
-        SWIG_RegisterMapping("_wxControl","_class_wxListCtrl",SwigwxListCtrlTowxControl);
-        SWIG_RegisterMapping("_wxControl","_wxListCtrl",SwigwxListCtrlTowxControl);
-        SWIG_RegisterMapping("_wxControl","_class_wxControl",0);
-        SWIG_RegisterMapping("_class_wxListBox","_wxListBox",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_unsigned_int","_size_t",0);
-        SWIG_RegisterMapping("_unsigned_int","_uint",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_unsigned_int","_int",0);
-        SWIG_RegisterMapping("_wxIcon","_class_wxIcon",0);
-        SWIG_RegisterMapping("_wxDialog","_class_wxDialog",0);
-        SWIG_RegisterMapping("_class_wxListItem","_wxListItem",0);
-        SWIG_RegisterMapping("_class_wxPen","_wxPen",0);
-        SWIG_RegisterMapping("_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_short","_unsigned_short",0);
-        SWIG_RegisterMapping("_short","_signed_short",0);
-        SWIG_RegisterMapping("_class_wxStaticBox","_wxStaticBox",0);
-        SWIG_RegisterMapping("_class_wxScrollEvent","_wxScrollEvent",0);
-        SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0);
-        SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
-        SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);
-        SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0);
-        SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
-        SWIG_RegisterMapping("_wxWindowID","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_wxWindowID","_size_t",0);
-        SWIG_RegisterMapping("_wxWindowID","_EBool",0);
-        SWIG_RegisterMapping("_wxWindowID","_uint",0);
-        SWIG_RegisterMapping("_wxWindowID","_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_signed_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_int","_size_t",0);
-        SWIG_RegisterMapping("_int","_EBool",0);
-        SWIG_RegisterMapping("_int","_uint",0);
-        SWIG_RegisterMapping("_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_int","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_signed_int",0);
-        SWIG_RegisterMapping("_class_wxMouseEvent","_wxMouseEvent",0);
-        SWIG_RegisterMapping("_class_wxListEvent","_wxListEvent",0);
-        SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0);
-        SWIG_RegisterMapping("_wxButton","_class_wxButton",0);
-        SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
-        SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
-        SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
-        SWIG_RegisterMapping("_wxPyTreeItemData","_class_wxPyTreeItemData",0);
-        SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
-        SWIG_RegisterMapping("_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0);
-        SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0);
-        SWIG_RegisterMapping("_class_wxComboBox","_wxComboBox",0);
-        SWIG_RegisterMapping("_class_wxRadioButton","_wxRadioButton",0);
-        SWIG_RegisterMapping("_class_wxTreeItemId","_wxTreeItemId",0);
-        SWIG_RegisterMapping("_wxTreeCtrl","_class_wxTreeCtrl",0);
-        SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_wxIconizeEvent","_class_wxIconizeEvent",0);
-        SWIG_RegisterMapping("_class_wxControl","_class_wxTreeCtrl",SwigwxTreeCtrlTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_wxTreeCtrl",SwigwxTreeCtrlTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_class_wxListCtrl",SwigwxListCtrlTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_wxListCtrl",SwigwxListCtrlTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_wxControl",0);
-        SWIG_RegisterMapping("_wxStaticBitmap","_class_wxStaticBitmap",0);
-        SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
-        SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
-        SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
-        SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
-        SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0);
-        SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
-        SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
-        SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
-        SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
-        SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
-        SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0);
-        SWIG_RegisterMapping("_class_wxCheckListBox","_wxCheckListBox",0);
-        SWIG_RegisterMapping("_class_wxCommandEvent","_class_wxTreeEvent",SwigwxTreeEventTowxCommandEvent);
-        SWIG_RegisterMapping("_class_wxCommandEvent","_wxTreeEvent",SwigwxTreeEventTowxCommandEvent);
-        SWIG_RegisterMapping("_class_wxCommandEvent","_class_wxListEvent",SwigwxListEventTowxCommandEvent);
-        SWIG_RegisterMapping("_class_wxCommandEvent","_wxListEvent",SwigwxListEventTowxCommandEvent);
-        SWIG_RegisterMapping("_class_wxCommandEvent","_wxCommandEvent",0);
-        SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
-        SWIG_RegisterMapping("_class_wxSizeEvent","_wxSizeEvent",0);
-        SWIG_RegisterMapping("_class_wxListCtrl","_wxListCtrl",0);
-        SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
-        SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0);
-        SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0);
-        SWIG_RegisterMapping("_wxMenuBar","_class_wxMenuBar",0);
-        SWIG_RegisterMapping("_wxTreeEvent","_class_wxTreeEvent",0);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxTreeCtrl",SwigwxTreeCtrlTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxTreeCtrl",SwigwxTreeCtrlTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxListCtrl",SwigwxListCtrlTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxListCtrl",SwigwxListCtrlTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxEvtHandler",0);
-        SWIG_RegisterMapping("_wxMenuItem","_class_wxMenuItem",0);
-        SWIG_RegisterMapping("_class_wxScrollBar","_wxScrollBar",0);
-        SWIG_RegisterMapping("_wxDash","_unsigned_long",0);
-        SWIG_RegisterMapping("_wxDash","_long",0);
-        SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
-        SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0);
-        SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0);
-        SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
-        SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0);
-        SWIG_RegisterMapping("_wxWindow","_class_wxTreeCtrl",SwigwxTreeCtrlTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxTreeCtrl",SwigwxTreeCtrlTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxListCtrl",SwigwxListCtrlTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxListCtrl",SwigwxListCtrlTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxWindow",0);
+{
+   int i;
+   for (i = 0; _swig_mapping[i].n1; i++)
+        SWIG_RegisterMapping(_swig_mapping[i].n1,_swig_mapping[i].n2,_swig_mapping[i].pcnv);
+}

 }
 }

diff --git a/utils/wxPython/src/msw/controls2.py b/utils/wxPython/src/msw/controls2.py
index 57e57efdec753b6b443c0a44c7eb587cfa452166..fb88b400afe3432a58fcd572d58856e6b7a5a20b 100644 (file)
--- a/utils/wxPython/src/msw/controls2.py
+++ b/utils/wxPython/src/msw/controls2.py
@@ -15,68 +15,68 @@ class wxListItemPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self, controls2c=controls2c):
+    def __del__(self,controls2c=controls2c):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            controls2c.delete_wxListItem(self.this)
+            controls2c.delete_wxListItem(self)

     def __setattr__(self,name,value):
         if name == "m_mask" :
     def __setattr__(self,name,value):
         if name == "m_mask" :

-            controls2c.wxListItem_m_mask_set(self.this,value)
+            controls2c.wxListItem_m_mask_set(self,value)

             return
         if name == "m_itemId" :
             return
         if name == "m_itemId" :

-            controls2c.wxListItem_m_itemId_set(self.this,value)
+            controls2c.wxListItem_m_itemId_set(self,value)

             return
         if name == "m_col" :
             return
         if name == "m_col" :

-            controls2c.wxListItem_m_col_set(self.this,value)
+            controls2c.wxListItem_m_col_set(self,value)

             return
         if name == "m_state" :
             return
         if name == "m_state" :

-            controls2c.wxListItem_m_state_set(self.this,value)
+            controls2c.wxListItem_m_state_set(self,value)

             return
         if name == "m_stateMask" :
             return
         if name == "m_stateMask" :

-            controls2c.wxListItem_m_stateMask_set(self.this,value)
+            controls2c.wxListItem_m_stateMask_set(self,value)

             return
         if name == "m_text" :
             return
         if name == "m_text" :

-            controls2c.wxListItem_m_text_set(self.this,value)
+            controls2c.wxListItem_m_text_set(self,value)

             return
         if name == "m_image" :
             return
         if name == "m_image" :

-            controls2c.wxListItem_m_image_set(self.this,value)
+            controls2c.wxListItem_m_image_set(self,value)

             return
         if name == "m_data" :
             return
         if name == "m_data" :

-            controls2c.wxListItem_m_data_set(self.this,value)
+            controls2c.wxListItem_m_data_set(self,value)

             return
         if name == "m_format" :
             return
         if name == "m_format" :

-            controls2c.wxListItem_m_format_set(self.this,value)
+            controls2c.wxListItem_m_format_set(self,value)

             return
         if name == "m_width" :
             return
         if name == "m_width" :

-            controls2c.wxListItem_m_width_set(self.this,value)
+            controls2c.wxListItem_m_width_set(self,value)

             return
         self.__dict__[name] = value
     def __getattr__(self,name):
         if name == "m_mask" : 
             return
         self.__dict__[name] = value
     def __getattr__(self,name):
         if name == "m_mask" : 

-            return controls2c.wxListItem_m_mask_get(self.this)
+            return controls2c.wxListItem_m_mask_get(self)

         if name == "m_itemId" : 
         if name == "m_itemId" : 

-            return controls2c.wxListItem_m_itemId_get(self.this)
+            return controls2c.wxListItem_m_itemId_get(self)

         if name == "m_col" : 
         if name == "m_col" : 

-            return controls2c.wxListItem_m_col_get(self.this)
+            return controls2c.wxListItem_m_col_get(self)

         if name == "m_state" : 
         if name == "m_state" : 

-            return controls2c.wxListItem_m_state_get(self.this)
+            return controls2c.wxListItem_m_state_get(self)

         if name == "m_stateMask" : 
         if name == "m_stateMask" : 

-            return controls2c.wxListItem_m_stateMask_get(self.this)
+            return controls2c.wxListItem_m_stateMask_get(self)

         if name == "m_text" : 
         if name == "m_text" : 

-            return controls2c.wxListItem_m_text_get(self.this)
+            return controls2c.wxListItem_m_text_get(self)

         if name == "m_image" : 
         if name == "m_image" : 

-            return controls2c.wxListItem_m_image_get(self.this)
+            return controls2c.wxListItem_m_image_get(self)

         if name == "m_data" : 
         if name == "m_data" : 

-            return controls2c.wxListItem_m_data_get(self.this)
+            return controls2c.wxListItem_m_data_get(self)

         if name == "m_format" : 
         if name == "m_format" : 

-            return controls2c.wxListItem_m_format_get(self.this)
+            return controls2c.wxListItem_m_format_get(self)

         if name == "m_width" : 
         if name == "m_width" : 

-            return controls2c.wxListItem_m_width_get(self.this)
+            return controls2c.wxListItem_m_width_get(self)

         raise AttributeError,name
     def __repr__(self):
         raise AttributeError,name
     def __repr__(self):

-        return "<C wxListItem instance>"
+        return "<C wxListItem instance at %s>" % (self.this,)

 class wxListItem(wxListItemPtr):
 class wxListItem(wxListItemPtr):

-    def __init__(self) :
-        self.this = controls2c.new_wxListItem()
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controls2c.new_wxListItem,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -88,45 +88,45 @@ class wxListEventPtr(wxCommandEventPtr):
         self.thisown = 0
     def __setattr__(self,name,value):
         if name == "m_code" :
         self.thisown = 0
     def __setattr__(self,name,value):
         if name == "m_code" :

-            controls2c.wxListEvent_m_code_set(self.this,value)
+            controls2c.wxListEvent_m_code_set(self,value)

             return
         if name == "m_itemIndex" :
             return
         if name == "m_itemIndex" :

-            controls2c.wxListEvent_m_itemIndex_set(self.this,value)
+            controls2c.wxListEvent_m_itemIndex_set(self,value)

             return
         if name == "m_oldItemIndex" :
             return
         if name == "m_oldItemIndex" :

-            controls2c.wxListEvent_m_oldItemIndex_set(self.this,value)
+            controls2c.wxListEvent_m_oldItemIndex_set(self,value)

             return
         if name == "m_col" :
             return
         if name == "m_col" :

-            controls2c.wxListEvent_m_col_set(self.this,value)
+            controls2c.wxListEvent_m_col_set(self,value)

             return
         if name == "m_cancelled" :
             return
         if name == "m_cancelled" :

-            controls2c.wxListEvent_m_cancelled_set(self.this,value)
+            controls2c.wxListEvent_m_cancelled_set(self,value)

             return
         if name == "m_pointDrag" :
             return
         if name == "m_pointDrag" :

-            controls2c.wxListEvent_m_pointDrag_set(self.this,value.this)
+            controls2c.wxListEvent_m_pointDrag_set(self,value.this)

             return
         if name == "m_item" :
             return
         if name == "m_item" :

-            controls2c.wxListEvent_m_item_set(self.this,value.this)
+            controls2c.wxListEvent_m_item_set(self,value.this)

             return
         self.__dict__[name] = value
     def __getattr__(self,name):
         if name == "m_code" : 
             return
         self.__dict__[name] = value
     def __getattr__(self,name):
         if name == "m_code" : 

-            return controls2c.wxListEvent_m_code_get(self.this)
+            return controls2c.wxListEvent_m_code_get(self)

         if name == "m_itemIndex" : 
         if name == "m_itemIndex" : 

-            return controls2c.wxListEvent_m_itemIndex_get(self.this)
+            return controls2c.wxListEvent_m_itemIndex_get(self)

         if name == "m_oldItemIndex" : 
         if name == "m_oldItemIndex" : 

-            return controls2c.wxListEvent_m_oldItemIndex_get(self.this)
+            return controls2c.wxListEvent_m_oldItemIndex_get(self)

         if name == "m_col" : 
         if name == "m_col" : 

-            return controls2c.wxListEvent_m_col_get(self.this)
+            return controls2c.wxListEvent_m_col_get(self)

         if name == "m_cancelled" : 
         if name == "m_cancelled" : 

-            return controls2c.wxListEvent_m_cancelled_get(self.this)
+            return controls2c.wxListEvent_m_cancelled_get(self)

         if name == "m_pointDrag" : 
         if name == "m_pointDrag" : 

-            return wxPointPtr(controls2c.wxListEvent_m_pointDrag_get(self.this))
+            return wxPointPtr(controls2c.wxListEvent_m_pointDrag_get(self))

         if name == "m_item" : 
         if name == "m_item" : 

-            return wxListItemPtr(controls2c.wxListEvent_m_item_get(self.this))
+            return wxListItemPtr(controls2c.wxListEvent_m_item_get(self))

         raise AttributeError,name
     def __repr__(self):
         raise AttributeError,name
     def __repr__(self):

-        return "<C wxListEvent instance>"
+        return "<C wxListEvent instance at %s>" % (self.this,)

 class wxListEvent(wxListEventPtr):
     def __init__(self,this):
         self.this = this
 class wxListEvent(wxListEventPtr):
     def __init__(self,this):
         self.this = this


@@ -138,181 +138,171 @@ class wxListCtrlPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def Arrange(self,*args):
-        val = apply(controls2c.wxListCtrl_Arrange,(self.this,)+args)
+    def Arrange(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_Arrange,(self,) + _args, _kwargs)

         return val
         return val

-    def DeleteItem(self,arg0):
-        val = controls2c.wxListCtrl_DeleteItem(self.this,arg0)
+    def DeleteItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_DeleteItem,(self,) + _args, _kwargs)

         return val
         return val

-    def DeleteAllItems(self):
-        val = controls2c.wxListCtrl_DeleteAllItems(self.this)
+    def DeleteAllItems(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_DeleteAllItems,(self,) + _args, _kwargs)

         return val
         return val

-    def DeleteColumn(self,arg0):
-        val = controls2c.wxListCtrl_DeleteColumn(self.this,arg0)
+    def DeleteColumn(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_DeleteColumn,(self,) + _args, _kwargs)

         return val
         return val

-    def DeleteAllColumns(self):
-        val = controls2c.wxListCtrl_DeleteAllColumns(self.this)
+    def DeleteAllColumns(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_DeleteAllColumns,(self,) + _args, _kwargs)

         return val
         return val

-    def ClearAll(self):
-        val = controls2c.wxListCtrl_ClearAll(self.this)
+    def ClearAll(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_ClearAll,(self,) + _args, _kwargs)

         return val
         return val

-    def EditLabel(self,arg0):
-        val = controls2c.wxListCtrl_EditLabel(self.this,arg0)
-        val = wxTextCtrlPtr(val)
+    def EditLabel(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_EditLabel,(self,) + _args, _kwargs)
+        if val: val = wxTextCtrlPtr(val) 

         return val
         return val

-    def EndEditLabel(self,arg0):
-        val = controls2c.wxListCtrl_EndEditLabel(self.this,arg0)
+    def EndEditLabel(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_EndEditLabel,(self,) + _args, _kwargs)

         return val
         return val

-    def GetEditControl(self):
-        val = controls2c.wxListCtrl_GetEditControl(self.this)
-        val = wxTextCtrlPtr(val)
+    def GetEditControl(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetEditControl,(self,) + _args, _kwargs)
+        if val: val = wxTextCtrlPtr(val) 

         return val
         return val

-    def EnsureVisible(self,arg0):
-        val = controls2c.wxListCtrl_EnsureVisible(self.this,arg0)
+    def EnsureVisible(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_EnsureVisible,(self,) + _args, _kwargs)

         return val
         return val

-    def FindItem(self,arg0,arg1,*args):
-        val = apply(controls2c.wxListCtrl_FindItem,(self.this,arg0,arg1,)+args)
+    def FindItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_FindItem,(self,) + _args, _kwargs)

         return val
         return val

-    def FindItemData(self,arg0,arg1):
-        val = controls2c.wxListCtrl_FindItemData(self.this,arg0,arg1)
+    def FindItemData(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_FindItemData,(self,) + _args, _kwargs)

         return val
         return val

-    def FindItemAtPos(self,arg0,arg1,arg2):
-        val = controls2c.wxListCtrl_FindItemAtPos(self.this,arg0,arg1.this,arg2)
+    def FindItemAtPos(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_FindItemAtPos,(self,) + _args, _kwargs)

         return val
         return val

-    def GetColumn(self,arg0,arg1):
-        val = controls2c.wxListCtrl_GetColumn(self.this,arg0,arg1.this)
+    def GetColumn(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetColumn,(self,) + _args, _kwargs)

         return val
         return val

-    def GetColumnWidth(self,arg0):
-        val = controls2c.wxListCtrl_GetColumnWidth(self.this,arg0)
+    def GetColumnWidth(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetColumnWidth,(self,) + _args, _kwargs)

         return val
         return val

-    def GetCountPerPage(self):
-        val = controls2c.wxListCtrl_GetCountPerPage(self.this)
+    def GetCountPerPage(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetCountPerPage,(self,) + _args, _kwargs)

         return val
         return val

-    def GetImageList(self,arg0):
-        val = controls2c.wxListCtrl_GetImageList(self.this,arg0)
-        val = wxImageListPtr(val)
+    def GetImageList(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetImageList,(self,) + _args, _kwargs)
+        if val: val = wxImageListPtr(val) 

         return val
         return val

-    def GetItemData(self,arg0):
-        val = controls2c.wxListCtrl_GetItemData(self.this,arg0)
+    def GetItemData(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetItemData,(self,) + _args, _kwargs)

         return val
         return val

-    def GetItem(self,arg0):
-        val = controls2c.wxListCtrl_GetItem(self.this,arg0)
-        val = wxListItemPtr(val)
-        val.thisown = 1
+    def GetItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetItem,(self,) + _args, _kwargs)
+        if val: val = wxListItemPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetItemPosition(self,arg0):
-        val = controls2c.wxListCtrl_GetItemPosition(self.this,arg0)
-        val = wxPointPtr(val)
-        val.thisown = 1
+    def GetItemPosition(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetItemPosition,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetItemRect(self,arg0,*args):
-        val = apply(controls2c.wxListCtrl_GetItemRect,(self.this,arg0,)+args)
-        val = wxRectPtr(val)
-        val.thisown = 1
+    def GetItemRect(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetItemRect,(self,) + _args, _kwargs)
+        if val: val = wxRectPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetItemState(self,arg0,arg1):
-        val = controls2c.wxListCtrl_GetItemState(self.this,arg0,arg1)
+    def GetItemState(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetItemState,(self,) + _args, _kwargs)

         return val
         return val

-    def GetItemCount(self):
-        val = controls2c.wxListCtrl_GetItemCount(self.this)
+    def GetItemCount(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetItemCount,(self,) + _args, _kwargs)

         return val
         return val

-    def GetItemSpacing(self,arg0):
-        val = controls2c.wxListCtrl_GetItemSpacing(self.this,arg0)
+    def GetItemSpacing(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetItemSpacing,(self,) + _args, _kwargs)

         return val
         return val

-    def GetItemText(self,arg0):
-        val = controls2c.wxListCtrl_GetItemText(self.this,arg0)
+    def GetItemText(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetItemText,(self,) + _args, _kwargs)

         return val
         return val

-    def GetNextItem(self,arg0,*args):
-        val = apply(controls2c.wxListCtrl_GetNextItem,(self.this,arg0,)+args)
+    def GetNextItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetNextItem,(self,) + _args, _kwargs)

         return val
         return val

-    def GetSelectedItemCount(self):
-        val = controls2c.wxListCtrl_GetSelectedItemCount(self.this)
+    def GetSelectedItemCount(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetSelectedItemCount,(self,) + _args, _kwargs)

         return val
         return val

-    def GetTextColour(self):
-        val = controls2c.wxListCtrl_GetTextColour(self.this)
-        val = wxColourPtr(val)
-        val.thisown = 1
+    def GetTextColour(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetTextColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) ; val.thisown = 1

         return val
         return val

-    def SetTextColour(self,arg0):
-        val = controls2c.wxListCtrl_SetTextColour(self.this,arg0.this)
+    def SetTextColour(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_SetTextColour,(self,) + _args, _kwargs)

         return val
         return val

-    def GetTopItem(self):
-        val = controls2c.wxListCtrl_GetTopItem(self.this)
+    def GetTopItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetTopItem,(self,) + _args, _kwargs)

         return val
         return val

-    def HitTest(self,arg0):
-        val = controls2c.wxListCtrl_HitTest(self.this,arg0.this)
+    def HitTest(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_HitTest,(self,) + _args, _kwargs)

         return val
         return val

-    def InsertColumnWith(self,arg0,arg1):
-        val = controls2c.wxListCtrl_InsertColumnWith(self.this,arg0,arg1.this)
+    def InsertColumnWith(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_InsertColumnWith,(self,) + _args, _kwargs)

         return val
         return val

-    def InsertColumn(self,arg0,arg1,*args):
-        val = apply(controls2c.wxListCtrl_InsertColumn,(self.this,arg0,arg1,)+args)
+    def InsertColumn(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_InsertColumn,(self,) + _args, _kwargs)

         return val
         return val

-    def InsertItem(self,arg0):
-        val = controls2c.wxListCtrl_InsertItem(self.this,arg0.this)
+    def InsertItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_InsertItem,(self,) + _args, _kwargs)

         return val
         return val

-    def InsertStringItem(self,arg0,arg1):
-        val = controls2c.wxListCtrl_InsertStringItem(self.this,arg0,arg1)
+    def InsertStringItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_InsertStringItem,(self,) + _args, _kwargs)

         return val
         return val

-    def InsertImageItem(self,arg0,arg1):
-        val = controls2c.wxListCtrl_InsertImageItem(self.this,arg0,arg1)
+    def InsertImageItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_InsertImageItem,(self,) + _args, _kwargs)

         return val
         return val

-    def InsertImageStringItem(self,arg0,arg1,arg2):
-        val = controls2c.wxListCtrl_InsertImageStringItem(self.this,arg0,arg1,arg2)
+    def InsertImageStringItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_InsertImageStringItem,(self,) + _args, _kwargs)

         return val
         return val

-    def ScrollList(self,arg0,arg1):
-        val = controls2c.wxListCtrl_ScrollList(self.this,arg0,arg1)
+    def ScrollList(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_ScrollList,(self,) + _args, _kwargs)

         return val
         return val

-    def SetBackgroundColour(self,arg0):
-        val = controls2c.wxListCtrl_SetBackgroundColour(self.this,arg0.this)
+    def SetBackgroundColour(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_SetBackgroundColour,(self,) + _args, _kwargs)

         return val
         return val

-    def SetColumn(self,arg0,arg1):
-        val = controls2c.wxListCtrl_SetColumn(self.this,arg0,arg1.this)
+    def SetColumn(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_SetColumn,(self,) + _args, _kwargs)

         return val
         return val

-    def SetColumnWidth(self,arg0,arg1):
-        val = controls2c.wxListCtrl_SetColumnWidth(self.this,arg0,arg1)
+    def SetColumnWidth(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_SetColumnWidth,(self,) + _args, _kwargs)

         return val
         return val

-    def SetImageList(self,arg0,arg1):
-        val = controls2c.wxListCtrl_SetImageList(self.this,arg0.this,arg1)
+    def SetImageList(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_SetImageList,(self,) + _args, _kwargs)

         return val
         return val

-    def SetItem(self,arg0):
-        val = controls2c.wxListCtrl_SetItem(self.this,arg0.this)
+    def SetItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_SetItem,(self,) + _args, _kwargs)

         return val
         return val

-    def SetStringItem(self,arg0,arg1,arg2,*args):
-        val = apply(controls2c.wxListCtrl_SetStringItem,(self.this,arg0,arg1,arg2,)+args)
+    def SetStringItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_SetStringItem,(self,) + _args, _kwargs)

         return val
         return val

-    def SetItemData(self,arg0,arg1):
-        val = controls2c.wxListCtrl_SetItemData(self.this,arg0,arg1)
+    def SetItemData(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_SetItemData,(self,) + _args, _kwargs)

         return val
         return val

-    def SetItemImage(self,arg0,arg1,arg2):
-        val = controls2c.wxListCtrl_SetItemImage(self.this,arg0,arg1,arg2)
+    def SetItemImage(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_SetItemImage,(self,) + _args, _kwargs)

         return val
         return val

-    def SetItemPosition(self,arg0,arg1):
-        val = controls2c.wxListCtrl_SetItemPosition(self.this,arg0,arg1.this)
+    def SetItemPosition(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_SetItemPosition,(self,) + _args, _kwargs)

         return val
         return val

-    def SetItemState(self,arg0,arg1,arg2):
-        val = controls2c.wxListCtrl_SetItemState(self.this,arg0,arg1,arg2)
+    def SetItemState(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_SetItemState,(self,) + _args, _kwargs)

         return val
         return val

-    def SetItemText(self,arg0,arg1):
-        val = controls2c.wxListCtrl_SetItemText(self.this,arg0,arg1)
+    def SetItemText(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_SetItemText,(self,) + _args, _kwargs)

         return val
         return val

-    def SetSingleStyle(self,arg0,*args):
-        val = apply(controls2c.wxListCtrl_SetSingleStyle,(self.this,arg0,)+args)
+    def SetSingleStyle(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_SetSingleStyle,(self,) + _args, _kwargs)

         return val
         return val

-    def SetWindowStyleFlag(self,arg0):
-        val = controls2c.wxListCtrl_SetWindowStyleFlag(self.this,arg0)
+    def SetWindowStyleFlag(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_SetWindowStyleFlag,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxListCtrl instance>"
+        return "<C wxListCtrl instance at %s>" % (self.this,)

 class wxListCtrl(wxListCtrlPtr):
 class wxListCtrl(wxListCtrlPtr):

-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controls2c.new_wxListCtrl,(arg0.this,arg1,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controls2c.new_wxListCtrl,_args,_kwargs)

         self.thisown = 1
         wx._StdWindowCallbacks(self)
 
         self.thisown = 1
         wx._StdWindowCallbacks(self)
 


@@ -323,17 +313,17 @@ class wxTreeItemIdPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self, controls2c=controls2c):
+    def __del__(self,controls2c=controls2c):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            controls2c.delete_wxTreeItemId(self.this)
-    def IsOk(self):
-        val = controls2c.wxTreeItemId_IsOk(self.this)
+            controls2c.delete_wxTreeItemId(self)
+    def IsOk(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeItemId_IsOk,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxTreeItemId instance>"
+        return "<C wxTreeItemId instance at %s>" % (self.this,)

 class wxTreeItemId(wxTreeItemIdPtr):
 class wxTreeItemId(wxTreeItemIdPtr):

-    def __init__(self) :
-        self.this = controls2c.new_wxTreeItemId()
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controls2c.new_wxTreeItemId,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -343,24 +333,24 @@ class wxTreeItemDataPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetData(self):
-        val = controls2c.wxTreeItemData_GetData(self.this)
+    def GetData(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeItemData_GetData,(self,) + _args, _kwargs)

         return val
         return val

-    def SetData(self,arg0):
-        val = controls2c.wxTreeItemData_SetData(self.this,arg0)
+    def SetData(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeItemData_SetData,(self,) + _args, _kwargs)

         return val
         return val

-    def GetId(self):
-        val = controls2c.wxTreeItemData_GetId(self.this)
-        val = wxTreeItemIdPtr(val)
+    def GetId(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeItemData_GetId,(self,) + _args, _kwargs)
+        if val: val = wxTreeItemIdPtr(val) 

         return val
         return val

-    def SetId(self,arg0):
-        val = controls2c.wxTreeItemData_SetId(self.this,arg0.this)
+    def SetId(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeItemData_SetId,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxTreeItemData instance>"
+        return "<C wxTreeItemData instance at %s>" % (self.this,)

 class wxTreeItemData(wxTreeItemDataPtr):
 class wxTreeItemData(wxTreeItemDataPtr):

-    def __init__(self,*args) :
-        self.this = apply(controls2c.new_wxTreeItemData,()+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controls2c.new_wxTreeItemData,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -370,29 +360,26 @@ class wxTreeEventPtr(wxNotifyEventPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetItem(self):
-        val = controls2c.wxTreeEvent_GetItem(self.this)
-        val = wxTreeItemIdPtr(val)
-        val.thisown = 1
+    def GetItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeEvent_GetItem,(self,) + _args, _kwargs)
+        if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetOldItem(self):
-        val = controls2c.wxTreeEvent_GetOldItem(self.this)
-        val = wxTreeItemIdPtr(val)
-        val.thisown = 1
+    def GetOldItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeEvent_GetOldItem,(self,) + _args, _kwargs)
+        if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetPoint(self):
-        val = controls2c.wxTreeEvent_GetPoint(self.this)
-        val = wxPointPtr(val)
-        val.thisown = 1
+    def GetPoint(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeEvent_GetPoint,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetCode(self):
-        val = controls2c.wxTreeEvent_GetCode(self.this)
+    def GetCode(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeEvent_GetCode,(self,) + _args, _kwargs)

         return val
         return val

-    def GetLabel(self):
-        val = controls2c.wxTreeEvent_GetLabel(self.this)
+    def GetLabel(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeEvent_GetLabel,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxTreeEvent instance>"
+        return "<C wxTreeEvent instance at %s>" % (self.this,)

 class wxTreeEvent(wxTreeEventPtr):
     def __init__(self,this):
         self.this = this
 class wxTreeEvent(wxTreeEventPtr):
     def __init__(self,this):
         self.this = this


@@ -404,220 +391,191 @@ class wxTreeCtrlPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetCount(self):
-        val = controls2c.wxTreeCtrl_GetCount(self.this)
+    def GetCount(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetCount,(self,) + _args, _kwargs)

         return val
         return val

-    def GetIndent(self):
-        val = controls2c.wxTreeCtrl_GetIndent(self.this)
+    def GetIndent(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetIndent,(self,) + _args, _kwargs)

         return val
         return val

-    def SetIndent(self,arg0):
-        val = controls2c.wxTreeCtrl_SetIndent(self.this,arg0)
+    def SetIndent(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_SetIndent,(self,) + _args, _kwargs)

         return val
         return val

-    def GetImageList(self):
-        val = controls2c.wxTreeCtrl_GetImageList(self.this)
-        val = wxImageListPtr(val)
+    def GetImageList(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetImageList,(self,) + _args, _kwargs)
+        if val: val = wxImageListPtr(val) 

         return val
         return val

-    def GetStateImageList(self):
-        val = controls2c.wxTreeCtrl_GetStateImageList(self.this)
-        val = wxImageListPtr(val)
+    def GetStateImageList(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetStateImageList,(self,) + _args, _kwargs)
+        if val: val = wxImageListPtr(val) 

         return val
         return val

-    def SetImageList(self,arg0):
-        val = controls2c.wxTreeCtrl_SetImageList(self.this,arg0.this)
+    def SetImageList(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_SetImageList,(self,) + _args, _kwargs)

         return val
         return val

-    def SetStateImageList(self,arg0):
-        val = controls2c.wxTreeCtrl_SetStateImageList(self.this,arg0.this)
+    def SetStateImageList(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_SetStateImageList,(self,) + _args, _kwargs)

         return val
         return val

-    def GetItemText(self,arg0):
-        val = controls2c.wxTreeCtrl_GetItemText(self.this,arg0.this)
+    def GetItemText(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetItemText,(self,) + _args, _kwargs)

         return val
         return val

-    def GetItemImage(self,arg0):
-        val = controls2c.wxTreeCtrl_GetItemImage(self.this,arg0.this)
+    def GetItemImage(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetItemImage,(self,) + _args, _kwargs)

         return val
         return val

-    def GetItemSelectedImage(self,arg0):
-        val = controls2c.wxTreeCtrl_GetItemSelectedImage(self.this,arg0.this)
+    def GetItemSelectedImage(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetItemSelectedImage,(self,) + _args, _kwargs)

         return val
         return val

-    def SetItemText(self,arg0,arg1):
-        val = controls2c.wxTreeCtrl_SetItemText(self.this,arg0.this,arg1)
+    def SetItemText(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_SetItemText,(self,) + _args, _kwargs)

         return val
         return val

-    def SetItemImage(self,arg0,arg1):
-        val = controls2c.wxTreeCtrl_SetItemImage(self.this,arg0.this,arg1)
+    def SetItemImage(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_SetItemImage,(self,) + _args, _kwargs)

         return val
         return val

-    def SetItemSelectedImage(self,arg0,arg1):
-        val = controls2c.wxTreeCtrl_SetItemSelectedImage(self.this,arg0.this,arg1)
+    def SetItemSelectedImage(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_SetItemSelectedImage,(self,) + _args, _kwargs)

         return val
         return val

-    def SetItemHasChildren(self,arg0,*args):
-        val = apply(controls2c.wxTreeCtrl_SetItemHasChildren,(self.this,arg0.this,)+args)
+    def SetItemHasChildren(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_SetItemHasChildren,(self,) + _args, _kwargs)

         return val
         return val

-    def GetItemData(self,arg0):
-        val = controls2c.wxTreeCtrl_GetItemData(self.this,arg0.this)
-        val = wxTreeItemDataPtr(val)
+    def GetItemData(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetItemData,(self,) + _args, _kwargs)
+        if val: val = wxTreeItemDataPtr(val) 

         return val
         return val

-    def SetItemData(self,arg0,arg1):
-        val = controls2c.wxTreeCtrl_SetItemData(self.this,arg0.this,arg1.this)
+    def SetItemData(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_SetItemData,(self,) + _args, _kwargs)

         return val
         return val

-    def GetPyData(self,arg0):
-        val = controls2c.wxTreeCtrl_GetPyData(self.this,arg0.this)
+    def GetPyData(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetPyData,(self,) + _args, _kwargs)

         return val
         return val

-    def SetPyData(self,arg0,arg1):
-        val = controls2c.wxTreeCtrl_SetPyData(self.this,arg0.this,arg1)
+    def SetPyData(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_SetPyData,(self,) + _args, _kwargs)

         return val
         return val

-    def IsVisible(self,arg0):
-        val = controls2c.wxTreeCtrl_IsVisible(self.this,arg0.this)
+    def IsVisible(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_IsVisible,(self,) + _args, _kwargs)

         return val
         return val

-    def ItemHasChildren(self,arg0):
-        val = controls2c.wxTreeCtrl_ItemHasChildren(self.this,arg0.this)
+    def ItemHasChildren(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_ItemHasChildren,(self,) + _args, _kwargs)

         return val
         return val

-    def IsExpanded(self,arg0):
-        val = controls2c.wxTreeCtrl_IsExpanded(self.this,arg0.this)
+    def IsExpanded(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_IsExpanded,(self,) + _args, _kwargs)

         return val
         return val

-    def IsSelected(self,arg0):
-        val = controls2c.wxTreeCtrl_IsSelected(self.this,arg0.this)
+    def IsSelected(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_IsSelected,(self,) + _args, _kwargs)

         return val
         return val

-    def GetRootItem(self):
-        val = controls2c.wxTreeCtrl_GetRootItem(self.this)
-        val = wxTreeItemIdPtr(val)
-        val.thisown = 1
+    def GetRootItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetRootItem,(self,) + _args, _kwargs)
+        if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetSelection(self):
-        val = controls2c.wxTreeCtrl_GetSelection(self.this)
-        val = wxTreeItemIdPtr(val)
-        val.thisown = 1
+    def GetSelection(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetSelection,(self,) + _args, _kwargs)
+        if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetParent(self,arg0):
-        val = controls2c.wxTreeCtrl_GetParent(self.this,arg0.this)
-        val = wxTreeItemIdPtr(val)
-        val.thisown = 1
+    def GetParent(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetParent,(self,) + _args, _kwargs)
+        if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetChildrenCount(self,arg0,*args):
-        val = apply(controls2c.wxTreeCtrl_GetChildrenCount,(self.this,arg0.this,)+args)
+    def GetChildrenCount(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetChildrenCount,(self,) + _args, _kwargs)

         return val
         return val

-    def GetFirstChild(self,arg0,arg1):
-        val = controls2c.wxTreeCtrl_GetFirstChild(self.this,arg0.this,arg1)
+    def GetFirstChild(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetFirstChild,(self,) + _args, _kwargs)

         return val
         return val

-    def GetNextChild(self,arg0,arg1):
-        val = controls2c.wxTreeCtrl_GetNextChild(self.this,arg0.this,arg1)
-        return val
-    def GetNextSibling(self,arg0):
-        val = controls2c.wxTreeCtrl_GetNextSibling(self.this,arg0.this)
-        val = wxTreeItemIdPtr(val)
-        val.thisown = 1
-        return val
-    def GetPrevSibling(self,arg0):
-        val = controls2c.wxTreeCtrl_GetPrevSibling(self.this,arg0.this)
-        val = wxTreeItemIdPtr(val)
-        val.thisown = 1
-        return val
-    def GetFirstVisibleItem(self):
-        val = controls2c.wxTreeCtrl_GetFirstVisibleItem(self.this)
-        val = wxTreeItemIdPtr(val)
-        val.thisown = 1
-        return val
-    def GetNextVisible(self,arg0):
-        val = controls2c.wxTreeCtrl_GetNextVisible(self.this,arg0.this)
-        val = wxTreeItemIdPtr(val)
-        val.thisown = 1
-        return val
-    def GetPrevVisible(self,arg0):
-        val = controls2c.wxTreeCtrl_GetPrevVisible(self.this,arg0.this)
-        val = wxTreeItemIdPtr(val)
-        val.thisown = 1
-        return val
-    def AddRoot(self,arg0,*args):
-        argl = map(None,args)
-        try: argl[2] = argl[2].this
-        except: pass
-        args = tuple(argl)
-        val = apply(controls2c.wxTreeCtrl_AddRoot,(self.this,arg0,)+args)
-        val = wxTreeItemIdPtr(val)
-        val.thisown = 1
-        return val
-    def PrependItem(self,arg0,arg1,*args):
-        argl = map(None,args)
-        try: argl[2] = argl[2].this
-        except: pass
-        args = tuple(argl)
-        val = apply(controls2c.wxTreeCtrl_PrependItem,(self.this,arg0.this,arg1,)+args)
-        val = wxTreeItemIdPtr(val)
-        val.thisown = 1
-        return val
-    def InsertItem(self,arg0,arg1,arg2,*args):
-        argl = map(None,args)
-        try: argl[2] = argl[2].this
-        except: pass
-        args = tuple(argl)
-        val = apply(controls2c.wxTreeCtrl_InsertItem,(self.this,arg0.this,arg1.this,arg2,)+args)
-        val = wxTreeItemIdPtr(val)
-        val.thisown = 1
-        return val
-    def AppendItem(self,arg0,arg1,*args):
-        argl = map(None,args)
-        try: argl[2] = argl[2].this
-        except: pass
-        args = tuple(argl)
-        val = apply(controls2c.wxTreeCtrl_AppendItem,(self.this,arg0.this,arg1,)+args)
-        val = wxTreeItemIdPtr(val)
-        val.thisown = 1
-        return val
-    def Delete(self,arg0):
-        val = controls2c.wxTreeCtrl_Delete(self.this,arg0.this)
-        return val
-    def DeleteChildren(self,arg0):
-        val = controls2c.wxTreeCtrl_DeleteChildren(self.this,arg0.this)
-        return val
-    def DeleteAllItems(self):
-        val = controls2c.wxTreeCtrl_DeleteAllItems(self.this)
-        return val
-    def Expand(self,arg0):
-        val = controls2c.wxTreeCtrl_Expand(self.this,arg0.this)
-        return val
-    def Collapse(self,arg0):
-        val = controls2c.wxTreeCtrl_Collapse(self.this,arg0.this)
-        return val
-    def CollapseAndReset(self,arg0):
-        val = controls2c.wxTreeCtrl_CollapseAndReset(self.this,arg0.this)
-        return val
-    def Toggle(self,arg0):
-        val = controls2c.wxTreeCtrl_Toggle(self.this,arg0.this)
-        return val
-    def Unselect(self):
-        val = controls2c.wxTreeCtrl_Unselect(self.this)
-        return val
-    def UnselectAll(self):
-        val = controls2c.wxTreeCtrl_UnselectAll(self.this)
-        return val
-    def SelectItem(self,arg0):
-        val = controls2c.wxTreeCtrl_SelectItem(self.this,arg0.this)
-        return val
-    def EnsureVisible(self,arg0):
-        val = controls2c.wxTreeCtrl_EnsureVisible(self.this,arg0.this)
-        return val
-    def ScrollTo(self,arg0):
-        val = controls2c.wxTreeCtrl_ScrollTo(self.this,arg0.this)
-        return val
-    def EditLabel(self,arg0):
-        val = controls2c.wxTreeCtrl_EditLabel(self.this,arg0.this)
-        val = wxTextCtrlPtr(val)
-        return val
-    def GetEditControl(self):
-        val = controls2c.wxTreeCtrl_GetEditControl(self.this)
-        val = wxTextCtrlPtr(val)
-        return val
-    def EndEditLabel(self,arg0,*args):
-        val = apply(controls2c.wxTreeCtrl_EndEditLabel,(self.this,arg0.this,)+args)
-        return val
-    def SetItemBold(self,arg0,*args):
-        val = apply(controls2c.wxTreeCtrl_SetItemBold,(self.this,arg0.this,)+args)
-        return val
-    def IsBold(self,arg0):
-        val = controls2c.wxTreeCtrl_IsBold(self.this,arg0.this)
-        return val
-    def HitTest(self,arg0):
-        val = controls2c.wxTreeCtrl_HitTest(self.this,arg0.this)
-        val = wxTreeItemIdPtr(val)
-        val.thisown = 1
+    def GetNextChild(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetNextChild,(self,) + _args, _kwargs)
+        return val
+    def GetNextSibling(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetNextSibling,(self,) + _args, _kwargs)
+        if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1
+        return val
+    def GetPrevSibling(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetPrevSibling,(self,) + _args, _kwargs)
+        if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1
+        return val
+    def GetFirstVisibleItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetFirstVisibleItem,(self,) + _args, _kwargs)
+        if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1
+        return val
+    def GetNextVisible(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetNextVisible,(self,) + _args, _kwargs)
+        if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1
+        return val
+    def GetPrevVisible(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetPrevVisible,(self,) + _args, _kwargs)
+        if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1
+        return val
+    def AddRoot(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_AddRoot,(self,) + _args, _kwargs)
+        if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1
+        return val
+    def PrependItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_PrependItem,(self,) + _args, _kwargs)
+        if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1
+        return val
+    def InsertItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_InsertItem,(self,) + _args, _kwargs)
+        if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1
+        return val
+    def AppendItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_AppendItem,(self,) + _args, _kwargs)
+        if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1
+        return val
+    def Delete(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_Delete,(self,) + _args, _kwargs)
+        return val
+    def DeleteChildren(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_DeleteChildren,(self,) + _args, _kwargs)
+        return val
+    def DeleteAllItems(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_DeleteAllItems,(self,) + _args, _kwargs)
+        return val
+    def Expand(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_Expand,(self,) + _args, _kwargs)
+        return val
+    def Collapse(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_Collapse,(self,) + _args, _kwargs)
+        return val
+    def CollapseAndReset(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_CollapseAndReset,(self,) + _args, _kwargs)
+        return val
+    def Toggle(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_Toggle,(self,) + _args, _kwargs)
+        return val
+    def Unselect(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_Unselect,(self,) + _args, _kwargs)
+        return val
+    def UnselectAll(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_UnselectAll,(self,) + _args, _kwargs)
+        return val
+    def SelectItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_SelectItem,(self,) + _args, _kwargs)
+        return val
+    def EnsureVisible(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_EnsureVisible,(self,) + _args, _kwargs)
+        return val
+    def ScrollTo(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_ScrollTo,(self,) + _args, _kwargs)
+        return val
+    def EditLabel(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_EditLabel,(self,) + _args, _kwargs)
+        if val: val = wxTextCtrlPtr(val) 
+        return val
+    def GetEditControl(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetEditControl,(self,) + _args, _kwargs)
+        if val: val = wxTextCtrlPtr(val) 
+        return val
+    def EndEditLabel(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_EndEditLabel,(self,) + _args, _kwargs)
+        return val
+    def SetItemBold(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_SetItemBold,(self,) + _args, _kwargs)
+        return val
+    def IsBold(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_IsBold,(self,) + _args, _kwargs)
+        return val
+    def HitTest(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_HitTest,(self,) + _args, _kwargs)
+        if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxTreeCtrl instance>"
+        return "<C wxTreeCtrl instance at %s>" % (self.this,)

     
     # Redefine a couple methods that SWIG gets a bit confused on...
     def GetFirstChild(self,arg0,arg1):
     
     # Redefine a couple methods that SWIG gets a bit confused on...
     def GetFirstChild(self,arg0,arg1):


@@ -632,14 +590,8 @@ class wxTreeCtrlPtr(wxControlPtr):
         return (val1,val2)
 
 class wxTreeCtrl(wxTreeCtrlPtr):
         return (val1,val2)
 
 class wxTreeCtrl(wxTreeCtrlPtr):

-    def __init__(self,arg0,*args) :
-        argl = map(None,args)
-        try: argl[1] = argl[1].this
-        except: pass
-        try: argl[2] = argl[2].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controls2c.new_wxTreeCtrl,(arg0.this,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controls2c.new_wxTreeCtrl,_args,_kwargs)

         self.thisown = 1
         wx._StdWindowCallbacks(self)
 
         self.thisown = 1
         wx._StdWindowCallbacks(self)
 

diff --git a/utils/wxPython/src/msw/events.cpp b/utils/wxPython/src/msw/events.cpp
index 0b79879ee8dc495b81961ed38e4cdd26a2cab9c1..cebd498728d99fb15d44b7737cd911ab879363e4 100644 (file)
--- a/utils/wxPython/src/msw/events.cpp
+++ b/utils/wxPython/src/msw/events.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)

- * Version 1.1 (Patch 5)
+ * Version 1.1 (Patch 6)

  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.


@@ -24,16 +24,16 @@
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)

-#      define SWIGEXPORT(a,b) __declspec(dllexport) a b
+#      define SWIGEXPORT(a) __declspec(dllexport) a

 #   else
 #      if defined(__BORLANDC__)
 #   else
 #      if defined(__BORLANDC__)

-#          define SWIGEXPORT(a,b) a _export b
+#          define SWIGEXPORT(a) a _export 

 #      else
 #      else

-#          define SWIGEXPORT(a,b) a b
+#          define SWIGEXPORT(a) a 

 #      endif
 #   endif
 #else
 #      endif
 #   endif
 #else

-#   define SWIGEXPORT(a,b) a b
+#   define SWIGEXPORT(a) a 

 #endif
 
 #ifdef __cplusplus
 #endif
 
 #ifdef __cplusplus


@@ -43,12 +43,12 @@ extern "C" {
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);

+extern char *SWIG_GetPtrObj(PyObject *, void **, char *);

 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif
 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif

-

 #define SWIG_init    initeventsc
 
 #define SWIG_name    "eventsc"
 #define SWIG_init    initeventsc
 
 #define SWIG_name    "eventsc"


@@ -58,12 +58,13 @@ extern PyObject *SWIG_newvarlink(void);
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;

-    if (!target) {
+    PyObject*   o3;
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);
         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);


@@ -80,23 +81,23 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
     PyObject*   o3;
 
     PyObject*   o2;
     PyObject*   o3;
 

-    if (!target) {
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }
         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }

-        o3 = PyTuple_New(1);
-        PyTuple_SetItem(o3, 0, o);
+        o3 = PyTuple_New(1);            
+        PyTuple_SetItem(o3, 0, o);      

 
         o2 = target;
 
         o2 = target;

-        target = PySequence_Concat(o2, o3);
-        Py_DECREF(o2);
+        target = PySequence_Concat(o2, o3); 
+        Py_DECREF(o2);                      

         Py_DECREF(o3);
     }
     return target;
         Py_DECREF(o3);
     }
     return target;


@@ -114,19 +115,23 @@ extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
 
 
 static char* wxStringErrorMsg = "string type is required for parameter";
 
 
 static char* wxStringErrorMsg = "string type is required for parameter";

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

 #define wxEvent_GetEventObject(_swigobj)  (_swigobj->GetEventObject())
 static PyObject *_wrap_wxEvent_GetEventObject(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxObject * _result;
     wxEvent * _arg0;
 #define wxEvent_GetEventObject(_swigobj)  (_swigobj->GetEventObject())
 static PyObject *_wrap_wxEvent_GetEventObject(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxObject * _result;
     wxEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxEvent_GetEventObject",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxEvent_GetEventObject",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_GetEventObject. Expected _wxEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_GetEventObject. Expected _wxEvent_p.");
         return NULL;
         }


@@ -136,8 +141,13 @@ static PyObject *_wrap_wxEvent_GetEventObject(PyObject *self, PyObject *args) {
         _result = (wxObject *)wxEvent_GetEventObject(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxObject *)wxEvent_GetEventObject(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxObject_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxObject_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -146,13 +156,14 @@ static PyObject *_wrap_wxEvent_GetEventType(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxEventType  _result;
     wxEvent * _arg0;
     PyObject * _resultobj;
     wxEventType  _result;
     wxEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxEvent_GetEventType",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxEvent_GetEventType",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_GetEventType. Expected _wxEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_GetEventType. Expected _wxEvent_p.");
         return NULL;
         }


@@ -171,13 +182,14 @@ static PyObject *_wrap_wxEvent_GetId(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxEvent * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxEvent_GetId",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxEvent_GetId",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_GetId. Expected _wxEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_GetId. Expected _wxEvent_p.");
         return NULL;
         }


@@ -196,13 +208,14 @@ static PyObject *_wrap_wxEvent_GetSkipped(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxEvent_GetSkipped",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxEvent_GetSkipped",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_GetSkipped. Expected _wxEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_GetSkipped. Expected _wxEvent_p.");
         return NULL;
         }


@@ -221,13 +234,14 @@ static PyObject *_wrap_wxEvent_GetTimestamp(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxEvent * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxEvent_GetTimestamp",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxEvent_GetTimestamp",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_GetTimestamp. Expected _wxEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_GetTimestamp. Expected _wxEvent_p.");
         return NULL;
         }


@@ -246,20 +260,22 @@ static PyObject *_wrap_wxEvent_SetEventObject(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxEvent * _arg0;
     wxObject * _arg1;
     PyObject * _resultobj;
     wxEvent * _arg0;
     wxObject * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxEvent_SetEventObject",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxEvent_SetEventObject",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_SetEventObject. Expected _wxEvent_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_SetEventObject. Expected _wxEvent_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxObject_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxObject_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxEvent_SetEventObject. Expected _wxObject_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxEvent_SetEventObject. Expected _wxObject_p.");
         return NULL;
         }


@@ -279,13 +295,14 @@ static PyObject *_wrap_wxEvent_SetEventType(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxEvent * _arg0;
     wxEventType  _arg1;
     PyObject * _resultobj;
     wxEvent * _arg0;
     wxEventType  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxEvent_SetEventType",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxEvent_SetEventType",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_SetEventType. Expected _wxEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_SetEventType. Expected _wxEvent_p.");
         return NULL;
         }


@@ -305,13 +322,14 @@ static PyObject *_wrap_wxEvent_SetId(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxEvent * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxEvent * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxEvent_SetId",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxEvent_SetId",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_SetId. Expected _wxEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_SetId. Expected _wxEvent_p.");
         return NULL;
         }


@@ -331,13 +349,14 @@ static PyObject *_wrap_wxEvent_SetTimestamp(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxEvent * _arg0;
     long  _arg1;
     PyObject * _resultobj;
     wxEvent * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxEvent_SetTimestamp",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxEvent_SetTimestamp",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_SetTimestamp. Expected _wxEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_SetTimestamp. Expected _wxEvent_p.");
         return NULL;
         }


@@ -356,15 +375,16 @@ static PyObject *_wrap_wxEvent_SetTimestamp(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxEvent_Skip(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxEvent * _arg0;
 static PyObject *_wrap_wxEvent_Skip(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxEvent * _arg0;

-    bool  _arg1 = (1);
-    char * _argc0 = 0;
-    int tempbool1;
+    bool  _arg1 = (bool ) TRUE;
+    PyObject * _argo0 = 0;
+    int tempbool1 = (int) TRUE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxEvent_Skip",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"O|i:wxEvent_Skip",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_Skip. Expected _wxEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_Skip. Expected _wxEvent_p.");
         return NULL;
         }


@@ -393,14 +413,15 @@ static PyObject *_wrap_wxSizeEvent_GetSize(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxSize * _result;
     wxSizeEvent * _arg0;
     PyObject * _resultobj;
     wxSize * _result;
     wxSizeEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSizeEvent_GetSize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSizeEvent_GetSize",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSizeEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizeEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizeEvent_GetSize. Expected _wxSizeEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizeEvent_GetSize. Expected _wxSizeEvent_p.");
         return NULL;
         }


@@ -428,14 +449,15 @@ static PyObject *_wrap_wxCloseEvent_SetLoggingOff(PyObject *self, PyObject *args
     PyObject * _resultobj;
     wxCloseEvent * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxCloseEvent * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxCloseEvent_SetLoggingOff",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxCloseEvent_SetLoggingOff",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCloseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCloseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCloseEvent_SetLoggingOff. Expected _wxCloseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCloseEvent_SetLoggingOff. Expected _wxCloseEvent_p.");
         return NULL;
         }


@@ -456,13 +478,14 @@ static PyObject *_wrap_wxCloseEvent_GetLoggingOff(PyObject *self, PyObject *args
     PyObject * _resultobj;
     bool  _result;
     wxCloseEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxCloseEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxCloseEvent_GetLoggingOff",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxCloseEvent_GetLoggingOff",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCloseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCloseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCloseEvent_GetLoggingOff. Expected _wxCloseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCloseEvent_GetLoggingOff. Expected _wxCloseEvent_p.");
         return NULL;
         }


@@ -480,15 +503,16 @@ static PyObject *_wrap_wxCloseEvent_GetLoggingOff(PyObject *self, PyObject *args
 static PyObject *_wrap_wxCloseEvent_Veto(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxCloseEvent * _arg0;
 static PyObject *_wrap_wxCloseEvent_Veto(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxCloseEvent * _arg0;

-    bool  _arg1 = (1);
-    char * _argc0 = 0;
-    int tempbool1;
+    bool  _arg1 = (bool ) TRUE;
+    PyObject * _argo0 = 0;
+    int tempbool1 = (int) TRUE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxCloseEvent_Veto",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"O|i:wxCloseEvent_Veto",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCloseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCloseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCloseEvent_Veto. Expected _wxCloseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCloseEvent_Veto. Expected _wxCloseEvent_p.");
         return NULL;
         }


@@ -509,13 +533,14 @@ static PyObject *_wrap_wxCloseEvent_CanVeto(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxCloseEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxCloseEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxCloseEvent_CanVeto",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxCloseEvent_CanVeto",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCloseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCloseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCloseEvent_CanVeto. Expected _wxCloseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCloseEvent_CanVeto. Expected _wxCloseEvent_p.");
         return NULL;
         }


@@ -534,13 +559,14 @@ static PyObject *_wrap_wxCloseEvent_GetVeto(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxCloseEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxCloseEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxCloseEvent_GetVeto",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxCloseEvent_GetVeto",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCloseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCloseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCloseEvent_GetVeto. Expected _wxCloseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCloseEvent_GetVeto. Expected _wxCloseEvent_p.");
         return NULL;
         }


@@ -559,14 +585,15 @@ static PyObject *_wrap_wxCloseEvent_SetCanVeto(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxCloseEvent * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxCloseEvent * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxCloseEvent_SetCanVeto",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxCloseEvent_SetCanVeto",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCloseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCloseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCloseEvent_SetCanVeto. Expected _wxCloseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCloseEvent_SetCanVeto. Expected _wxCloseEvent_p.");
         return NULL;
         }


@@ -595,13 +622,14 @@ static PyObject *_wrap_wxCommandEvent_Checked(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxCommandEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxCommandEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxCommandEvent_Checked",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxCommandEvent_Checked",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCommandEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCommandEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCommandEvent_Checked. Expected _wxCommandEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCommandEvent_Checked. Expected _wxCommandEvent_p.");
         return NULL;
         }


@@ -620,13 +648,14 @@ static PyObject *_wrap_wxCommandEvent_GetExtraLong(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     long  _result;
     wxCommandEvent * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxCommandEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxCommandEvent_GetExtraLong",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxCommandEvent_GetExtraLong",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCommandEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCommandEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCommandEvent_GetExtraLong. Expected _wxCommandEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCommandEvent_GetExtraLong. Expected _wxCommandEvent_p.");
         return NULL;
         }


@@ -645,13 +674,14 @@ static PyObject *_wrap_wxCommandEvent_GetInt(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxCommandEvent * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxCommandEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxCommandEvent_GetInt",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxCommandEvent_GetInt",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCommandEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCommandEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCommandEvent_GetInt. Expected _wxCommandEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCommandEvent_GetInt. Expected _wxCommandEvent_p.");
         return NULL;
         }


@@ -670,13 +700,14 @@ static PyObject *_wrap_wxCommandEvent_GetSelection(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     int  _result;
     wxCommandEvent * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxCommandEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxCommandEvent_GetSelection",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxCommandEvent_GetSelection",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCommandEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCommandEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCommandEvent_GetSelection. Expected _wxCommandEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCommandEvent_GetSelection. Expected _wxCommandEvent_p.");
         return NULL;
         }


@@ -695,13 +726,14 @@ static PyObject *_wrap_wxCommandEvent_GetString(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxString * _result;
     wxCommandEvent * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxCommandEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxCommandEvent_GetString",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxCommandEvent_GetString",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCommandEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCommandEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCommandEvent_GetString. Expected _wxCommandEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCommandEvent_GetString. Expected _wxCommandEvent_p.");
         return NULL;
         }


@@ -725,13 +757,14 @@ static PyObject *_wrap_wxCommandEvent_IsSelection(PyObject *self, PyObject *args
     PyObject * _resultobj;
     bool  _result;
     wxCommandEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxCommandEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxCommandEvent_IsSelection",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxCommandEvent_IsSelection",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCommandEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCommandEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCommandEvent_IsSelection. Expected _wxCommandEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCommandEvent_IsSelection. Expected _wxCommandEvent_p.");
         return NULL;
         }


@@ -766,13 +799,14 @@ static PyObject *_wrap_wxScrollEvent_GetOrientation(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     int  _result;
     wxScrollEvent * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxScrollEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxScrollEvent_GetOrientation",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxScrollEvent_GetOrientation",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScrollEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScrollEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrollEvent_GetOrientation. Expected _wxScrollEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrollEvent_GetOrientation. Expected _wxScrollEvent_p.");
         return NULL;
         }


@@ -791,13 +825,14 @@ static PyObject *_wrap_wxScrollEvent_GetPosition(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     int  _result;
     wxScrollEvent * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxScrollEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxScrollEvent_GetPosition",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxScrollEvent_GetPosition",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScrollEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScrollEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrollEvent_GetPosition. Expected _wxScrollEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrollEvent_GetPosition. Expected _wxScrollEvent_p.");
         return NULL;
         }


@@ -848,13 +883,14 @@ static PyObject *_wrap_wxMouseEvent_IsButton(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMouseEvent_IsButton",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_IsButton",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMouseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMouseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_IsButton. Expected _wxMouseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_IsButton. Expected _wxMouseEvent_p.");
         return NULL;
         }


@@ -873,14 +909,15 @@ static PyObject *_wrap_wxMouseEvent_ButtonDown(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;

-    int  _arg1 = -1;
-    char * _argc0 = 0;
+    int  _arg1 = (int ) -1;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxMouseEvent_ButtonDown",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"O|i:wxMouseEvent_ButtonDown",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMouseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMouseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_ButtonDown. Expected _wxMouseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_ButtonDown. Expected _wxMouseEvent_p.");
         return NULL;
         }


@@ -899,14 +936,15 @@ static PyObject *_wrap_wxMouseEvent_ButtonDClick(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;

-    int  _arg1 = -1;
-    char * _argc0 = 0;
+    int  _arg1 = (int ) -1;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxMouseEvent_ButtonDClick",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"O|i:wxMouseEvent_ButtonDClick",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMouseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMouseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_ButtonDClick. Expected _wxMouseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_ButtonDClick. Expected _wxMouseEvent_p.");
         return NULL;
         }


@@ -925,14 +963,15 @@ static PyObject *_wrap_wxMouseEvent_ButtonUp(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;

-    int  _arg1 = -1;
-    char * _argc0 = 0;
+    int  _arg1 = (int ) -1;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxMouseEvent_ButtonUp",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"O|i:wxMouseEvent_ButtonUp",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMouseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMouseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_ButtonUp. Expected _wxMouseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_ButtonUp. Expected _wxMouseEvent_p.");
         return NULL;
         }


@@ -952,13 +991,14 @@ static PyObject *_wrap_wxMouseEvent_Button(PyObject *self, PyObject *args) {
     bool  _result;
     wxMouseEvent * _arg0;
     int  _arg1;
     bool  _result;
     wxMouseEvent * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxMouseEvent_Button",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxMouseEvent_Button",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMouseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMouseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_Button. Expected _wxMouseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_Button. Expected _wxMouseEvent_p.");
         return NULL;
         }


@@ -978,13 +1018,14 @@ static PyObject *_wrap_wxMouseEvent_ButtonIsDown(PyObject *self, PyObject *args)
     bool  _result;
     wxMouseEvent * _arg0;
     int  _arg1;
     bool  _result;
     wxMouseEvent * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxMouseEvent_ButtonIsDown",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxMouseEvent_ButtonIsDown",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMouseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMouseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_ButtonIsDown. Expected _wxMouseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_ButtonIsDown. Expected _wxMouseEvent_p.");
         return NULL;
         }


@@ -1003,13 +1044,14 @@ static PyObject *_wrap_wxMouseEvent_ControlDown(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMouseEvent_ControlDown",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_ControlDown",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMouseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMouseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_ControlDown. Expected _wxMouseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_ControlDown. Expected _wxMouseEvent_p.");
         return NULL;
         }


@@ -1028,13 +1070,14 @@ static PyObject *_wrap_wxMouseEvent_MetaDown(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMouseEvent_MetaDown",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_MetaDown",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMouseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMouseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_MetaDown. Expected _wxMouseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_MetaDown. Expected _wxMouseEvent_p.");
         return NULL;
         }


@@ -1053,13 +1096,14 @@ static PyObject *_wrap_wxMouseEvent_AltDown(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMouseEvent_AltDown",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_AltDown",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMouseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMouseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_AltDown. Expected _wxMouseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_AltDown. Expected _wxMouseEvent_p.");
         return NULL;
         }


@@ -1078,13 +1122,14 @@ static PyObject *_wrap_wxMouseEvent_ShiftDown(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMouseEvent_ShiftDown",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_ShiftDown",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMouseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMouseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_ShiftDown. Expected _wxMouseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_ShiftDown. Expected _wxMouseEvent_p.");
         return NULL;
         }


@@ -1103,13 +1148,14 @@ static PyObject *_wrap_wxMouseEvent_LeftDown(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMouseEvent_LeftDown",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_LeftDown",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMouseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMouseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_LeftDown. Expected _wxMouseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_LeftDown. Expected _wxMouseEvent_p.");
         return NULL;
         }


@@ -1128,13 +1174,14 @@ static PyObject *_wrap_wxMouseEvent_MiddleDown(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMouseEvent_MiddleDown",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_MiddleDown",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMouseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMouseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_MiddleDown. Expected _wxMouseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_MiddleDown. Expected _wxMouseEvent_p.");
         return NULL;
         }


@@ -1153,13 +1200,14 @@ static PyObject *_wrap_wxMouseEvent_RightDown(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMouseEvent_RightDown",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_RightDown",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMouseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMouseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_RightDown. Expected _wxMouseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_RightDown. Expected _wxMouseEvent_p.");
         return NULL;
         }


@@ -1178,13 +1226,14 @@ static PyObject *_wrap_wxMouseEvent_LeftUp(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMouseEvent_LeftUp",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_LeftUp",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMouseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMouseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_LeftUp. Expected _wxMouseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_LeftUp. Expected _wxMouseEvent_p.");
         return NULL;
         }


@@ -1203,13 +1252,14 @@ static PyObject *_wrap_wxMouseEvent_MiddleUp(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMouseEvent_MiddleUp",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_MiddleUp",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMouseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMouseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_MiddleUp. Expected _wxMouseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_MiddleUp. Expected _wxMouseEvent_p.");
         return NULL;
         }


@@ -1228,13 +1278,14 @@ static PyObject *_wrap_wxMouseEvent_RightUp(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMouseEvent_RightUp",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_RightUp",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMouseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMouseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_RightUp. Expected _wxMouseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_RightUp. Expected _wxMouseEvent_p.");
         return NULL;
         }


@@ -1253,13 +1304,14 @@ static PyObject *_wrap_wxMouseEvent_LeftDClick(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMouseEvent_LeftDClick",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_LeftDClick",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMouseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMouseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_LeftDClick. Expected _wxMouseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_LeftDClick. Expected _wxMouseEvent_p.");
         return NULL;
         }


@@ -1278,13 +1330,14 @@ static PyObject *_wrap_wxMouseEvent_MiddleDClick(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMouseEvent_MiddleDClick",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_MiddleDClick",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMouseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMouseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_MiddleDClick. Expected _wxMouseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_MiddleDClick. Expected _wxMouseEvent_p.");
         return NULL;
         }


@@ -1303,13 +1356,14 @@ static PyObject *_wrap_wxMouseEvent_RightDClick(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMouseEvent_RightDClick",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_RightDClick",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMouseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMouseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_RightDClick. Expected _wxMouseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_RightDClick. Expected _wxMouseEvent_p.");
         return NULL;
         }


@@ -1328,13 +1382,14 @@ static PyObject *_wrap_wxMouseEvent_LeftIsDown(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMouseEvent_LeftIsDown",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_LeftIsDown",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMouseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMouseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_LeftIsDown. Expected _wxMouseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_LeftIsDown. Expected _wxMouseEvent_p.");
         return NULL;
         }


@@ -1353,13 +1408,14 @@ static PyObject *_wrap_wxMouseEvent_MiddleIsDown(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMouseEvent_MiddleIsDown",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_MiddleIsDown",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMouseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMouseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_MiddleIsDown. Expected _wxMouseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_MiddleIsDown. Expected _wxMouseEvent_p.");
         return NULL;
         }


@@ -1378,13 +1434,14 @@ static PyObject *_wrap_wxMouseEvent_RightIsDown(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMouseEvent_RightIsDown",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_RightIsDown",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMouseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMouseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_RightIsDown. Expected _wxMouseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_RightIsDown. Expected _wxMouseEvent_p.");
         return NULL;
         }


@@ -1403,13 +1460,14 @@ static PyObject *_wrap_wxMouseEvent_Dragging(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMouseEvent_Dragging",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_Dragging",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMouseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMouseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_Dragging. Expected _wxMouseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_Dragging. Expected _wxMouseEvent_p.");
         return NULL;
         }


@@ -1428,13 +1486,14 @@ static PyObject *_wrap_wxMouseEvent_Moving(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMouseEvent_Moving",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_Moving",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMouseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMouseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_Moving. Expected _wxMouseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_Moving. Expected _wxMouseEvent_p.");
         return NULL;
         }


@@ -1453,13 +1512,14 @@ static PyObject *_wrap_wxMouseEvent_Entering(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMouseEvent_Entering",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_Entering",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMouseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMouseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_Entering. Expected _wxMouseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_Entering. Expected _wxMouseEvent_p.");
         return NULL;
         }


@@ -1478,13 +1538,14 @@ static PyObject *_wrap_wxMouseEvent_Leaving(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMouseEvent_Leaving",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_Leaving",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMouseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMouseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_Leaving. Expected _wxMouseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_Leaving. Expected _wxMouseEvent_p.");
         return NULL;
         }


@@ -1506,7 +1567,7 @@ static PyObject *_wrap_wxMouseEvent_Position(PyObject *self, PyObject *args) {
     long  temp;
     long * _arg2;
     long  temp0;
     long  temp;
     long * _arg2;
     long  temp0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 {
 
     self = self;
 {


@@ -1515,10 +1576,11 @@ static PyObject *_wrap_wxMouseEvent_Position(PyObject *self, PyObject *args) {
 {
   _arg2 = &temp0;
 }
 {
   _arg2 = &temp0;
 }

-    if(!PyArg_ParseTuple(args,"s:wxMouseEvent_Position",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_Position",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMouseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMouseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_Position. Expected _wxMouseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_Position. Expected _wxMouseEvent_p.");
         return NULL;
         }


@@ -1548,14 +1610,15 @@ static PyObject *_wrap_wxMouseEvent_GetPosition(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxPoint * _result;
     wxMouseEvent * _arg0;
     PyObject * _resultobj;
     wxPoint * _result;
     wxMouseEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMouseEvent_GetPosition",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_GetPosition",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMouseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMouseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_GetPosition. Expected _wxMouseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_GetPosition. Expected _wxMouseEvent_p.");
         return NULL;
         }


@@ -1576,21 +1639,23 @@ static PyObject *_wrap_wxMouseEvent_GetLogicalPosition(PyObject *self, PyObject
     wxPoint * _result;
     wxMouseEvent * _arg0;
     wxDC * _arg1;
     wxPoint * _result;
     wxMouseEvent * _arg0;
     wxDC * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxMouseEvent_GetLogicalPosition",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxMouseEvent_GetLogicalPosition",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMouseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMouseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_GetLogicalPosition. Expected _wxMouseEvent_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_GetLogicalPosition. Expected _wxMouseEvent_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxDC_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMouseEvent_GetLogicalPosition. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMouseEvent_GetLogicalPosition. Expected _wxDC_p.");
         return NULL;
         }


@@ -1610,13 +1675,14 @@ static PyObject *_wrap_wxMouseEvent_GetX(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxMouseEvent * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxMouseEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMouseEvent_GetX",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_GetX",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMouseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMouseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_GetX. Expected _wxMouseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_GetX. Expected _wxMouseEvent_p.");
         return NULL;
         }


@@ -1635,13 +1701,14 @@ static PyObject *_wrap_wxMouseEvent_GetY(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxMouseEvent * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxMouseEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMouseEvent_GetY",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_GetY",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMouseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMouseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_GetY. Expected _wxMouseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMouseEvent_GetY. Expected _wxMouseEvent_p.");
         return NULL;
         }


@@ -1668,13 +1735,14 @@ static PyObject *_wrap_wxKeyEvent_ControlDown(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxKeyEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxKeyEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxKeyEvent_ControlDown",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxKeyEvent_ControlDown",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxKeyEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxKeyEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxKeyEvent_ControlDown. Expected _wxKeyEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxKeyEvent_ControlDown. Expected _wxKeyEvent_p.");
         return NULL;
         }


@@ -1693,13 +1761,14 @@ static PyObject *_wrap_wxKeyEvent_MetaDown(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxKeyEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxKeyEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxKeyEvent_MetaDown",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxKeyEvent_MetaDown",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxKeyEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxKeyEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxKeyEvent_MetaDown. Expected _wxKeyEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxKeyEvent_MetaDown. Expected _wxKeyEvent_p.");
         return NULL;
         }


@@ -1718,13 +1787,14 @@ static PyObject *_wrap_wxKeyEvent_AltDown(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxKeyEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxKeyEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxKeyEvent_AltDown",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxKeyEvent_AltDown",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxKeyEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxKeyEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxKeyEvent_AltDown. Expected _wxKeyEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxKeyEvent_AltDown. Expected _wxKeyEvent_p.");
         return NULL;
         }


@@ -1743,13 +1813,14 @@ static PyObject *_wrap_wxKeyEvent_ShiftDown(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxKeyEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxKeyEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxKeyEvent_ShiftDown",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxKeyEvent_ShiftDown",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxKeyEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxKeyEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxKeyEvent_ShiftDown. Expected _wxKeyEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxKeyEvent_ShiftDown. Expected _wxKeyEvent_p.");
         return NULL;
         }


@@ -1768,13 +1839,14 @@ static PyObject *_wrap_wxKeyEvent_KeyCode(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxKeyEvent * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxKeyEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxKeyEvent_KeyCode",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxKeyEvent_KeyCode",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxKeyEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxKeyEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxKeyEvent_KeyCode. Expected _wxKeyEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxKeyEvent_KeyCode. Expected _wxKeyEvent_p.");
         return NULL;
         }


@@ -1801,14 +1873,15 @@ static PyObject *_wrap_wxMoveEvent_GetPosition(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPoint * _result;
     wxMoveEvent * _arg0;
     PyObject * _resultobj;
     wxPoint * _result;
     wxMoveEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMoveEvent_GetPosition",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMoveEvent_GetPosition",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMoveEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMoveEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMoveEvent_GetPosition. Expected _wxMoveEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMoveEvent_GetPosition. Expected _wxMoveEvent_p.");
         return NULL;
         }


@@ -1844,14 +1917,15 @@ static PyObject *_wrap_wxEraseEvent_GetDC(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _result;
     wxEraseEvent * _arg0;
     PyObject * _resultobj;
     wxDC * _result;
     wxEraseEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxEraseEvent_GetDC",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxEraseEvent_GetDC",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxEraseEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEraseEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEraseEvent_GetDC. Expected _wxEraseEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEraseEvent_GetDC. Expected _wxEraseEvent_p.");
         return NULL;
         }


@@ -1861,8 +1935,13 @@ static PyObject *_wrap_wxEraseEvent_GetDC(PyObject *self, PyObject *args) {
         _result = (wxDC *)wxEraseEvent_GetDC(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxDC *)wxEraseEvent_GetDC(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxDC_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxDC_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1887,13 +1966,14 @@ static PyObject *_wrap_wxActivateEvent_GetActive(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     bool  _result;
     wxActivateEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxActivateEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxActivateEvent_GetActive",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxActivateEvent_GetActive",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxActivateEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxActivateEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxActivateEvent_GetActive. Expected _wxActivateEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxActivateEvent_GetActive. Expected _wxActivateEvent_p.");
         return NULL;
         }


@@ -1928,13 +2008,14 @@ static PyObject *_wrap_wxMenuEvent_GetMenuId(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxMenuEvent * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxMenuEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMenuEvent_GetMenuId",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMenuEvent_GetMenuId",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuEvent_GetMenuId. Expected _wxMenuEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuEvent_GetMenuId. Expected _wxMenuEvent_p.");
         return NULL;
         }


@@ -1961,14 +2042,15 @@ static PyObject *_wrap_wxShowEvent_SetShow(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxShowEvent * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxShowEvent * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxShowEvent_SetShow",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxShowEvent_SetShow",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxShowEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxShowEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxShowEvent_SetShow. Expected _wxShowEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxShowEvent_SetShow. Expected _wxShowEvent_p.");
         return NULL;
         }


@@ -1989,13 +2071,14 @@ static PyObject *_wrap_wxShowEvent_GetShow(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxShowEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxShowEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxShowEvent_GetShow",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxShowEvent_GetShow",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxShowEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxShowEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxShowEvent_GetShow. Expected _wxShowEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxShowEvent_GetShow. Expected _wxShowEvent_p.");
         return NULL;
         }


@@ -2038,14 +2121,15 @@ static PyObject *_wrap_wxJoystickEvent_GetPosition(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     wxPoint * _result;
     wxJoystickEvent * _arg0;
     PyObject * _resultobj;
     wxPoint * _result;
     wxJoystickEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxJoystickEvent_GetPosition",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxJoystickEvent_GetPosition",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxJoystickEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxJoystickEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxJoystickEvent_GetPosition. Expected _wxJoystickEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxJoystickEvent_GetPosition. Expected _wxJoystickEvent_p.");
         return NULL;
         }


@@ -2065,13 +2149,14 @@ static PyObject *_wrap_wxJoystickEvent_GetZPosition(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     int  _result;
     wxJoystickEvent * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxJoystickEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxJoystickEvent_GetZPosition",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxJoystickEvent_GetZPosition",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxJoystickEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxJoystickEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxJoystickEvent_GetZPosition. Expected _wxJoystickEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxJoystickEvent_GetZPosition. Expected _wxJoystickEvent_p.");
         return NULL;
         }


@@ -2090,13 +2175,14 @@ static PyObject *_wrap_wxJoystickEvent_GetButtonState(PyObject *self, PyObject *
     PyObject * _resultobj;
     int  _result;
     wxJoystickEvent * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxJoystickEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxJoystickEvent_GetButtonState",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxJoystickEvent_GetButtonState",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxJoystickEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxJoystickEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxJoystickEvent_GetButtonState. Expected _wxJoystickEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxJoystickEvent_GetButtonState. Expected _wxJoystickEvent_p.");
         return NULL;
         }


@@ -2115,13 +2201,14 @@ static PyObject *_wrap_wxJoystickEvent_GetButtonChange(PyObject *self, PyObject
     PyObject * _resultobj;
     int  _result;
     wxJoystickEvent * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxJoystickEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxJoystickEvent_GetButtonChange",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxJoystickEvent_GetButtonChange",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxJoystickEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxJoystickEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxJoystickEvent_GetButtonChange. Expected _wxJoystickEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxJoystickEvent_GetButtonChange. Expected _wxJoystickEvent_p.");
         return NULL;
         }


@@ -2140,13 +2227,14 @@ static PyObject *_wrap_wxJoystickEvent_GetJoystick(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     int  _result;
     wxJoystickEvent * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxJoystickEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxJoystickEvent_GetJoystick",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxJoystickEvent_GetJoystick",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxJoystickEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxJoystickEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxJoystickEvent_GetJoystick. Expected _wxJoystickEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxJoystickEvent_GetJoystick. Expected _wxJoystickEvent_p.");
         return NULL;
         }


@@ -2165,13 +2253,14 @@ static PyObject *_wrap_wxJoystickEvent_SetJoystick(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     wxJoystickEvent * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxJoystickEvent * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxJoystickEvent_SetJoystick",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxJoystickEvent_SetJoystick",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxJoystickEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxJoystickEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxJoystickEvent_SetJoystick. Expected _wxJoystickEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxJoystickEvent_SetJoystick. Expected _wxJoystickEvent_p.");
         return NULL;
         }


@@ -2191,13 +2280,14 @@ static PyObject *_wrap_wxJoystickEvent_SetButtonState(PyObject *self, PyObject *
     PyObject * _resultobj;
     wxJoystickEvent * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxJoystickEvent * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxJoystickEvent_SetButtonState",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxJoystickEvent_SetButtonState",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxJoystickEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxJoystickEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxJoystickEvent_SetButtonState. Expected _wxJoystickEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxJoystickEvent_SetButtonState. Expected _wxJoystickEvent_p.");
         return NULL;
         }


@@ -2217,13 +2307,14 @@ static PyObject *_wrap_wxJoystickEvent_SetButtonChange(PyObject *self, PyObject
     PyObject * _resultobj;
     wxJoystickEvent * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxJoystickEvent * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxJoystickEvent_SetButtonChange",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxJoystickEvent_SetButtonChange",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxJoystickEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxJoystickEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxJoystickEvent_SetButtonChange. Expected _wxJoystickEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxJoystickEvent_SetButtonChange. Expected _wxJoystickEvent_p.");
         return NULL;
         }


@@ -2243,20 +2334,22 @@ static PyObject *_wrap_wxJoystickEvent_SetPosition(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     wxJoystickEvent * _arg0;
     wxPoint * _arg1;
     PyObject * _resultobj;
     wxJoystickEvent * _arg0;
     wxPoint * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxJoystickEvent_SetPosition",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxJoystickEvent_SetPosition",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxJoystickEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxJoystickEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxJoystickEvent_SetPosition. Expected _wxJoystickEvent_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxJoystickEvent_SetPosition. Expected _wxJoystickEvent_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPoint_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxJoystickEvent_SetPosition. Expected _wxPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxJoystickEvent_SetPosition. Expected _wxPoint_p.");
         return NULL;
         }


@@ -2276,13 +2369,14 @@ static PyObject *_wrap_wxJoystickEvent_SetZPosition(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     wxJoystickEvent * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxJoystickEvent * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxJoystickEvent_SetZPosition",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxJoystickEvent_SetZPosition",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxJoystickEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxJoystickEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxJoystickEvent_SetZPosition. Expected _wxJoystickEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxJoystickEvent_SetZPosition. Expected _wxJoystickEvent_p.");
         return NULL;
         }


@@ -2302,13 +2396,14 @@ static PyObject *_wrap_wxJoystickEvent_IsButton(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     bool  _result;
     wxJoystickEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxJoystickEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxJoystickEvent_IsButton",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxJoystickEvent_IsButton",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxJoystickEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxJoystickEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxJoystickEvent_IsButton. Expected _wxJoystickEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxJoystickEvent_IsButton. Expected _wxJoystickEvent_p.");
         return NULL;
         }


@@ -2327,13 +2422,14 @@ static PyObject *_wrap_wxJoystickEvent_IsMove(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxJoystickEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxJoystickEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxJoystickEvent_IsMove",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxJoystickEvent_IsMove",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxJoystickEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxJoystickEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxJoystickEvent_IsMove. Expected _wxJoystickEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxJoystickEvent_IsMove. Expected _wxJoystickEvent_p.");
         return NULL;
         }


@@ -2352,13 +2448,14 @@ static PyObject *_wrap_wxJoystickEvent_IsZMove(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxJoystickEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxJoystickEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxJoystickEvent_IsZMove",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxJoystickEvent_IsZMove",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxJoystickEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxJoystickEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxJoystickEvent_IsZMove. Expected _wxJoystickEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxJoystickEvent_IsZMove. Expected _wxJoystickEvent_p.");
         return NULL;
         }


@@ -2377,14 +2474,15 @@ static PyObject *_wrap_wxJoystickEvent_ButtonDown(PyObject *self, PyObject *args
     PyObject * _resultobj;
     bool  _result;
     wxJoystickEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxJoystickEvent * _arg0;

-    int  _arg1 = wxJOY_BUTTON_ANY;
-    char * _argc0 = 0;
+    int  _arg1 = (int ) wxJOY_BUTTON_ANY;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxJoystickEvent_ButtonDown",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"O|i:wxJoystickEvent_ButtonDown",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxJoystickEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxJoystickEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxJoystickEvent_ButtonDown. Expected _wxJoystickEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxJoystickEvent_ButtonDown. Expected _wxJoystickEvent_p.");
         return NULL;
         }


@@ -2403,14 +2501,15 @@ static PyObject *_wrap_wxJoystickEvent_ButtonUp(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     bool  _result;
     wxJoystickEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxJoystickEvent * _arg0;

-    int  _arg1 = wxJOY_BUTTON_ANY;
-    char * _argc0 = 0;
+    int  _arg1 = (int ) wxJOY_BUTTON_ANY;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxJoystickEvent_ButtonUp",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"O|i:wxJoystickEvent_ButtonUp",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxJoystickEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxJoystickEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxJoystickEvent_ButtonUp. Expected _wxJoystickEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxJoystickEvent_ButtonUp. Expected _wxJoystickEvent_p.");
         return NULL;
         }


@@ -2429,14 +2528,15 @@ static PyObject *_wrap_wxJoystickEvent_ButtonIsDown(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     bool  _result;
     wxJoystickEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxJoystickEvent * _arg0;

-    int  _arg1 = wxJOY_BUTTON_ANY;
-    char * _argc0 = 0;
+    int  _arg1 = (int ) wxJOY_BUTTON_ANY;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxJoystickEvent_ButtonIsDown",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"O|i:wxJoystickEvent_ButtonIsDown",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxJoystickEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxJoystickEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxJoystickEvent_ButtonIsDown. Expected _wxJoystickEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxJoystickEvent_ButtonIsDown. Expected _wxJoystickEvent_p.");
         return NULL;
         }


@@ -2463,14 +2563,15 @@ static PyObject *_wrap_wxDropFilesEvent_GetPosition(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     wxPoint * _result;
     wxDropFilesEvent * _arg0;
     PyObject * _resultobj;
     wxPoint * _result;
     wxDropFilesEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDropFilesEvent_GetPosition",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDropFilesEvent_GetPosition",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDropFilesEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDropFilesEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDropFilesEvent_GetPosition. Expected _wxDropFilesEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDropFilesEvent_GetPosition. Expected _wxDropFilesEvent_p.");
         return NULL;
         }


@@ -2490,13 +2591,14 @@ static PyObject *_wrap_wxDropFilesEvent_GetNumberOfFiles(PyObject *self, PyObjec
     PyObject * _resultobj;
     int  _result;
     wxDropFilesEvent * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxDropFilesEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDropFilesEvent_GetNumberOfFiles",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDropFilesEvent_GetNumberOfFiles",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDropFilesEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDropFilesEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDropFilesEvent_GetNumberOfFiles. Expected _wxDropFilesEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDropFilesEvent_GetNumberOfFiles. Expected _wxDropFilesEvent_p.");
         return NULL;
         }


@@ -2529,13 +2631,14 @@ static PyObject *_wrap_wxDropFilesEvent_GetFiles(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     PyObject * _result;
     wxDropFilesEvent * _arg0;
     PyObject * _resultobj;
     PyObject * _result;
     wxDropFilesEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDropFilesEvent_GetFiles",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDropFilesEvent_GetFiles",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDropFilesEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDropFilesEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDropFilesEvent_GetFiles. Expected _wxDropFilesEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDropFilesEvent_GetFiles. Expected _wxDropFilesEvent_p.");
         return NULL;
         }


@@ -2563,15 +2666,16 @@ static void *SwigwxIdleEventTowxEvent(void *ptr) {
 static PyObject *_wrap_wxIdleEvent_RequestMore(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxIdleEvent * _arg0;
 static PyObject *_wrap_wxIdleEvent_RequestMore(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxIdleEvent * _arg0;

-    bool  _arg1 = (1);
-    char * _argc0 = 0;
-    int tempbool1;
+    bool  _arg1 = (bool ) TRUE;
+    PyObject * _argo0 = 0;
+    int tempbool1 = (int) TRUE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxIdleEvent_RequestMore",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"O|i:wxIdleEvent_RequestMore",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIdleEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIdleEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIdleEvent_RequestMore. Expected _wxIdleEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIdleEvent_RequestMore. Expected _wxIdleEvent_p.");
         return NULL;
         }


@@ -2592,13 +2696,14 @@ static PyObject *_wrap_wxIdleEvent_MoreRequested(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     bool  _result;
     wxIdleEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxIdleEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxIdleEvent_MoreRequested",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxIdleEvent_MoreRequested",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIdleEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIdleEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIdleEvent_MoreRequested. Expected _wxIdleEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIdleEvent_MoreRequested. Expected _wxIdleEvent_p.");
         return NULL;
         }


@@ -2625,13 +2730,14 @@ static PyObject *_wrap_wxUpdateUIEvent_GetChecked(PyObject *self, PyObject *args
     PyObject * _resultobj;
     bool  _result;
     wxUpdateUIEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxUpdateUIEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxUpdateUIEvent_GetChecked",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxUpdateUIEvent_GetChecked",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxUpdateUIEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxUpdateUIEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxUpdateUIEvent_GetChecked. Expected _wxUpdateUIEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxUpdateUIEvent_GetChecked. Expected _wxUpdateUIEvent_p.");
         return NULL;
         }


@@ -2650,13 +2756,14 @@ static PyObject *_wrap_wxUpdateUIEvent_GetEnabled(PyObject *self, PyObject *args
     PyObject * _resultobj;
     bool  _result;
     wxUpdateUIEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxUpdateUIEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxUpdateUIEvent_GetEnabled",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxUpdateUIEvent_GetEnabled",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxUpdateUIEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxUpdateUIEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxUpdateUIEvent_GetEnabled. Expected _wxUpdateUIEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxUpdateUIEvent_GetEnabled. Expected _wxUpdateUIEvent_p.");
         return NULL;
         }


@@ -2675,13 +2782,14 @@ static PyObject *_wrap_wxUpdateUIEvent_GetText(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxUpdateUIEvent * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxUpdateUIEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxUpdateUIEvent_GetText",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxUpdateUIEvent_GetText",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxUpdateUIEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxUpdateUIEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxUpdateUIEvent_GetText. Expected _wxUpdateUIEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxUpdateUIEvent_GetText. Expected _wxUpdateUIEvent_p.");
         return NULL;
         }


@@ -2705,13 +2813,14 @@ static PyObject *_wrap_wxUpdateUIEvent_GetSetText(PyObject *self, PyObject *args
     PyObject * _resultobj;
     bool  _result;
     wxUpdateUIEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxUpdateUIEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxUpdateUIEvent_GetSetText",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxUpdateUIEvent_GetSetText",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxUpdateUIEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxUpdateUIEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxUpdateUIEvent_GetSetText. Expected _wxUpdateUIEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxUpdateUIEvent_GetSetText. Expected _wxUpdateUIEvent_p.");
         return NULL;
         }


@@ -2730,13 +2839,14 @@ static PyObject *_wrap_wxUpdateUIEvent_GetSetChecked(PyObject *self, PyObject *a
     PyObject * _resultobj;
     bool  _result;
     wxUpdateUIEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxUpdateUIEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxUpdateUIEvent_GetSetChecked",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxUpdateUIEvent_GetSetChecked",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxUpdateUIEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxUpdateUIEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxUpdateUIEvent_GetSetChecked. Expected _wxUpdateUIEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxUpdateUIEvent_GetSetChecked. Expected _wxUpdateUIEvent_p.");
         return NULL;
         }


@@ -2755,13 +2865,14 @@ static PyObject *_wrap_wxUpdateUIEvent_GetSetEnabled(PyObject *self, PyObject *a
     PyObject * _resultobj;
     bool  _result;
     wxUpdateUIEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxUpdateUIEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxUpdateUIEvent_GetSetEnabled",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxUpdateUIEvent_GetSetEnabled",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxUpdateUIEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxUpdateUIEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxUpdateUIEvent_GetSetEnabled. Expected _wxUpdateUIEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxUpdateUIEvent_GetSetEnabled. Expected _wxUpdateUIEvent_p.");
         return NULL;
         }


@@ -2780,14 +2891,15 @@ static PyObject *_wrap_wxUpdateUIEvent_Check(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxUpdateUIEvent * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxUpdateUIEvent * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxUpdateUIEvent_Check",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxUpdateUIEvent_Check",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxUpdateUIEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxUpdateUIEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxUpdateUIEvent_Check. Expected _wxUpdateUIEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxUpdateUIEvent_Check. Expected _wxUpdateUIEvent_p.");
         return NULL;
         }


@@ -2808,14 +2920,15 @@ static PyObject *_wrap_wxUpdateUIEvent_Enable(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxUpdateUIEvent * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxUpdateUIEvent * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxUpdateUIEvent_Enable",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxUpdateUIEvent_Enable",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxUpdateUIEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxUpdateUIEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxUpdateUIEvent_Enable. Expected _wxUpdateUIEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxUpdateUIEvent_Enable. Expected _wxUpdateUIEvent_p.");
         return NULL;
         }


@@ -2836,14 +2949,15 @@ static PyObject *_wrap_wxUpdateUIEvent_SetText(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxUpdateUIEvent * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxUpdateUIEvent * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxUpdateUIEvent_SetText",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxUpdateUIEvent_SetText",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxUpdateUIEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxUpdateUIEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxUpdateUIEvent_SetText. Expected _wxUpdateUIEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxUpdateUIEvent_SetText. Expected _wxUpdateUIEvent_p.");
         return NULL;
         }


@@ -2897,8 +3011,8 @@ static void *SwigwxPyEventTowxEvent(void *ptr) {
 static PyObject *_wrap_new_wxPyEvent(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyEvent * _result;
 static PyObject *_wrap_new_wxPyEvent(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyEvent * _result;

-    wxEventType  _arg0 = (wxEVT_NULL);
-    PyObject * _arg1 = Py_None;
+    wxEventType  _arg0 = (wxEventType ) wxEVT_NULL;
+    PyObject * _arg1 = (PyObject *) Py_None;

     PyObject * _obj1 = 0;
     char _ptemp[128];
 
     PyObject * _obj1 = 0;
     char _ptemp[128];
 


@@ -2914,8 +3028,13 @@ static PyObject *_wrap_new_wxPyEvent(PyObject *self, PyObject *args) {
         _result = (wxPyEvent *)new_wxPyEvent(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxPyEvent *)new_wxPyEvent(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyEvent_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyEvent_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -2923,13 +3042,14 @@ static PyObject *_wrap_new_wxPyEvent(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxPyEvent(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyEvent * _arg0;
 static PyObject *_wrap_delete_wxPyEvent(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:delete_wxPyEvent",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxPyEvent",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPyEvent. Expected _wxPyEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPyEvent. Expected _wxPyEvent_p.");
         return NULL;
         }


@@ -2949,14 +3069,15 @@ static PyObject *_wrap_wxPyEvent_SetUserData(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyEvent * _arg0;
     PyObject * _arg1;
     PyObject * _resultobj;
     wxPyEvent * _arg0;
     PyObject * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxPyEvent_SetUserData",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxPyEvent_SetUserData",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyEvent_SetUserData. Expected _wxPyEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyEvent_SetUserData. Expected _wxPyEvent_p.");
         return NULL;
         }


@@ -2979,13 +3100,14 @@ static PyObject *_wrap_wxPyEvent_GetUserData(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     PyObject * _result;
     wxPyEvent * _arg0;
     PyObject * _resultobj;
     PyObject * _result;
     wxPyEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPyEvent_GetUserData",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPyEvent_GetUserData",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyEvent_GetUserData. Expected _wxPyEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyEvent_GetUserData. Expected _wxPyEvent_p.");
         return NULL;
         }


@@ -3022,13 +3144,14 @@ static PyObject *_wrap_wxNotifyEvent_IsAllowed(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxNotifyEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxNotifyEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxNotifyEvent_IsAllowed",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxNotifyEvent_IsAllowed",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxNotifyEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotifyEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotifyEvent_IsAllowed. Expected _wxNotifyEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotifyEvent_IsAllowed. Expected _wxNotifyEvent_p.");
         return NULL;
         }


@@ -3046,13 +3169,14 @@ static PyObject *_wrap_wxNotifyEvent_IsAllowed(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxNotifyEvent_Veto(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxNotifyEvent * _arg0;
 static PyObject *_wrap_wxNotifyEvent_Veto(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxNotifyEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxNotifyEvent_Veto",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxNotifyEvent_Veto",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxNotifyEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotifyEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotifyEvent_Veto. Expected _wxNotifyEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotifyEvent_Veto. Expected _wxNotifyEvent_p.");
         return NULL;
         }


@@ -3068,370 +3192,380 @@ static PyObject *_wrap_wxNotifyEvent_Veto(PyObject *self, PyObject *args) {
 }
 
 static PyMethodDef eventscMethods[] = {
 }
 
 static PyMethodDef eventscMethods[] = {

-        { "wxNotifyEvent_Veto", _wrap_wxNotifyEvent_Veto, 1 },
-        { "wxNotifyEvent_IsAllowed", _wrap_wxNotifyEvent_IsAllowed, 1 },
-        { "wxPyEvent_GetUserData", _wrap_wxPyEvent_GetUserData, 1 },
-        { "wxPyEvent_SetUserData", _wrap_wxPyEvent_SetUserData, 1 },
-        { "delete_wxPyEvent", _wrap_delete_wxPyEvent, 1 },
-        { "new_wxPyEvent", _wrap_new_wxPyEvent, 1 },
-        { "wxUpdateUIEvent_SetText", _wrap_wxUpdateUIEvent_SetText, 1 },
-        { "wxUpdateUIEvent_Enable", _wrap_wxUpdateUIEvent_Enable, 1 },
-        { "wxUpdateUIEvent_Check", _wrap_wxUpdateUIEvent_Check, 1 },
-        { "wxUpdateUIEvent_GetSetEnabled", _wrap_wxUpdateUIEvent_GetSetEnabled, 1 },
-        { "wxUpdateUIEvent_GetSetChecked", _wrap_wxUpdateUIEvent_GetSetChecked, 1 },
-        { "wxUpdateUIEvent_GetSetText", _wrap_wxUpdateUIEvent_GetSetText, 1 },
-        { "wxUpdateUIEvent_GetText", _wrap_wxUpdateUIEvent_GetText, 1 },
-        { "wxUpdateUIEvent_GetEnabled", _wrap_wxUpdateUIEvent_GetEnabled, 1 },
-        { "wxUpdateUIEvent_GetChecked", _wrap_wxUpdateUIEvent_GetChecked, 1 },
-        { "wxIdleEvent_MoreRequested", _wrap_wxIdleEvent_MoreRequested, 1 },
-        { "wxIdleEvent_RequestMore", _wrap_wxIdleEvent_RequestMore, 1 },
-        { "wxDropFilesEvent_GetFiles", _wrap_wxDropFilesEvent_GetFiles, 1 },
-        { "wxDropFilesEvent_GetNumberOfFiles", _wrap_wxDropFilesEvent_GetNumberOfFiles, 1 },
-        { "wxDropFilesEvent_GetPosition", _wrap_wxDropFilesEvent_GetPosition, 1 },
-        { "wxJoystickEvent_ButtonIsDown", _wrap_wxJoystickEvent_ButtonIsDown, 1 },
-        { "wxJoystickEvent_ButtonUp", _wrap_wxJoystickEvent_ButtonUp, 1 },
-        { "wxJoystickEvent_ButtonDown", _wrap_wxJoystickEvent_ButtonDown, 1 },
-        { "wxJoystickEvent_IsZMove", _wrap_wxJoystickEvent_IsZMove, 1 },
-        { "wxJoystickEvent_IsMove", _wrap_wxJoystickEvent_IsMove, 1 },
-        { "wxJoystickEvent_IsButton", _wrap_wxJoystickEvent_IsButton, 1 },
-        { "wxJoystickEvent_SetZPosition", _wrap_wxJoystickEvent_SetZPosition, 1 },
-        { "wxJoystickEvent_SetPosition", _wrap_wxJoystickEvent_SetPosition, 1 },
-        { "wxJoystickEvent_SetButtonChange", _wrap_wxJoystickEvent_SetButtonChange, 1 },
-        { "wxJoystickEvent_SetButtonState", _wrap_wxJoystickEvent_SetButtonState, 1 },
-        { "wxJoystickEvent_SetJoystick", _wrap_wxJoystickEvent_SetJoystick, 1 },
-        { "wxJoystickEvent_GetJoystick", _wrap_wxJoystickEvent_GetJoystick, 1 },
-        { "wxJoystickEvent_GetButtonChange", _wrap_wxJoystickEvent_GetButtonChange, 1 },
-        { "wxJoystickEvent_GetButtonState", _wrap_wxJoystickEvent_GetButtonState, 1 },
-        { "wxJoystickEvent_GetZPosition", _wrap_wxJoystickEvent_GetZPosition, 1 },
-        { "wxJoystickEvent_GetPosition", _wrap_wxJoystickEvent_GetPosition, 1 },
-        { "wxShowEvent_GetShow", _wrap_wxShowEvent_GetShow, 1 },
-        { "wxShowEvent_SetShow", _wrap_wxShowEvent_SetShow, 1 },
-        { "wxMenuEvent_GetMenuId", _wrap_wxMenuEvent_GetMenuId, 1 },
-        { "wxActivateEvent_GetActive", _wrap_wxActivateEvent_GetActive, 1 },
-        { "wxEraseEvent_GetDC", _wrap_wxEraseEvent_GetDC, 1 },
-        { "wxMoveEvent_GetPosition", _wrap_wxMoveEvent_GetPosition, 1 },
-        { "wxKeyEvent_KeyCode", _wrap_wxKeyEvent_KeyCode, 1 },
-        { "wxKeyEvent_ShiftDown", _wrap_wxKeyEvent_ShiftDown, 1 },
-        { "wxKeyEvent_AltDown", _wrap_wxKeyEvent_AltDown, 1 },
-        { "wxKeyEvent_MetaDown", _wrap_wxKeyEvent_MetaDown, 1 },
-        { "wxKeyEvent_ControlDown", _wrap_wxKeyEvent_ControlDown, 1 },
-        { "wxMouseEvent_GetY", _wrap_wxMouseEvent_GetY, 1 },
-        { "wxMouseEvent_GetX", _wrap_wxMouseEvent_GetX, 1 },
-        { "wxMouseEvent_GetLogicalPosition", _wrap_wxMouseEvent_GetLogicalPosition, 1 },
-        { "wxMouseEvent_GetPosition", _wrap_wxMouseEvent_GetPosition, 1 },
-        { "wxMouseEvent_Position", _wrap_wxMouseEvent_Position, 1 },
-        { "wxMouseEvent_Leaving", _wrap_wxMouseEvent_Leaving, 1 },
-        { "wxMouseEvent_Entering", _wrap_wxMouseEvent_Entering, 1 },
-        { "wxMouseEvent_Moving", _wrap_wxMouseEvent_Moving, 1 },
-        { "wxMouseEvent_Dragging", _wrap_wxMouseEvent_Dragging, 1 },
-        { "wxMouseEvent_RightIsDown", _wrap_wxMouseEvent_RightIsDown, 1 },
-        { "wxMouseEvent_MiddleIsDown", _wrap_wxMouseEvent_MiddleIsDown, 1 },
-        { "wxMouseEvent_LeftIsDown", _wrap_wxMouseEvent_LeftIsDown, 1 },
-        { "wxMouseEvent_RightDClick", _wrap_wxMouseEvent_RightDClick, 1 },
-        { "wxMouseEvent_MiddleDClick", _wrap_wxMouseEvent_MiddleDClick, 1 },
-        { "wxMouseEvent_LeftDClick", _wrap_wxMouseEvent_LeftDClick, 1 },
-        { "wxMouseEvent_RightUp", _wrap_wxMouseEvent_RightUp, 1 },
-        { "wxMouseEvent_MiddleUp", _wrap_wxMouseEvent_MiddleUp, 1 },
-        { "wxMouseEvent_LeftUp", _wrap_wxMouseEvent_LeftUp, 1 },
-        { "wxMouseEvent_RightDown", _wrap_wxMouseEvent_RightDown, 1 },
-        { "wxMouseEvent_MiddleDown", _wrap_wxMouseEvent_MiddleDown, 1 },
-        { "wxMouseEvent_LeftDown", _wrap_wxMouseEvent_LeftDown, 1 },
-        { "wxMouseEvent_ShiftDown", _wrap_wxMouseEvent_ShiftDown, 1 },
-        { "wxMouseEvent_AltDown", _wrap_wxMouseEvent_AltDown, 1 },
-        { "wxMouseEvent_MetaDown", _wrap_wxMouseEvent_MetaDown, 1 },
-        { "wxMouseEvent_ControlDown", _wrap_wxMouseEvent_ControlDown, 1 },
-        { "wxMouseEvent_ButtonIsDown", _wrap_wxMouseEvent_ButtonIsDown, 1 },
-        { "wxMouseEvent_Button", _wrap_wxMouseEvent_Button, 1 },
-        { "wxMouseEvent_ButtonUp", _wrap_wxMouseEvent_ButtonUp, 1 },
-        { "wxMouseEvent_ButtonDClick", _wrap_wxMouseEvent_ButtonDClick, 1 },
-        { "wxMouseEvent_ButtonDown", _wrap_wxMouseEvent_ButtonDown, 1 },
-        { "wxMouseEvent_IsButton", _wrap_wxMouseEvent_IsButton, 1 },
-        { "wxScrollEvent_GetPosition", _wrap_wxScrollEvent_GetPosition, 1 },
-        { "wxScrollEvent_GetOrientation", _wrap_wxScrollEvent_GetOrientation, 1 },
-        { "wxCommandEvent_IsSelection", _wrap_wxCommandEvent_IsSelection, 1 },
-        { "wxCommandEvent_GetString", _wrap_wxCommandEvent_GetString, 1 },
-        { "wxCommandEvent_GetSelection", _wrap_wxCommandEvent_GetSelection, 1 },
-        { "wxCommandEvent_GetInt", _wrap_wxCommandEvent_GetInt, 1 },
-        { "wxCommandEvent_GetExtraLong", _wrap_wxCommandEvent_GetExtraLong, 1 },
-        { "wxCommandEvent_Checked", _wrap_wxCommandEvent_Checked, 1 },
-        { "wxCloseEvent_SetCanVeto", _wrap_wxCloseEvent_SetCanVeto, 1 },
-        { "wxCloseEvent_GetVeto", _wrap_wxCloseEvent_GetVeto, 1 },
-        { "wxCloseEvent_CanVeto", _wrap_wxCloseEvent_CanVeto, 1 },
-        { "wxCloseEvent_Veto", _wrap_wxCloseEvent_Veto, 1 },
-        { "wxCloseEvent_GetLoggingOff", _wrap_wxCloseEvent_GetLoggingOff, 1 },
-        { "wxCloseEvent_SetLoggingOff", _wrap_wxCloseEvent_SetLoggingOff, 1 },
-        { "wxSizeEvent_GetSize", _wrap_wxSizeEvent_GetSize, 1 },
-        { "wxEvent_Skip", _wrap_wxEvent_Skip, 1 },
-        { "wxEvent_SetTimestamp", _wrap_wxEvent_SetTimestamp, 1 },
-        { "wxEvent_SetId", _wrap_wxEvent_SetId, 1 },
-        { "wxEvent_SetEventType", _wrap_wxEvent_SetEventType, 1 },
-        { "wxEvent_SetEventObject", _wrap_wxEvent_SetEventObject, 1 },
-        { "wxEvent_GetTimestamp", _wrap_wxEvent_GetTimestamp, 1 },
-        { "wxEvent_GetSkipped", _wrap_wxEvent_GetSkipped, 1 },
-        { "wxEvent_GetId", _wrap_wxEvent_GetId, 1 },
-        { "wxEvent_GetEventType", _wrap_wxEvent_GetEventType, 1 },
-        { "wxEvent_GetEventObject", _wrap_wxEvent_GetEventObject, 1 },
+        { "wxNotifyEvent_Veto", _wrap_wxNotifyEvent_Veto, METH_VARARGS },
+        { "wxNotifyEvent_IsAllowed", _wrap_wxNotifyEvent_IsAllowed, METH_VARARGS },
+        { "wxPyEvent_GetUserData", _wrap_wxPyEvent_GetUserData, METH_VARARGS },
+        { "wxPyEvent_SetUserData", _wrap_wxPyEvent_SetUserData, METH_VARARGS },
+        { "delete_wxPyEvent", _wrap_delete_wxPyEvent, METH_VARARGS },
+        { "new_wxPyEvent", _wrap_new_wxPyEvent, METH_VARARGS },
+        { "wxUpdateUIEvent_SetText", _wrap_wxUpdateUIEvent_SetText, METH_VARARGS },
+        { "wxUpdateUIEvent_Enable", _wrap_wxUpdateUIEvent_Enable, METH_VARARGS },
+        { "wxUpdateUIEvent_Check", _wrap_wxUpdateUIEvent_Check, METH_VARARGS },
+        { "wxUpdateUIEvent_GetSetEnabled", _wrap_wxUpdateUIEvent_GetSetEnabled, METH_VARARGS },
+        { "wxUpdateUIEvent_GetSetChecked", _wrap_wxUpdateUIEvent_GetSetChecked, METH_VARARGS },
+        { "wxUpdateUIEvent_GetSetText", _wrap_wxUpdateUIEvent_GetSetText, METH_VARARGS },
+        { "wxUpdateUIEvent_GetText", _wrap_wxUpdateUIEvent_GetText, METH_VARARGS },
+        { "wxUpdateUIEvent_GetEnabled", _wrap_wxUpdateUIEvent_GetEnabled, METH_VARARGS },
+        { "wxUpdateUIEvent_GetChecked", _wrap_wxUpdateUIEvent_GetChecked, METH_VARARGS },
+        { "wxIdleEvent_MoreRequested", _wrap_wxIdleEvent_MoreRequested, METH_VARARGS },
+        { "wxIdleEvent_RequestMore", _wrap_wxIdleEvent_RequestMore, METH_VARARGS },
+        { "wxDropFilesEvent_GetFiles", _wrap_wxDropFilesEvent_GetFiles, METH_VARARGS },
+        { "wxDropFilesEvent_GetNumberOfFiles", _wrap_wxDropFilesEvent_GetNumberOfFiles, METH_VARARGS },
+        { "wxDropFilesEvent_GetPosition", _wrap_wxDropFilesEvent_GetPosition, METH_VARARGS },
+        { "wxJoystickEvent_ButtonIsDown", _wrap_wxJoystickEvent_ButtonIsDown, METH_VARARGS },
+        { "wxJoystickEvent_ButtonUp", _wrap_wxJoystickEvent_ButtonUp, METH_VARARGS },
+        { "wxJoystickEvent_ButtonDown", _wrap_wxJoystickEvent_ButtonDown, METH_VARARGS },
+        { "wxJoystickEvent_IsZMove", _wrap_wxJoystickEvent_IsZMove, METH_VARARGS },
+        { "wxJoystickEvent_IsMove", _wrap_wxJoystickEvent_IsMove, METH_VARARGS },
+        { "wxJoystickEvent_IsButton", _wrap_wxJoystickEvent_IsButton, METH_VARARGS },
+        { "wxJoystickEvent_SetZPosition", _wrap_wxJoystickEvent_SetZPosition, METH_VARARGS },
+        { "wxJoystickEvent_SetPosition", _wrap_wxJoystickEvent_SetPosition, METH_VARARGS },
+        { "wxJoystickEvent_SetButtonChange", _wrap_wxJoystickEvent_SetButtonChange, METH_VARARGS },
+        { "wxJoystickEvent_SetButtonState", _wrap_wxJoystickEvent_SetButtonState, METH_VARARGS },
+        { "wxJoystickEvent_SetJoystick", _wrap_wxJoystickEvent_SetJoystick, METH_VARARGS },
+        { "wxJoystickEvent_GetJoystick", _wrap_wxJoystickEvent_GetJoystick, METH_VARARGS },
+        { "wxJoystickEvent_GetButtonChange", _wrap_wxJoystickEvent_GetButtonChange, METH_VARARGS },
+        { "wxJoystickEvent_GetButtonState", _wrap_wxJoystickEvent_GetButtonState, METH_VARARGS },
+        { "wxJoystickEvent_GetZPosition", _wrap_wxJoystickEvent_GetZPosition, METH_VARARGS },
+        { "wxJoystickEvent_GetPosition", _wrap_wxJoystickEvent_GetPosition, METH_VARARGS },
+        { "wxShowEvent_GetShow", _wrap_wxShowEvent_GetShow, METH_VARARGS },
+        { "wxShowEvent_SetShow", _wrap_wxShowEvent_SetShow, METH_VARARGS },
+        { "wxMenuEvent_GetMenuId", _wrap_wxMenuEvent_GetMenuId, METH_VARARGS },
+        { "wxActivateEvent_GetActive", _wrap_wxActivateEvent_GetActive, METH_VARARGS },
+        { "wxEraseEvent_GetDC", _wrap_wxEraseEvent_GetDC, METH_VARARGS },
+        { "wxMoveEvent_GetPosition", _wrap_wxMoveEvent_GetPosition, METH_VARARGS },
+        { "wxKeyEvent_KeyCode", _wrap_wxKeyEvent_KeyCode, METH_VARARGS },
+        { "wxKeyEvent_ShiftDown", _wrap_wxKeyEvent_ShiftDown, METH_VARARGS },
+        { "wxKeyEvent_AltDown", _wrap_wxKeyEvent_AltDown, METH_VARARGS },
+        { "wxKeyEvent_MetaDown", _wrap_wxKeyEvent_MetaDown, METH_VARARGS },
+        { "wxKeyEvent_ControlDown", _wrap_wxKeyEvent_ControlDown, METH_VARARGS },
+        { "wxMouseEvent_GetY", _wrap_wxMouseEvent_GetY, METH_VARARGS },
+        { "wxMouseEvent_GetX", _wrap_wxMouseEvent_GetX, METH_VARARGS },
+        { "wxMouseEvent_GetLogicalPosition", _wrap_wxMouseEvent_GetLogicalPosition, METH_VARARGS },
+        { "wxMouseEvent_GetPosition", _wrap_wxMouseEvent_GetPosition, METH_VARARGS },
+        { "wxMouseEvent_Position", _wrap_wxMouseEvent_Position, METH_VARARGS },
+        { "wxMouseEvent_Leaving", _wrap_wxMouseEvent_Leaving, METH_VARARGS },
+        { "wxMouseEvent_Entering", _wrap_wxMouseEvent_Entering, METH_VARARGS },
+        { "wxMouseEvent_Moving", _wrap_wxMouseEvent_Moving, METH_VARARGS },
+        { "wxMouseEvent_Dragging", _wrap_wxMouseEvent_Dragging, METH_VARARGS },
+        { "wxMouseEvent_RightIsDown", _wrap_wxMouseEvent_RightIsDown, METH_VARARGS },
+        { "wxMouseEvent_MiddleIsDown", _wrap_wxMouseEvent_MiddleIsDown, METH_VARARGS },
+        { "wxMouseEvent_LeftIsDown", _wrap_wxMouseEvent_LeftIsDown, METH_VARARGS },
+        { "wxMouseEvent_RightDClick", _wrap_wxMouseEvent_RightDClick, METH_VARARGS },
+        { "wxMouseEvent_MiddleDClick", _wrap_wxMouseEvent_MiddleDClick, METH_VARARGS },
+        { "wxMouseEvent_LeftDClick", _wrap_wxMouseEvent_LeftDClick, METH_VARARGS },
+        { "wxMouseEvent_RightUp", _wrap_wxMouseEvent_RightUp, METH_VARARGS },
+        { "wxMouseEvent_MiddleUp", _wrap_wxMouseEvent_MiddleUp, METH_VARARGS },
+        { "wxMouseEvent_LeftUp", _wrap_wxMouseEvent_LeftUp, METH_VARARGS },
+        { "wxMouseEvent_RightDown", _wrap_wxMouseEvent_RightDown, METH_VARARGS },
+        { "wxMouseEvent_MiddleDown", _wrap_wxMouseEvent_MiddleDown, METH_VARARGS },
+        { "wxMouseEvent_LeftDown", _wrap_wxMouseEvent_LeftDown, METH_VARARGS },
+        { "wxMouseEvent_ShiftDown", _wrap_wxMouseEvent_ShiftDown, METH_VARARGS },
+        { "wxMouseEvent_AltDown", _wrap_wxMouseEvent_AltDown, METH_VARARGS },
+        { "wxMouseEvent_MetaDown", _wrap_wxMouseEvent_MetaDown, METH_VARARGS },
+        { "wxMouseEvent_ControlDown", _wrap_wxMouseEvent_ControlDown, METH_VARARGS },
+        { "wxMouseEvent_ButtonIsDown", _wrap_wxMouseEvent_ButtonIsDown, METH_VARARGS },
+        { "wxMouseEvent_Button", _wrap_wxMouseEvent_Button, METH_VARARGS },
+        { "wxMouseEvent_ButtonUp", _wrap_wxMouseEvent_ButtonUp, METH_VARARGS },
+        { "wxMouseEvent_ButtonDClick", _wrap_wxMouseEvent_ButtonDClick, METH_VARARGS },
+        { "wxMouseEvent_ButtonDown", _wrap_wxMouseEvent_ButtonDown, METH_VARARGS },
+        { "wxMouseEvent_IsButton", _wrap_wxMouseEvent_IsButton, METH_VARARGS },
+        { "wxScrollEvent_GetPosition", _wrap_wxScrollEvent_GetPosition, METH_VARARGS },
+        { "wxScrollEvent_GetOrientation", _wrap_wxScrollEvent_GetOrientation, METH_VARARGS },
+        { "wxCommandEvent_IsSelection", _wrap_wxCommandEvent_IsSelection, METH_VARARGS },
+        { "wxCommandEvent_GetString", _wrap_wxCommandEvent_GetString, METH_VARARGS },
+        { "wxCommandEvent_GetSelection", _wrap_wxCommandEvent_GetSelection, METH_VARARGS },
+        { "wxCommandEvent_GetInt", _wrap_wxCommandEvent_GetInt, METH_VARARGS },
+        { "wxCommandEvent_GetExtraLong", _wrap_wxCommandEvent_GetExtraLong, METH_VARARGS },
+        { "wxCommandEvent_Checked", _wrap_wxCommandEvent_Checked, METH_VARARGS },
+        { "wxCloseEvent_SetCanVeto", _wrap_wxCloseEvent_SetCanVeto, METH_VARARGS },
+        { "wxCloseEvent_GetVeto", _wrap_wxCloseEvent_GetVeto, METH_VARARGS },
+        { "wxCloseEvent_CanVeto", _wrap_wxCloseEvent_CanVeto, METH_VARARGS },
+        { "wxCloseEvent_Veto", _wrap_wxCloseEvent_Veto, METH_VARARGS },
+        { "wxCloseEvent_GetLoggingOff", _wrap_wxCloseEvent_GetLoggingOff, METH_VARARGS },
+        { "wxCloseEvent_SetLoggingOff", _wrap_wxCloseEvent_SetLoggingOff, METH_VARARGS },
+        { "wxSizeEvent_GetSize", _wrap_wxSizeEvent_GetSize, METH_VARARGS },
+        { "wxEvent_Skip", _wrap_wxEvent_Skip, METH_VARARGS },
+        { "wxEvent_SetTimestamp", _wrap_wxEvent_SetTimestamp, METH_VARARGS },
+        { "wxEvent_SetId", _wrap_wxEvent_SetId, METH_VARARGS },
+        { "wxEvent_SetEventType", _wrap_wxEvent_SetEventType, METH_VARARGS },
+        { "wxEvent_SetEventObject", _wrap_wxEvent_SetEventObject, METH_VARARGS },
+        { "wxEvent_GetTimestamp", _wrap_wxEvent_GetTimestamp, METH_VARARGS },
+        { "wxEvent_GetSkipped", _wrap_wxEvent_GetSkipped, METH_VARARGS },
+        { "wxEvent_GetId", _wrap_wxEvent_GetId, METH_VARARGS },
+        { "wxEvent_GetEventType", _wrap_wxEvent_GetEventType, METH_VARARGS },
+        { "wxEvent_GetEventObject", _wrap_wxEvent_GetEventObject, METH_VARARGS },

         { NULL, NULL }
 };
         { NULL, NULL }
 };

+#ifdef __cplusplus
+}
+#endif
+/*
+ * This table is used by the pointer type-checker
+ */
+static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
+    { "_wxAcceleratorTable","_class_wxAcceleratorTable",0},
+    { "_wxEvent","_class_wxNotifyEvent",SwigwxNotifyEventTowxEvent},
+    { "_wxEvent","_wxNotifyEvent",SwigwxNotifyEventTowxEvent},
+    { "_wxEvent","_class_wxPyEvent",SwigwxPyEventTowxEvent},
+    { "_wxEvent","_wxPyEvent",SwigwxPyEventTowxEvent},
+    { "_wxEvent","_class_wxSysColourChangedEvent",SwigwxSysColourChangedEventTowxEvent},
+    { "_wxEvent","_wxSysColourChangedEvent",SwigwxSysColourChangedEventTowxEvent},
+    { "_wxEvent","_class_wxUpdateUIEvent",SwigwxUpdateUIEventTowxEvent},
+    { "_wxEvent","_wxUpdateUIEvent",SwigwxUpdateUIEventTowxEvent},
+    { "_wxEvent","_class_wxIdleEvent",SwigwxIdleEventTowxEvent},
+    { "_wxEvent","_wxIdleEvent",SwigwxIdleEventTowxEvent},
+    { "_wxEvent","_class_wxDropFilesEvent",SwigwxDropFilesEventTowxEvent},
+    { "_wxEvent","_wxDropFilesEvent",SwigwxDropFilesEventTowxEvent},
+    { "_wxEvent","_class_wxJoystickEvent",SwigwxJoystickEventTowxEvent},
+    { "_wxEvent","_wxJoystickEvent",SwigwxJoystickEventTowxEvent},
+    { "_wxEvent","_class_wxMaximizeEvent",SwigwxMaximizeEventTowxEvent},
+    { "_wxEvent","_wxMaximizeEvent",SwigwxMaximizeEventTowxEvent},
+    { "_wxEvent","_class_wxIconizeEvent",SwigwxIconizeEventTowxEvent},
+    { "_wxEvent","_wxIconizeEvent",SwigwxIconizeEventTowxEvent},
+    { "_wxEvent","_class_wxShowEvent",SwigwxShowEventTowxEvent},
+    { "_wxEvent","_wxShowEvent",SwigwxShowEventTowxEvent},
+    { "_wxEvent","_class_wxMenuEvent",SwigwxMenuEventTowxEvent},
+    { "_wxEvent","_wxMenuEvent",SwigwxMenuEventTowxEvent},
+    { "_wxEvent","_class_wxInitDialogEvent",SwigwxInitDialogEventTowxEvent},
+    { "_wxEvent","_wxInitDialogEvent",SwigwxInitDialogEventTowxEvent},
+    { "_wxEvent","_class_wxActivateEvent",SwigwxActivateEventTowxEvent},
+    { "_wxEvent","_wxActivateEvent",SwigwxActivateEventTowxEvent},
+    { "_wxEvent","_class_wxFocusEvent",SwigwxFocusEventTowxEvent},
+    { "_wxEvent","_wxFocusEvent",SwigwxFocusEventTowxEvent},
+    { "_wxEvent","_class_wxEraseEvent",SwigwxEraseEventTowxEvent},
+    { "_wxEvent","_wxEraseEvent",SwigwxEraseEventTowxEvent},
+    { "_wxEvent","_class_wxPaintEvent",SwigwxPaintEventTowxEvent},
+    { "_wxEvent","_wxPaintEvent",SwigwxPaintEventTowxEvent},
+    { "_wxEvent","_class_wxMoveEvent",SwigwxMoveEventTowxEvent},
+    { "_wxEvent","_wxMoveEvent",SwigwxMoveEventTowxEvent},
+    { "_wxEvent","_class_wxKeyEvent",SwigwxKeyEventTowxEvent},
+    { "_wxEvent","_wxKeyEvent",SwigwxKeyEventTowxEvent},
+    { "_wxEvent","_class_wxMouseEvent",SwigwxMouseEventTowxEvent},
+    { "_wxEvent","_wxMouseEvent",SwigwxMouseEventTowxEvent},
+    { "_wxEvent","_class_wxSpinEvent",SwigwxSpinEventTowxEvent},
+    { "_wxEvent","_wxSpinEvent",SwigwxSpinEventTowxEvent},
+    { "_wxEvent","_class_wxScrollEvent",SwigwxScrollEventTowxEvent},
+    { "_wxEvent","_wxScrollEvent",SwigwxScrollEventTowxEvent},
+    { "_wxEvent","_class_wxCommandEvent",SwigwxCommandEventTowxEvent},
+    { "_wxEvent","_wxCommandEvent",SwigwxCommandEventTowxEvent},
+    { "_wxEvent","_class_wxCloseEvent",SwigwxCloseEventTowxEvent},
+    { "_wxEvent","_wxCloseEvent",SwigwxCloseEventTowxEvent},
+    { "_wxEvent","_class_wxSizeEvent",SwigwxSizeEventTowxEvent},
+    { "_wxEvent","_wxSizeEvent",SwigwxSizeEventTowxEvent},
+    { "_wxEvent","_class_wxEvent",0},
+    { "_class_wxActivateEvent","_wxActivateEvent",0},
+    { "_signed_long","_long",0},
+    { "_wxMenuEvent","_class_wxMenuEvent",0},
+    { "_wxPrintQuality","_int",0},
+    { "_wxPrintQuality","_signed_int",0},
+    { "_wxPrintQuality","_unsigned_int",0},
+    { "_wxPrintQuality","_wxWindowID",0},
+    { "_wxPrintQuality","_uint",0},
+    { "_wxPrintQuality","_EBool",0},
+    { "_wxPrintQuality","_size_t",0},
+    { "_class_wxRegionIterator","_wxRegionIterator",0},
+    { "_wxPaintEvent","_class_wxPaintEvent",0},
+    { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
+    { "_wxNotifyEvent","_class_wxNotifyEvent",0},
+    { "_wxUpdateUIEvent","_class_wxUpdateUIEvent",0},
+    { "_byte","_unsigned_char",0},
+    { "_long","_unsigned_long",0},
+    { "_long","_signed_long",0},
+    { "_wxDropFilesEvent","_class_wxDropFilesEvent",0},
+    { "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
+    { "_wxSpinEvent","_class_wxSpinEvent",0},
+    { "_size_t","_wxPrintQuality",0},
+    { "_size_t","_unsigned_int",0},
+    { "_size_t","_int",0},
+    { "_size_t","_wxWindowID",0},
+    { "_size_t","_uint",0},
+    { "_class_wxRealPoint","_wxRealPoint",0},
+    { "_class_wxPaintEvent","_wxPaintEvent",0},
+    { "_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0},
+    { "_wxInitDialogEvent","_class_wxInitDialogEvent",0},
+    { "_wxPyEvent","_class_wxPyEvent",0},
+    { "_class_wxKeyEvent","_wxKeyEvent",0},
+    { "_wxIdleEvent","_class_wxIdleEvent",0},
+    { "_class_wxUpdateUIEvent","_wxUpdateUIEvent",0},
+    { "_wxShowEvent","_class_wxShowEvent",0},
+    { "_uint","_wxPrintQuality",0},
+    { "_uint","_size_t",0},
+    { "_uint","_unsigned_int",0},
+    { "_uint","_int",0},
+    { "_uint","_wxWindowID",0},
+    { "_class_wxEvent","_class_wxNotifyEvent",SwigwxNotifyEventTowxEvent},
+    { "_class_wxEvent","_wxNotifyEvent",SwigwxNotifyEventTowxEvent},
+    { "_class_wxEvent","_class_wxPyEvent",SwigwxPyEventTowxEvent},
+    { "_class_wxEvent","_wxPyEvent",SwigwxPyEventTowxEvent},
+    { "_class_wxEvent","_class_wxSysColourChangedEvent",SwigwxSysColourChangedEventTowxEvent},
+    { "_class_wxEvent","_wxSysColourChangedEvent",SwigwxSysColourChangedEventTowxEvent},
+    { "_class_wxEvent","_class_wxUpdateUIEvent",SwigwxUpdateUIEventTowxEvent},
+    { "_class_wxEvent","_wxUpdateUIEvent",SwigwxUpdateUIEventTowxEvent},
+    { "_class_wxEvent","_class_wxIdleEvent",SwigwxIdleEventTowxEvent},
+    { "_class_wxEvent","_wxIdleEvent",SwigwxIdleEventTowxEvent},
+    { "_class_wxEvent","_class_wxDropFilesEvent",SwigwxDropFilesEventTowxEvent},
+    { "_class_wxEvent","_wxDropFilesEvent",SwigwxDropFilesEventTowxEvent},
+    { "_class_wxEvent","_class_wxJoystickEvent",SwigwxJoystickEventTowxEvent},
+    { "_class_wxEvent","_wxJoystickEvent",SwigwxJoystickEventTowxEvent},
+    { "_class_wxEvent","_class_wxMaximizeEvent",SwigwxMaximizeEventTowxEvent},
+    { "_class_wxEvent","_wxMaximizeEvent",SwigwxMaximizeEventTowxEvent},
+    { "_class_wxEvent","_class_wxIconizeEvent",SwigwxIconizeEventTowxEvent},
+    { "_class_wxEvent","_wxIconizeEvent",SwigwxIconizeEventTowxEvent},
+    { "_class_wxEvent","_class_wxShowEvent",SwigwxShowEventTowxEvent},
+    { "_class_wxEvent","_wxShowEvent",SwigwxShowEventTowxEvent},
+    { "_class_wxEvent","_class_wxMenuEvent",SwigwxMenuEventTowxEvent},
+    { "_class_wxEvent","_wxMenuEvent",SwigwxMenuEventTowxEvent},
+    { "_class_wxEvent","_class_wxInitDialogEvent",SwigwxInitDialogEventTowxEvent},
+    { "_class_wxEvent","_wxInitDialogEvent",SwigwxInitDialogEventTowxEvent},
+    { "_class_wxEvent","_class_wxActivateEvent",SwigwxActivateEventTowxEvent},
+    { "_class_wxEvent","_wxActivateEvent",SwigwxActivateEventTowxEvent},
+    { "_class_wxEvent","_class_wxFocusEvent",SwigwxFocusEventTowxEvent},
+    { "_class_wxEvent","_wxFocusEvent",SwigwxFocusEventTowxEvent},
+    { "_class_wxEvent","_class_wxEraseEvent",SwigwxEraseEventTowxEvent},
+    { "_class_wxEvent","_wxEraseEvent",SwigwxEraseEventTowxEvent},
+    { "_class_wxEvent","_class_wxPaintEvent",SwigwxPaintEventTowxEvent},
+    { "_class_wxEvent","_wxPaintEvent",SwigwxPaintEventTowxEvent},
+    { "_class_wxEvent","_class_wxMoveEvent",SwigwxMoveEventTowxEvent},
+    { "_class_wxEvent","_wxMoveEvent",SwigwxMoveEventTowxEvent},
+    { "_class_wxEvent","_class_wxKeyEvent",SwigwxKeyEventTowxEvent},
+    { "_class_wxEvent","_wxKeyEvent",SwigwxKeyEventTowxEvent},
+    { "_class_wxEvent","_class_wxMouseEvent",SwigwxMouseEventTowxEvent},
+    { "_class_wxEvent","_wxMouseEvent",SwigwxMouseEventTowxEvent},
+    { "_class_wxEvent","_class_wxSpinEvent",SwigwxSpinEventTowxEvent},
+    { "_class_wxEvent","_wxSpinEvent",SwigwxSpinEventTowxEvent},
+    { "_class_wxEvent","_class_wxScrollEvent",SwigwxScrollEventTowxEvent},
+    { "_class_wxEvent","_wxScrollEvent",SwigwxScrollEventTowxEvent},
+    { "_class_wxEvent","_class_wxCommandEvent",SwigwxCommandEventTowxEvent},
+    { "_class_wxEvent","_wxCommandEvent",SwigwxCommandEventTowxEvent},
+    { "_class_wxEvent","_class_wxCloseEvent",SwigwxCloseEventTowxEvent},
+    { "_class_wxEvent","_wxCloseEvent",SwigwxCloseEventTowxEvent},
+    { "_class_wxEvent","_class_wxSizeEvent",SwigwxSizeEventTowxEvent},
+    { "_class_wxEvent","_wxSizeEvent",SwigwxSizeEventTowxEvent},
+    { "_class_wxEvent","_wxEvent",0},
+    { "_wxRect","_class_wxRect",0},
+    { "_wxCommandEvent","_class_wxNotifyEvent",SwigwxNotifyEventTowxCommandEvent},
+    { "_wxCommandEvent","_wxNotifyEvent",SwigwxNotifyEventTowxCommandEvent},
+    { "_wxCommandEvent","_class_wxPyEvent",SwigwxPyEventTowxCommandEvent},
+    { "_wxCommandEvent","_wxPyEvent",SwigwxPyEventTowxCommandEvent},
+    { "_wxCommandEvent","_class_wxSpinEvent",SwigwxSpinEventTowxCommandEvent},
+    { "_wxCommandEvent","_wxSpinEvent",SwigwxSpinEventTowxCommandEvent},
+    { "_wxCommandEvent","_class_wxScrollEvent",SwigwxScrollEventTowxCommandEvent},
+    { "_wxCommandEvent","_wxScrollEvent",SwigwxScrollEventTowxCommandEvent},
+    { "_wxCommandEvent","_class_wxCommandEvent",0},
+    { "_wxSizeEvent","_class_wxSizeEvent",0},
+    { "_wxPoint","_class_wxPoint",0},
+    { "_wxPyTimer","_class_wxPyTimer",0},
+    { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
+    { "_class_wxNotifyEvent","_wxNotifyEvent",0},
+    { "_class_wxPyEvent","_wxPyEvent",0},
+    { "_class_wxIconizeEvent","_wxIconizeEvent",0},
+    { "_wxScrollEvent","_class_wxSpinEvent",SwigwxSpinEventTowxScrollEvent},
+    { "_wxScrollEvent","_wxSpinEvent",SwigwxSpinEventTowxScrollEvent},
+    { "_wxScrollEvent","_class_wxScrollEvent",0},
+    { "_EBool","_wxPrintQuality",0},
+    { "_EBool","_signed_int",0},
+    { "_EBool","_int",0},
+    { "_EBool","_wxWindowID",0},
+    { "_class_wxRegion","_wxRegion",0},
+    { "_class_wxDropFilesEvent","_wxDropFilesEvent",0},
+    { "_wxCloseEvent","_class_wxCloseEvent",0},
+    { "_unsigned_long","_long",0},
+    { "_class_wxRect","_wxRect",0},
+    { "_class_wxPyTimer","_wxPyTimer",0},
+    { "_wxFocusEvent","_class_wxFocusEvent",0},
+    { "_wxMaximizeEvent","_class_wxMaximizeEvent",0},
+    { "_wxAcceleratorEntry","_class_wxAcceleratorEntry",0},
+    { "_signed_int","_wxPrintQuality",0},
+    { "_signed_int","_EBool",0},
+    { "_signed_int","_wxWindowID",0},
+    { "_signed_int","_int",0},
+    { "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
+    { "_class_wxMoveEvent","_wxMoveEvent",0},
+    { "_WXTYPE","_short",0},
+    { "_WXTYPE","_signed_short",0},
+    { "_WXTYPE","_unsigned_short",0},
+    { "_unsigned_short","_WXTYPE",0},
+    { "_unsigned_short","_short",0},
+    { "_class_wxCloseEvent","_wxCloseEvent",0},
+    { "_class_wxMenuEvent","_wxMenuEvent",0},
+    { "_wxMouseEvent","_class_wxMouseEvent",0},
+    { "_class_wxPoint","_wxPoint",0},
+    { "_wxRealPoint","_class_wxRealPoint",0},
+    { "_signed_short","_WXTYPE",0},
+    { "_signed_short","_short",0},
+    { "_class_wxFocusEvent","_wxFocusEvent",0},
+    { "_class_wxMaximizeEvent","_wxMaximizeEvent",0},
+    { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
+    { "_unsigned_char","_byte",0},
+    { "_unsigned_int","_wxPrintQuality",0},
+    { "_unsigned_int","_size_t",0},
+    { "_unsigned_int","_uint",0},
+    { "_unsigned_int","_wxWindowID",0},
+    { "_unsigned_int","_int",0},
+    { "_short","_WXTYPE",0},
+    { "_short","_unsigned_short",0},
+    { "_short","_signed_short",0},
+    { "_class_wxScrollEvent","_class_wxSpinEvent",SwigwxSpinEventTowxScrollEvent},
+    { "_class_wxScrollEvent","_wxSpinEvent",SwigwxSpinEventTowxScrollEvent},
+    { "_class_wxScrollEvent","_wxScrollEvent",0},
+    { "_wxJoystickEvent","_class_wxJoystickEvent",0},
+    { "_wxWindowID","_wxPrintQuality",0},
+    { "_wxWindowID","_size_t",0},
+    { "_wxWindowID","_EBool",0},
+    { "_wxWindowID","_uint",0},
+    { "_wxWindowID","_int",0},
+    { "_wxWindowID","_signed_int",0},
+    { "_wxWindowID","_unsigned_int",0},
+    { "_int","_wxPrintQuality",0},
+    { "_int","_size_t",0},
+    { "_int","_EBool",0},
+    { "_int","_uint",0},
+    { "_int","_wxWindowID",0},
+    { "_int","_unsigned_int",0},
+    { "_int","_signed_int",0},
+    { "_class_wxMouseEvent","_wxMouseEvent",0},
+    { "_class_wxSpinEvent","_wxSpinEvent",0},
+    { "_wxSize","_class_wxSize",0},
+    { "_wxRegionIterator","_class_wxRegionIterator",0},
+    { "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0},
+    { "_class_wxInitDialogEvent","_wxInitDialogEvent",0},
+    { "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
+    { "_wxIconizeEvent","_class_wxIconizeEvent",0},
+    { "_class_wxIdleEvent","_wxIdleEvent",0},
+    { "_wxEraseEvent","_class_wxEraseEvent",0},
+    { "_class_wxJoystickEvent","_wxJoystickEvent",0},
+    { "_wxRegion","_class_wxRegion",0},
+    { "_class_wxShowEvent","_wxShowEvent",0},
+    { "_wxActivateEvent","_class_wxActivateEvent",0},
+    { "_class_wxCommandEvent","_class_wxNotifyEvent",SwigwxNotifyEventTowxCommandEvent},
+    { "_class_wxCommandEvent","_wxNotifyEvent",SwigwxNotifyEventTowxCommandEvent},
+    { "_class_wxCommandEvent","_class_wxPyEvent",SwigwxPyEventTowxCommandEvent},
+    { "_class_wxCommandEvent","_wxPyEvent",SwigwxPyEventTowxCommandEvent},
+    { "_class_wxCommandEvent","_class_wxSpinEvent",SwigwxSpinEventTowxCommandEvent},
+    { "_class_wxCommandEvent","_wxSpinEvent",SwigwxSpinEventTowxCommandEvent},
+    { "_class_wxCommandEvent","_class_wxScrollEvent",SwigwxScrollEventTowxCommandEvent},
+    { "_class_wxCommandEvent","_wxScrollEvent",SwigwxScrollEventTowxCommandEvent},
+    { "_class_wxCommandEvent","_wxCommandEvent",0},
+    { "_class_wxSizeEvent","_wxSizeEvent",0},
+    { "_class_wxSize","_wxSize",0},
+    { "_wxKeyEvent","_class_wxKeyEvent",0},
+    { "_wxMoveEvent","_class_wxMoveEvent",0},
+    { "_class_wxEraseEvent","_wxEraseEvent",0},
+{0,0,0}};
+

 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif
 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif

-SWIGEXPORT(void,initeventsc)() {
+SWIGEXPORT(void) initeventsc() {

         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("eventsc", eventscMethods);
         d = PyModule_GetDict(m);
         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("eventsc", eventscMethods);
         d = PyModule_GetDict(m);

-/*
- * These are the pointer type-equivalency mappings. 
- * (Used by the SWIG pointer type-checker).
- */
-        SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_wxEvent","_class_wxNotifyEvent",SwigwxNotifyEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_wxNotifyEvent",SwigwxNotifyEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_class_wxPyEvent",SwigwxPyEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_wxPyEvent",SwigwxPyEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_class_wxSysColourChangedEvent",SwigwxSysColourChangedEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_wxSysColourChangedEvent",SwigwxSysColourChangedEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_class_wxUpdateUIEvent",SwigwxUpdateUIEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_wxUpdateUIEvent",SwigwxUpdateUIEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_class_wxIdleEvent",SwigwxIdleEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_wxIdleEvent",SwigwxIdleEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_class_wxDropFilesEvent",SwigwxDropFilesEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_wxDropFilesEvent",SwigwxDropFilesEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_class_wxJoystickEvent",SwigwxJoystickEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_wxJoystickEvent",SwigwxJoystickEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_class_wxMaximizeEvent",SwigwxMaximizeEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_wxMaximizeEvent",SwigwxMaximizeEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_class_wxIconizeEvent",SwigwxIconizeEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_wxIconizeEvent",SwigwxIconizeEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_class_wxShowEvent",SwigwxShowEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_wxShowEvent",SwigwxShowEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_class_wxMenuEvent",SwigwxMenuEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_wxMenuEvent",SwigwxMenuEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_class_wxInitDialogEvent",SwigwxInitDialogEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_wxInitDialogEvent",SwigwxInitDialogEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_class_wxActivateEvent",SwigwxActivateEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_wxActivateEvent",SwigwxActivateEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_class_wxFocusEvent",SwigwxFocusEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_wxFocusEvent",SwigwxFocusEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_class_wxEraseEvent",SwigwxEraseEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_wxEraseEvent",SwigwxEraseEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_class_wxPaintEvent",SwigwxPaintEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_wxPaintEvent",SwigwxPaintEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_class_wxMoveEvent",SwigwxMoveEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_wxMoveEvent",SwigwxMoveEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_class_wxKeyEvent",SwigwxKeyEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_wxKeyEvent",SwigwxKeyEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_class_wxMouseEvent",SwigwxMouseEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_wxMouseEvent",SwigwxMouseEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_class_wxSpinEvent",SwigwxSpinEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_wxSpinEvent",SwigwxSpinEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_class_wxScrollEvent",SwigwxScrollEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_wxScrollEvent",SwigwxScrollEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_class_wxCommandEvent",SwigwxCommandEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_wxCommandEvent",SwigwxCommandEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_class_wxCloseEvent",SwigwxCloseEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_wxCloseEvent",SwigwxCloseEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_class_wxSizeEvent",SwigwxSizeEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_wxSizeEvent",SwigwxSizeEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_class_wxEvent",0);
-        SWIG_RegisterMapping("_class_wxActivateEvent","_wxActivateEvent",0);
-        SWIG_RegisterMapping("_signed_long","_long",0);
-        SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_signed_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_unsigned_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_wxWindowID",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_uint",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_EBool",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_size_t",0);
-        SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
-        SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
-        SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_wxNotifyEvent","_class_wxNotifyEvent",0);
-        SWIG_RegisterMapping("_wxUpdateUIEvent","_class_wxUpdateUIEvent",0);
-        SWIG_RegisterMapping("_byte","_unsigned_char",0);
-        SWIG_RegisterMapping("_long","_unsigned_long",0);
-        SWIG_RegisterMapping("_long","_signed_long",0);
-        SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0);
-        SWIG_RegisterMapping("_size_t","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_size_t","_unsigned_int",0);
-        SWIG_RegisterMapping("_size_t","_int",0);
-        SWIG_RegisterMapping("_size_t","_wxWindowID",0);
-        SWIG_RegisterMapping("_size_t","_uint",0);
-        SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
-        SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0);
-        SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0);
-        SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
-        SWIG_RegisterMapping("_wxPyEvent","_class_wxPyEvent",0);
-        SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0);
-        SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0);
-        SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0);
-        SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0);
-        SWIG_RegisterMapping("_uint","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_uint","_size_t",0);
-        SWIG_RegisterMapping("_uint","_unsigned_int",0);
-        SWIG_RegisterMapping("_uint","_int",0);
-        SWIG_RegisterMapping("_uint","_wxWindowID",0);
-        SWIG_RegisterMapping("_class_wxEvent","_class_wxNotifyEvent",SwigwxNotifyEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxNotifyEvent",SwigwxNotifyEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_class_wxPyEvent",SwigwxPyEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxPyEvent",SwigwxPyEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_class_wxSysColourChangedEvent",SwigwxSysColourChangedEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxSysColourChangedEvent",SwigwxSysColourChangedEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_class_wxUpdateUIEvent",SwigwxUpdateUIEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxUpdateUIEvent",SwigwxUpdateUIEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_class_wxIdleEvent",SwigwxIdleEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxIdleEvent",SwigwxIdleEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_class_wxDropFilesEvent",SwigwxDropFilesEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxDropFilesEvent",SwigwxDropFilesEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_class_wxJoystickEvent",SwigwxJoystickEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxJoystickEvent",SwigwxJoystickEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_class_wxMaximizeEvent",SwigwxMaximizeEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxMaximizeEvent",SwigwxMaximizeEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_class_wxIconizeEvent",SwigwxIconizeEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxIconizeEvent",SwigwxIconizeEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_class_wxShowEvent",SwigwxShowEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxShowEvent",SwigwxShowEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_class_wxMenuEvent",SwigwxMenuEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxMenuEvent",SwigwxMenuEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_class_wxInitDialogEvent",SwigwxInitDialogEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxInitDialogEvent",SwigwxInitDialogEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_class_wxActivateEvent",SwigwxActivateEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxActivateEvent",SwigwxActivateEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_class_wxFocusEvent",SwigwxFocusEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxFocusEvent",SwigwxFocusEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_class_wxEraseEvent",SwigwxEraseEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxEraseEvent",SwigwxEraseEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_class_wxPaintEvent",SwigwxPaintEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxPaintEvent",SwigwxPaintEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_class_wxMoveEvent",SwigwxMoveEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxMoveEvent",SwigwxMoveEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_class_wxKeyEvent",SwigwxKeyEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxKeyEvent",SwigwxKeyEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_class_wxMouseEvent",SwigwxMouseEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxMouseEvent",SwigwxMouseEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_class_wxSpinEvent",SwigwxSpinEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxSpinEvent",SwigwxSpinEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_class_wxScrollEvent",SwigwxScrollEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxScrollEvent",SwigwxScrollEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_class_wxCommandEvent",SwigwxCommandEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxCommandEvent",SwigwxCommandEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_class_wxCloseEvent",SwigwxCloseEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxCloseEvent",SwigwxCloseEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_class_wxSizeEvent",SwigwxSizeEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxSizeEvent",SwigwxSizeEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxEvent",0);
-        SWIG_RegisterMapping("_wxRect","_class_wxRect",0);
-        SWIG_RegisterMapping("_wxCommandEvent","_class_wxNotifyEvent",SwigwxNotifyEventTowxCommandEvent);
-        SWIG_RegisterMapping("_wxCommandEvent","_wxNotifyEvent",SwigwxNotifyEventTowxCommandEvent);
-        SWIG_RegisterMapping("_wxCommandEvent","_class_wxPyEvent",SwigwxPyEventTowxCommandEvent);
-        SWIG_RegisterMapping("_wxCommandEvent","_wxPyEvent",SwigwxPyEventTowxCommandEvent);
-        SWIG_RegisterMapping("_wxCommandEvent","_class_wxSpinEvent",SwigwxSpinEventTowxCommandEvent);
-        SWIG_RegisterMapping("_wxCommandEvent","_wxSpinEvent",SwigwxSpinEventTowxCommandEvent);
-        SWIG_RegisterMapping("_wxCommandEvent","_class_wxScrollEvent",SwigwxScrollEventTowxCommandEvent);
-        SWIG_RegisterMapping("_wxCommandEvent","_wxScrollEvent",SwigwxScrollEventTowxCommandEvent);
-        SWIG_RegisterMapping("_wxCommandEvent","_class_wxCommandEvent",0);
-        SWIG_RegisterMapping("_wxSizeEvent","_class_wxSizeEvent",0);
-        SWIG_RegisterMapping("_wxPoint","_class_wxPoint",0);
-        SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
-        SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_class_wxNotifyEvent","_wxNotifyEvent",0);
-        SWIG_RegisterMapping("_class_wxPyEvent","_wxPyEvent",0);
-        SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
-        SWIG_RegisterMapping("_wxScrollEvent","_class_wxSpinEvent",SwigwxSpinEventTowxScrollEvent);
-        SWIG_RegisterMapping("_wxScrollEvent","_wxSpinEvent",SwigwxSpinEventTowxScrollEvent);
-        SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0);
-        SWIG_RegisterMapping("_EBool","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_EBool","_signed_int",0);
-        SWIG_RegisterMapping("_EBool","_int",0);
-        SWIG_RegisterMapping("_EBool","_wxWindowID",0);
-        SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
-        SWIG_RegisterMapping("_class_wxDropFilesEvent","_wxDropFilesEvent",0);
-        SWIG_RegisterMapping("_wxCloseEvent","_class_wxCloseEvent",0);
-        SWIG_RegisterMapping("_unsigned_long","_long",0);
-        SWIG_RegisterMapping("_class_wxRect","_wxRect",0);
-        SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxFocusEvent","_class_wxFocusEvent",0);
-        SWIG_RegisterMapping("_wxMaximizeEvent","_class_wxMaximizeEvent",0);
-        SWIG_RegisterMapping("_wxAcceleratorEntry","_class_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_signed_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_signed_int","_EBool",0);
-        SWIG_RegisterMapping("_signed_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_signed_int","_int",0);
-        SWIG_RegisterMapping("_wxLayoutConstraints","_class_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_class_wxMoveEvent","_wxMoveEvent",0);
-        SWIG_RegisterMapping("_WXTYPE","_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_signed_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_unsigned_short",0);
-        SWIG_RegisterMapping("_unsigned_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_unsigned_short","_short",0);
-        SWIG_RegisterMapping("_class_wxCloseEvent","_wxCloseEvent",0);
-        SWIG_RegisterMapping("_class_wxMenuEvent","_wxMenuEvent",0);
-        SWIG_RegisterMapping("_wxMouseEvent","_class_wxMouseEvent",0);
-        SWIG_RegisterMapping("_class_wxPoint","_wxPoint",0);
-        SWIG_RegisterMapping("_wxRealPoint","_class_wxRealPoint",0);
-        SWIG_RegisterMapping("_signed_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_signed_short","_short",0);
-        SWIG_RegisterMapping("_class_wxFocusEvent","_wxFocusEvent",0);
-        SWIG_RegisterMapping("_class_wxMaximizeEvent","_wxMaximizeEvent",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_unsigned_char","_byte",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_unsigned_int","_size_t",0);
-        SWIG_RegisterMapping("_unsigned_int","_uint",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_unsigned_int","_int",0);
-        SWIG_RegisterMapping("_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_short","_unsigned_short",0);
-        SWIG_RegisterMapping("_short","_signed_short",0);
-        SWIG_RegisterMapping("_class_wxScrollEvent","_class_wxSpinEvent",SwigwxSpinEventTowxScrollEvent);
-        SWIG_RegisterMapping("_class_wxScrollEvent","_wxSpinEvent",SwigwxSpinEventTowxScrollEvent);
-        SWIG_RegisterMapping("_class_wxScrollEvent","_wxScrollEvent",0);
-        SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0);
-        SWIG_RegisterMapping("_wxWindowID","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_wxWindowID","_size_t",0);
-        SWIG_RegisterMapping("_wxWindowID","_EBool",0);
-        SWIG_RegisterMapping("_wxWindowID","_uint",0);
-        SWIG_RegisterMapping("_wxWindowID","_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_signed_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_int","_size_t",0);
-        SWIG_RegisterMapping("_int","_EBool",0);
-        SWIG_RegisterMapping("_int","_uint",0);
-        SWIG_RegisterMapping("_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_int","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_signed_int",0);
-        SWIG_RegisterMapping("_class_wxMouseEvent","_wxMouseEvent",0);
-        SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0);
-        SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
-        SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
-        SWIG_RegisterMapping("_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0);
-        SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0);
-        SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_wxIconizeEvent","_class_wxIconizeEvent",0);
-        SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0);
-        SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
-        SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
-        SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
-        SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
-        SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
-        SWIG_RegisterMapping("_class_wxCommandEvent","_class_wxNotifyEvent",SwigwxNotifyEventTowxCommandEvent);
-        SWIG_RegisterMapping("_class_wxCommandEvent","_wxNotifyEvent",SwigwxNotifyEventTowxCommandEvent);
-        SWIG_RegisterMapping("_class_wxCommandEvent","_class_wxPyEvent",SwigwxPyEventTowxCommandEvent);
-        SWIG_RegisterMapping("_class_wxCommandEvent","_wxPyEvent",SwigwxPyEventTowxCommandEvent);
-        SWIG_RegisterMapping("_class_wxCommandEvent","_class_wxSpinEvent",SwigwxSpinEventTowxCommandEvent);
-        SWIG_RegisterMapping("_class_wxCommandEvent","_wxSpinEvent",SwigwxSpinEventTowxCommandEvent);
-        SWIG_RegisterMapping("_class_wxCommandEvent","_class_wxScrollEvent",SwigwxScrollEventTowxCommandEvent);
-        SWIG_RegisterMapping("_class_wxCommandEvent","_wxScrollEvent",SwigwxScrollEventTowxCommandEvent);
-        SWIG_RegisterMapping("_class_wxCommandEvent","_wxCommandEvent",0);
-        SWIG_RegisterMapping("_class_wxSizeEvent","_wxSizeEvent",0);
-        SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
-        SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0);
-        SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0);
-        SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0);
+{
+   int i;
+   for (i = 0; _swig_mapping[i].n1; i++)
+        SWIG_RegisterMapping(_swig_mapping[i].n1,_swig_mapping[i].n2,_swig_mapping[i].pcnv);
+}

 }
 }

diff --git a/utils/wxPython/src/msw/events.py b/utils/wxPython/src/msw/events.py
index c0f57d9f449637d1bc0ac24fcc027feafea34b1f..39025e5429fa41343568fa7f770fc3831a8388e3 100644 (file)
--- a/utils/wxPython/src/msw/events.py
+++ b/utils/wxPython/src/msw/events.py
@@ -6,38 +6,38 @@ class wxEventPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetEventObject(self):
-        val = eventsc.wxEvent_GetEventObject(self.this)
+    def GetEventObject(self, *_args, **_kwargs):
+        val = apply(eventsc.wxEvent_GetEventObject,(self,) + _args, _kwargs)

         return val
         return val

-    def GetEventType(self):
-        val = eventsc.wxEvent_GetEventType(self.this)
+    def GetEventType(self, *_args, **_kwargs):
+        val = apply(eventsc.wxEvent_GetEventType,(self,) + _args, _kwargs)

         return val
         return val

-    def GetId(self):
-        val = eventsc.wxEvent_GetId(self.this)
+    def GetId(self, *_args, **_kwargs):
+        val = apply(eventsc.wxEvent_GetId,(self,) + _args, _kwargs)

         return val
         return val

-    def GetSkipped(self):
-        val = eventsc.wxEvent_GetSkipped(self.this)
+    def GetSkipped(self, *_args, **_kwargs):
+        val = apply(eventsc.wxEvent_GetSkipped,(self,) + _args, _kwargs)

         return val
         return val

-    def GetTimestamp(self):
-        val = eventsc.wxEvent_GetTimestamp(self.this)
+    def GetTimestamp(self, *_args, **_kwargs):
+        val = apply(eventsc.wxEvent_GetTimestamp,(self,) + _args, _kwargs)

         return val
         return val

-    def SetEventObject(self,arg0):
-        val = eventsc.wxEvent_SetEventObject(self.this,arg0)
+    def SetEventObject(self, *_args, **_kwargs):
+        val = apply(eventsc.wxEvent_SetEventObject,(self,) + _args, _kwargs)

         return val
         return val

-    def SetEventType(self,arg0):
-        val = eventsc.wxEvent_SetEventType(self.this,arg0)
+    def SetEventType(self, *_args, **_kwargs):
+        val = apply(eventsc.wxEvent_SetEventType,(self,) + _args, _kwargs)

         return val
         return val

-    def SetId(self,arg0):
-        val = eventsc.wxEvent_SetId(self.this,arg0)
+    def SetId(self, *_args, **_kwargs):
+        val = apply(eventsc.wxEvent_SetId,(self,) + _args, _kwargs)

         return val
         return val

-    def SetTimestamp(self,arg0):
-        val = eventsc.wxEvent_SetTimestamp(self.this,arg0)
+    def SetTimestamp(self, *_args, **_kwargs):
+        val = apply(eventsc.wxEvent_SetTimestamp,(self,) + _args, _kwargs)

         return val
         return val

-    def Skip(self,*args):
-        val = apply(eventsc.wxEvent_Skip,(self.this,)+args)
+    def Skip(self, *_args, **_kwargs):
+        val = apply(eventsc.wxEvent_Skip,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxEvent instance>"
+        return "<C wxEvent instance at %s>" % (self.this,)

 class wxEvent(wxEventPtr):
     def __init__(self,this):
         self.this = this
 class wxEvent(wxEventPtr):
     def __init__(self,this):
         self.this = this


@@ -49,13 +49,12 @@ class wxSizeEventPtr(wxEventPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetSize(self):
-        val = eventsc.wxSizeEvent_GetSize(self.this)
-        val = wxSizePtr(val)
-        val.thisown = 1
+    def GetSize(self, *_args, **_kwargs):
+        val = apply(eventsc.wxSizeEvent_GetSize,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxSizeEvent instance>"
+        return "<C wxSizeEvent instance at %s>" % (self.this,)

 class wxSizeEvent(wxSizeEventPtr):
     def __init__(self,this):
         self.this = this
 class wxSizeEvent(wxSizeEventPtr):
     def __init__(self,this):
         self.this = this


@@ -67,26 +66,26 @@ class wxCloseEventPtr(wxEventPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def SetLoggingOff(self,arg0):
-        val = eventsc.wxCloseEvent_SetLoggingOff(self.this,arg0)
+    def SetLoggingOff(self, *_args, **_kwargs):
+        val = apply(eventsc.wxCloseEvent_SetLoggingOff,(self,) + _args, _kwargs)

         return val
         return val

-    def GetLoggingOff(self):
-        val = eventsc.wxCloseEvent_GetLoggingOff(self.this)
+    def GetLoggingOff(self, *_args, **_kwargs):
+        val = apply(eventsc.wxCloseEvent_GetLoggingOff,(self,) + _args, _kwargs)

         return val
         return val

-    def Veto(self,*args):
-        val = apply(eventsc.wxCloseEvent_Veto,(self.this,)+args)
+    def Veto(self, *_args, **_kwargs):
+        val = apply(eventsc.wxCloseEvent_Veto,(self,) + _args, _kwargs)

         return val
         return val

-    def CanVeto(self):
-        val = eventsc.wxCloseEvent_CanVeto(self.this)
+    def CanVeto(self, *_args, **_kwargs):
+        val = apply(eventsc.wxCloseEvent_CanVeto,(self,) + _args, _kwargs)

         return val
         return val

-    def GetVeto(self):
-        val = eventsc.wxCloseEvent_GetVeto(self.this)
+    def GetVeto(self, *_args, **_kwargs):
+        val = apply(eventsc.wxCloseEvent_GetVeto,(self,) + _args, _kwargs)

         return val
         return val

-    def SetCanVeto(self,arg0):
-        val = eventsc.wxCloseEvent_SetCanVeto(self.this,arg0)
+    def SetCanVeto(self, *_args, **_kwargs):
+        val = apply(eventsc.wxCloseEvent_SetCanVeto,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxCloseEvent instance>"
+        return "<C wxCloseEvent instance at %s>" % (self.this,)

 class wxCloseEvent(wxCloseEventPtr):
     def __init__(self,this):
         self.this = this
 class wxCloseEvent(wxCloseEventPtr):
     def __init__(self,this):
         self.this = this


@@ -98,26 +97,26 @@ class wxCommandEventPtr(wxEventPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def Checked(self):
-        val = eventsc.wxCommandEvent_Checked(self.this)
+    def Checked(self, *_args, **_kwargs):
+        val = apply(eventsc.wxCommandEvent_Checked,(self,) + _args, _kwargs)

         return val
         return val

-    def GetExtraLong(self):
-        val = eventsc.wxCommandEvent_GetExtraLong(self.this)
+    def GetExtraLong(self, *_args, **_kwargs):
+        val = apply(eventsc.wxCommandEvent_GetExtraLong,(self,) + _args, _kwargs)

         return val
         return val

-    def GetInt(self):
-        val = eventsc.wxCommandEvent_GetInt(self.this)
+    def GetInt(self, *_args, **_kwargs):
+        val = apply(eventsc.wxCommandEvent_GetInt,(self,) + _args, _kwargs)

         return val
         return val

-    def GetSelection(self):
-        val = eventsc.wxCommandEvent_GetSelection(self.this)
+    def GetSelection(self, *_args, **_kwargs):
+        val = apply(eventsc.wxCommandEvent_GetSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def GetString(self):
-        val = eventsc.wxCommandEvent_GetString(self.this)
+    def GetString(self, *_args, **_kwargs):
+        val = apply(eventsc.wxCommandEvent_GetString,(self,) + _args, _kwargs)

         return val
         return val

-    def IsSelection(self):
-        val = eventsc.wxCommandEvent_IsSelection(self.this)
+    def IsSelection(self, *_args, **_kwargs):
+        val = apply(eventsc.wxCommandEvent_IsSelection,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxCommandEvent instance>"
+        return "<C wxCommandEvent instance at %s>" % (self.this,)

 class wxCommandEvent(wxCommandEventPtr):
     def __init__(self,this):
         self.this = this
 class wxCommandEvent(wxCommandEventPtr):
     def __init__(self,this):
         self.this = this


@@ -129,14 +128,14 @@ class wxScrollEventPtr(wxCommandEventPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetOrientation(self):
-        val = eventsc.wxScrollEvent_GetOrientation(self.this)
+    def GetOrientation(self, *_args, **_kwargs):
+        val = apply(eventsc.wxScrollEvent_GetOrientation,(self,) + _args, _kwargs)

         return val
         return val

-    def GetPosition(self):
-        val = eventsc.wxScrollEvent_GetPosition(self.this)
+    def GetPosition(self, *_args, **_kwargs):
+        val = apply(eventsc.wxScrollEvent_GetPosition,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxScrollEvent instance>"
+        return "<C wxScrollEvent instance at %s>" % (self.this,)

 class wxScrollEvent(wxScrollEventPtr):
     def __init__(self,this):
         self.this = this
 class wxScrollEvent(wxScrollEventPtr):
     def __init__(self,this):
         self.this = this


@@ -149,7 +148,7 @@ class wxSpinEventPtr(wxScrollEventPtr):
         self.this = this
         self.thisown = 0
     def __repr__(self):
         self.this = this
         self.thisown = 0
     def __repr__(self):

-        return "<C wxSpinEvent instance>"
+        return "<C wxSpinEvent instance at %s>" % (self.this,)

 class wxSpinEvent(wxSpinEventPtr):
     def __init__(self,this):
         self.this = this
 class wxSpinEvent(wxSpinEventPtr):
     def __init__(self,this):
         self.this = this


@@ -161,105 +160,103 @@ class wxMouseEventPtr(wxEventPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def IsButton(self):
-        val = eventsc.wxMouseEvent_IsButton(self.this)
+    def IsButton(self, *_args, **_kwargs):
+        val = apply(eventsc.wxMouseEvent_IsButton,(self,) + _args, _kwargs)

         return val
         return val

-    def ButtonDown(self,*args):
-        val = apply(eventsc.wxMouseEvent_ButtonDown,(self.this,)+args)
+    def ButtonDown(self, *_args, **_kwargs):
+        val = apply(eventsc.wxMouseEvent_ButtonDown,(self,) + _args, _kwargs)

         return val
         return val

-    def ButtonDClick(self,*args):
-        val = apply(eventsc.wxMouseEvent_ButtonDClick,(self.this,)+args)
+    def ButtonDClick(self, *_args, **_kwargs):
+        val = apply(eventsc.wxMouseEvent_ButtonDClick,(self,) + _args, _kwargs)

         return val
         return val

-    def ButtonUp(self,*args):
-        val = apply(eventsc.wxMouseEvent_ButtonUp,(self.this,)+args)
+    def ButtonUp(self, *_args, **_kwargs):
+        val = apply(eventsc.wxMouseEvent_ButtonUp,(self,) + _args, _kwargs)

         return val
         return val

-    def Button(self,arg0):
-        val = eventsc.wxMouseEvent_Button(self.this,arg0)
+    def Button(self, *_args, **_kwargs):
+        val = apply(eventsc.wxMouseEvent_Button,(self,) + _args, _kwargs)

         return val
         return val

-    def ButtonIsDown(self,arg0):
-        val = eventsc.wxMouseEvent_ButtonIsDown(self.this,arg0)
+    def ButtonIsDown(self, *_args, **_kwargs):
+        val = apply(eventsc.wxMouseEvent_ButtonIsDown,(self,) + _args, _kwargs)

         return val
         return val

-    def ControlDown(self):
-        val = eventsc.wxMouseEvent_ControlDown(self.this)
+    def ControlDown(self, *_args, **_kwargs):
+        val = apply(eventsc.wxMouseEvent_ControlDown,(self,) + _args, _kwargs)

         return val
         return val

-    def MetaDown(self):
-        val = eventsc.wxMouseEvent_MetaDown(self.this)
+    def MetaDown(self, *_args, **_kwargs):
+        val = apply(eventsc.wxMouseEvent_MetaDown,(self,) + _args, _kwargs)

         return val
         return val

-    def AltDown(self):
-        val = eventsc.wxMouseEvent_AltDown(self.this)
+    def AltDown(self, *_args, **_kwargs):
+        val = apply(eventsc.wxMouseEvent_AltDown,(self,) + _args, _kwargs)

         return val
         return val

-    def ShiftDown(self):
-        val = eventsc.wxMouseEvent_ShiftDown(self.this)
+    def ShiftDown(self, *_args, **_kwargs):
+        val = apply(eventsc.wxMouseEvent_ShiftDown,(self,) + _args, _kwargs)

         return val
         return val

-    def LeftDown(self):
-        val = eventsc.wxMouseEvent_LeftDown(self.this)
+    def LeftDown(self, *_args, **_kwargs):
+        val = apply(eventsc.wxMouseEvent_LeftDown,(self,) + _args, _kwargs)

         return val
         return val

-    def MiddleDown(self):
-        val = eventsc.wxMouseEvent_MiddleDown(self.this)
+    def MiddleDown(self, *_args, **_kwargs):
+        val = apply(eventsc.wxMouseEvent_MiddleDown,(self,) + _args, _kwargs)

         return val
         return val

-    def RightDown(self):
-        val = eventsc.wxMouseEvent_RightDown(self.this)
+    def RightDown(self, *_args, **_kwargs):
+        val = apply(eventsc.wxMouseEvent_RightDown,(self,) + _args, _kwargs)

         return val
         return val

-    def LeftUp(self):
-        val = eventsc.wxMouseEvent_LeftUp(self.this)
+    def LeftUp(self, *_args, **_kwargs):
+        val = apply(eventsc.wxMouseEvent_LeftUp,(self,) + _args, _kwargs)

         return val
         return val

-    def MiddleUp(self):
-        val = eventsc.wxMouseEvent_MiddleUp(self.this)
+    def MiddleUp(self, *_args, **_kwargs):
+        val = apply(eventsc.wxMouseEvent_MiddleUp,(self,) + _args, _kwargs)

         return val
         return val

-    def RightUp(self):
-        val = eventsc.wxMouseEvent_RightUp(self.this)
+    def RightUp(self, *_args, **_kwargs):
+        val = apply(eventsc.wxMouseEvent_RightUp,(self,) + _args, _kwargs)

         return val
         return val

-    def LeftDClick(self):
-        val = eventsc.wxMouseEvent_LeftDClick(self.this)
+    def LeftDClick(self, *_args, **_kwargs):
+        val = apply(eventsc.wxMouseEvent_LeftDClick,(self,) + _args, _kwargs)

         return val
         return val

-    def MiddleDClick(self):
-        val = eventsc.wxMouseEvent_MiddleDClick(self.this)
+    def MiddleDClick(self, *_args, **_kwargs):
+        val = apply(eventsc.wxMouseEvent_MiddleDClick,(self,) + _args, _kwargs)

         return val
         return val

-    def RightDClick(self):
-        val = eventsc.wxMouseEvent_RightDClick(self.this)
+    def RightDClick(self, *_args, **_kwargs):
+        val = apply(eventsc.wxMouseEvent_RightDClick,(self,) + _args, _kwargs)

         return val
         return val

-    def LeftIsDown(self):
-        val = eventsc.wxMouseEvent_LeftIsDown(self.this)
+    def LeftIsDown(self, *_args, **_kwargs):
+        val = apply(eventsc.wxMouseEvent_LeftIsDown,(self,) + _args, _kwargs)

         return val
         return val

-    def MiddleIsDown(self):
-        val = eventsc.wxMouseEvent_MiddleIsDown(self.this)
+    def MiddleIsDown(self, *_args, **_kwargs):
+        val = apply(eventsc.wxMouseEvent_MiddleIsDown,(self,) + _args, _kwargs)

         return val
         return val

-    def RightIsDown(self):
-        val = eventsc.wxMouseEvent_RightIsDown(self.this)
+    def RightIsDown(self, *_args, **_kwargs):
+        val = apply(eventsc.wxMouseEvent_RightIsDown,(self,) + _args, _kwargs)

         return val
         return val

-    def Dragging(self):
-        val = eventsc.wxMouseEvent_Dragging(self.this)
+    def Dragging(self, *_args, **_kwargs):
+        val = apply(eventsc.wxMouseEvent_Dragging,(self,) + _args, _kwargs)

         return val
         return val

-    def Moving(self):
-        val = eventsc.wxMouseEvent_Moving(self.this)
+    def Moving(self, *_args, **_kwargs):
+        val = apply(eventsc.wxMouseEvent_Moving,(self,) + _args, _kwargs)

         return val
         return val

-    def Entering(self):
-        val = eventsc.wxMouseEvent_Entering(self.this)
+    def Entering(self, *_args, **_kwargs):
+        val = apply(eventsc.wxMouseEvent_Entering,(self,) + _args, _kwargs)

         return val
         return val

-    def Leaving(self):
-        val = eventsc.wxMouseEvent_Leaving(self.this)
+    def Leaving(self, *_args, **_kwargs):
+        val = apply(eventsc.wxMouseEvent_Leaving,(self,) + _args, _kwargs)

         return val
         return val

-    def Position(self):
-        val = eventsc.wxMouseEvent_Position(self.this)
+    def Position(self, *_args, **_kwargs):
+        val = apply(eventsc.wxMouseEvent_Position,(self,) + _args, _kwargs)

         return val
         return val

-    def GetPosition(self):
-        val = eventsc.wxMouseEvent_GetPosition(self.this)
-        val = wxPointPtr(val)
-        val.thisown = 1
+    def GetPosition(self, *_args, **_kwargs):
+        val = apply(eventsc.wxMouseEvent_GetPosition,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetLogicalPosition(self,arg0):
-        val = eventsc.wxMouseEvent_GetLogicalPosition(self.this,arg0.this)
-        val = wxPointPtr(val)
-        val.thisown = 1
+    def GetLogicalPosition(self, *_args, **_kwargs):
+        val = apply(eventsc.wxMouseEvent_GetLogicalPosition,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetX(self):
-        val = eventsc.wxMouseEvent_GetX(self.this)
+    def GetX(self, *_args, **_kwargs):
+        val = apply(eventsc.wxMouseEvent_GetX,(self,) + _args, _kwargs)

         return val
         return val

-    def GetY(self):
-        val = eventsc.wxMouseEvent_GetY(self.this)
+    def GetY(self, *_args, **_kwargs):
+        val = apply(eventsc.wxMouseEvent_GetY,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxMouseEvent instance>"
+        return "<C wxMouseEvent instance at %s>" % (self.this,)

 class wxMouseEvent(wxMouseEventPtr):
     def __init__(self,this):
         self.this = this
 class wxMouseEvent(wxMouseEventPtr):
     def __init__(self,this):
         self.this = this


@@ -271,23 +268,23 @@ class wxKeyEventPtr(wxEventPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def ControlDown(self):
-        val = eventsc.wxKeyEvent_ControlDown(self.this)
+    def ControlDown(self, *_args, **_kwargs):
+        val = apply(eventsc.wxKeyEvent_ControlDown,(self,) + _args, _kwargs)

         return val
         return val

-    def MetaDown(self):
-        val = eventsc.wxKeyEvent_MetaDown(self.this)
+    def MetaDown(self, *_args, **_kwargs):
+        val = apply(eventsc.wxKeyEvent_MetaDown,(self,) + _args, _kwargs)

         return val
         return val

-    def AltDown(self):
-        val = eventsc.wxKeyEvent_AltDown(self.this)
+    def AltDown(self, *_args, **_kwargs):
+        val = apply(eventsc.wxKeyEvent_AltDown,(self,) + _args, _kwargs)

         return val
         return val

-    def ShiftDown(self):
-        val = eventsc.wxKeyEvent_ShiftDown(self.this)
+    def ShiftDown(self, *_args, **_kwargs):
+        val = apply(eventsc.wxKeyEvent_ShiftDown,(self,) + _args, _kwargs)

         return val
         return val

-    def KeyCode(self):
-        val = eventsc.wxKeyEvent_KeyCode(self.this)
+    def KeyCode(self, *_args, **_kwargs):
+        val = apply(eventsc.wxKeyEvent_KeyCode,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxKeyEvent instance>"
+        return "<C wxKeyEvent instance at %s>" % (self.this,)

 class wxKeyEvent(wxKeyEventPtr):
     def __init__(self,this):
         self.this = this
 class wxKeyEvent(wxKeyEventPtr):
     def __init__(self,this):
         self.this = this


@@ -299,13 +296,12 @@ class wxMoveEventPtr(wxEventPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetPosition(self):
-        val = eventsc.wxMoveEvent_GetPosition(self.this)
-        val = wxPointPtr(val)
-        val.thisown = 1
+    def GetPosition(self, *_args, **_kwargs):
+        val = apply(eventsc.wxMoveEvent_GetPosition,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxMoveEvent instance>"
+        return "<C wxMoveEvent instance at %s>" % (self.this,)

 class wxMoveEvent(wxMoveEventPtr):
     def __init__(self,this):
         self.this = this
 class wxMoveEvent(wxMoveEventPtr):
     def __init__(self,this):
         self.this = this


@@ -318,7 +314,7 @@ class wxPaintEventPtr(wxEventPtr):
         self.this = this
         self.thisown = 0
     def __repr__(self):
         self.this = this
         self.thisown = 0
     def __repr__(self):

-        return "<C wxPaintEvent instance>"
+        return "<C wxPaintEvent instance at %s>" % (self.this,)

 class wxPaintEvent(wxPaintEventPtr):
     def __init__(self,this):
         self.this = this
 class wxPaintEvent(wxPaintEventPtr):
     def __init__(self,this):
         self.this = this


@@ -330,12 +326,12 @@ class wxEraseEventPtr(wxEventPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetDC(self):
-        val = eventsc.wxEraseEvent_GetDC(self.this)
-        val = wxDCPtr(val)
+    def GetDC(self, *_args, **_kwargs):
+        val = apply(eventsc.wxEraseEvent_GetDC,(self,) + _args, _kwargs)
+        if val: val = wxDCPtr(val) 

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxEraseEvent instance>"
+        return "<C wxEraseEvent instance at %s>" % (self.this,)

 class wxEraseEvent(wxEraseEventPtr):
     def __init__(self,this):
         self.this = this
 class wxEraseEvent(wxEraseEventPtr):
     def __init__(self,this):
         self.this = this


@@ -348,7 +344,7 @@ class wxFocusEventPtr(wxEventPtr):
         self.this = this
         self.thisown = 0
     def __repr__(self):
         self.this = this
         self.thisown = 0
     def __repr__(self):

-        return "<C wxFocusEvent instance>"
+        return "<C wxFocusEvent instance at %s>" % (self.this,)

 class wxFocusEvent(wxFocusEventPtr):
     def __init__(self,this):
         self.this = this
 class wxFocusEvent(wxFocusEventPtr):
     def __init__(self,this):
         self.this = this


@@ -360,11 +356,11 @@ class wxActivateEventPtr(wxEventPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetActive(self):
-        val = eventsc.wxActivateEvent_GetActive(self.this)
+    def GetActive(self, *_args, **_kwargs):
+        val = apply(eventsc.wxActivateEvent_GetActive,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxActivateEvent instance>"
+        return "<C wxActivateEvent instance at %s>" % (self.this,)

 class wxActivateEvent(wxActivateEventPtr):
     def __init__(self,this):
         self.this = this
 class wxActivateEvent(wxActivateEventPtr):
     def __init__(self,this):
         self.this = this


@@ -377,7 +373,7 @@ class wxInitDialogEventPtr(wxEventPtr):
         self.this = this
         self.thisown = 0
     def __repr__(self):
         self.this = this
         self.thisown = 0
     def __repr__(self):

-        return "<C wxInitDialogEvent instance>"
+        return "<C wxInitDialogEvent instance at %s>" % (self.this,)

 class wxInitDialogEvent(wxInitDialogEventPtr):
     def __init__(self,this):
         self.this = this
 class wxInitDialogEvent(wxInitDialogEventPtr):
     def __init__(self,this):
         self.this = this


@@ -389,11 +385,11 @@ class wxMenuEventPtr(wxEventPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetMenuId(self):
-        val = eventsc.wxMenuEvent_GetMenuId(self.this)
+    def GetMenuId(self, *_args, **_kwargs):
+        val = apply(eventsc.wxMenuEvent_GetMenuId,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxMenuEvent instance>"
+        return "<C wxMenuEvent instance at %s>" % (self.this,)

 class wxMenuEvent(wxMenuEventPtr):
     def __init__(self,this):
         self.this = this
 class wxMenuEvent(wxMenuEventPtr):
     def __init__(self,this):
         self.this = this


@@ -405,14 +401,14 @@ class wxShowEventPtr(wxEventPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def SetShow(self,arg0):
-        val = eventsc.wxShowEvent_SetShow(self.this,arg0)
+    def SetShow(self, *_args, **_kwargs):
+        val = apply(eventsc.wxShowEvent_SetShow,(self,) + _args, _kwargs)

         return val
         return val

-    def GetShow(self):
-        val = eventsc.wxShowEvent_GetShow(self.this)
+    def GetShow(self, *_args, **_kwargs):
+        val = apply(eventsc.wxShowEvent_GetShow,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxShowEvent instance>"
+        return "<C wxShowEvent instance at %s>" % (self.this,)

 class wxShowEvent(wxShowEventPtr):
     def __init__(self,this):
         self.this = this
 class wxShowEvent(wxShowEventPtr):
     def __init__(self,this):
         self.this = this


@@ -425,7 +421,7 @@ class wxIconizeEventPtr(wxEventPtr):
         self.this = this
         self.thisown = 0
     def __repr__(self):
         self.this = this
         self.thisown = 0
     def __repr__(self):

-        return "<C wxIconizeEvent instance>"
+        return "<C wxIconizeEvent instance at %s>" % (self.this,)

 class wxIconizeEvent(wxIconizeEventPtr):
     def __init__(self,this):
         self.this = this
 class wxIconizeEvent(wxIconizeEventPtr):
     def __init__(self,this):
         self.this = this


@@ -438,7 +434,7 @@ class wxMaximizeEventPtr(wxEventPtr):
         self.this = this
         self.thisown = 0
     def __repr__(self):
         self.this = this
         self.thisown = 0
     def __repr__(self):

-        return "<C wxMaximizeEvent instance>"
+        return "<C wxMaximizeEvent instance at %s>" % (self.this,)

 class wxMaximizeEvent(wxMaximizeEventPtr):
     def __init__(self,this):
         self.this = this
 class wxMaximizeEvent(wxMaximizeEventPtr):
     def __init__(self,this):
         self.this = this


@@ -450,58 +446,57 @@ class wxJoystickEventPtr(wxEventPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetPosition(self):
-        val = eventsc.wxJoystickEvent_GetPosition(self.this)
-        val = wxPointPtr(val)
-        val.thisown = 1
+    def GetPosition(self, *_args, **_kwargs):
+        val = apply(eventsc.wxJoystickEvent_GetPosition,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetZPosition(self):
-        val = eventsc.wxJoystickEvent_GetZPosition(self.this)
+    def GetZPosition(self, *_args, **_kwargs):
+        val = apply(eventsc.wxJoystickEvent_GetZPosition,(self,) + _args, _kwargs)

         return val
         return val

-    def GetButtonState(self):
-        val = eventsc.wxJoystickEvent_GetButtonState(self.this)
+    def GetButtonState(self, *_args, **_kwargs):
+        val = apply(eventsc.wxJoystickEvent_GetButtonState,(self,) + _args, _kwargs)

         return val
         return val

-    def GetButtonChange(self):
-        val = eventsc.wxJoystickEvent_GetButtonChange(self.this)
+    def GetButtonChange(self, *_args, **_kwargs):
+        val = apply(eventsc.wxJoystickEvent_GetButtonChange,(self,) + _args, _kwargs)

         return val
         return val

-    def GetJoystick(self):
-        val = eventsc.wxJoystickEvent_GetJoystick(self.this)
+    def GetJoystick(self, *_args, **_kwargs):
+        val = apply(eventsc.wxJoystickEvent_GetJoystick,(self,) + _args, _kwargs)

         return val
         return val

-    def SetJoystick(self,arg0):
-        val = eventsc.wxJoystickEvent_SetJoystick(self.this,arg0)
+    def SetJoystick(self, *_args, **_kwargs):
+        val = apply(eventsc.wxJoystickEvent_SetJoystick,(self,) + _args, _kwargs)

         return val
         return val

-    def SetButtonState(self,arg0):
-        val = eventsc.wxJoystickEvent_SetButtonState(self.this,arg0)
+    def SetButtonState(self, *_args, **_kwargs):
+        val = apply(eventsc.wxJoystickEvent_SetButtonState,(self,) + _args, _kwargs)

         return val
         return val

-    def SetButtonChange(self,arg0):
-        val = eventsc.wxJoystickEvent_SetButtonChange(self.this,arg0)
+    def SetButtonChange(self, *_args, **_kwargs):
+        val = apply(eventsc.wxJoystickEvent_SetButtonChange,(self,) + _args, _kwargs)

         return val
         return val

-    def SetPosition(self,arg0):
-        val = eventsc.wxJoystickEvent_SetPosition(self.this,arg0.this)
+    def SetPosition(self, *_args, **_kwargs):
+        val = apply(eventsc.wxJoystickEvent_SetPosition,(self,) + _args, _kwargs)

         return val
         return val

-    def SetZPosition(self,arg0):
-        val = eventsc.wxJoystickEvent_SetZPosition(self.this,arg0)
+    def SetZPosition(self, *_args, **_kwargs):
+        val = apply(eventsc.wxJoystickEvent_SetZPosition,(self,) + _args, _kwargs)

         return val
         return val

-    def IsButton(self):
-        val = eventsc.wxJoystickEvent_IsButton(self.this)
+    def IsButton(self, *_args, **_kwargs):
+        val = apply(eventsc.wxJoystickEvent_IsButton,(self,) + _args, _kwargs)

         return val
         return val

-    def IsMove(self):
-        val = eventsc.wxJoystickEvent_IsMove(self.this)
+    def IsMove(self, *_args, **_kwargs):
+        val = apply(eventsc.wxJoystickEvent_IsMove,(self,) + _args, _kwargs)

         return val
         return val

-    def IsZMove(self):
-        val = eventsc.wxJoystickEvent_IsZMove(self.this)
+    def IsZMove(self, *_args, **_kwargs):
+        val = apply(eventsc.wxJoystickEvent_IsZMove,(self,) + _args, _kwargs)

         return val
         return val

-    def ButtonDown(self,*args):
-        val = apply(eventsc.wxJoystickEvent_ButtonDown,(self.this,)+args)
+    def ButtonDown(self, *_args, **_kwargs):
+        val = apply(eventsc.wxJoystickEvent_ButtonDown,(self,) + _args, _kwargs)

         return val
         return val

-    def ButtonUp(self,*args):
-        val = apply(eventsc.wxJoystickEvent_ButtonUp,(self.this,)+args)
+    def ButtonUp(self, *_args, **_kwargs):
+        val = apply(eventsc.wxJoystickEvent_ButtonUp,(self,) + _args, _kwargs)

         return val
         return val

-    def ButtonIsDown(self,*args):
-        val = apply(eventsc.wxJoystickEvent_ButtonIsDown,(self.this,)+args)
+    def ButtonIsDown(self, *_args, **_kwargs):
+        val = apply(eventsc.wxJoystickEvent_ButtonIsDown,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxJoystickEvent instance>"
+        return "<C wxJoystickEvent instance at %s>" % (self.this,)

 class wxJoystickEvent(wxJoystickEventPtr):
     def __init__(self,this):
         self.this = this
 class wxJoystickEvent(wxJoystickEventPtr):
     def __init__(self,this):
         self.this = this


@@ -513,19 +508,18 @@ class wxDropFilesEventPtr(wxEventPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetPosition(self):
-        val = eventsc.wxDropFilesEvent_GetPosition(self.this)
-        val = wxPointPtr(val)
-        val.thisown = 1
+    def GetPosition(self, *_args, **_kwargs):
+        val = apply(eventsc.wxDropFilesEvent_GetPosition,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetNumberOfFiles(self):
-        val = eventsc.wxDropFilesEvent_GetNumberOfFiles(self.this)
+    def GetNumberOfFiles(self, *_args, **_kwargs):
+        val = apply(eventsc.wxDropFilesEvent_GetNumberOfFiles,(self,) + _args, _kwargs)

         return val
         return val

-    def GetFiles(self):
-        val = eventsc.wxDropFilesEvent_GetFiles(self.this)
+    def GetFiles(self, *_args, **_kwargs):
+        val = apply(eventsc.wxDropFilesEvent_GetFiles,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxDropFilesEvent instance>"
+        return "<C wxDropFilesEvent instance at %s>" % (self.this,)

 class wxDropFilesEvent(wxDropFilesEventPtr):
     def __init__(self,this):
         self.this = this
 class wxDropFilesEvent(wxDropFilesEventPtr):
     def __init__(self,this):
         self.this = this


@@ -537,14 +531,14 @@ class wxIdleEventPtr(wxEventPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def RequestMore(self,*args):
-        val = apply(eventsc.wxIdleEvent_RequestMore,(self.this,)+args)
+    def RequestMore(self, *_args, **_kwargs):
+        val = apply(eventsc.wxIdleEvent_RequestMore,(self,) + _args, _kwargs)

         return val
         return val

-    def MoreRequested(self):
-        val = eventsc.wxIdleEvent_MoreRequested(self.this)
+    def MoreRequested(self, *_args, **_kwargs):
+        val = apply(eventsc.wxIdleEvent_MoreRequested,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxIdleEvent instance>"
+        return "<C wxIdleEvent instance at %s>" % (self.this,)

 class wxIdleEvent(wxIdleEventPtr):
     def __init__(self,this):
         self.this = this
 class wxIdleEvent(wxIdleEventPtr):
     def __init__(self,this):
         self.this = this


@@ -556,35 +550,35 @@ class wxUpdateUIEventPtr(wxEventPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetChecked(self):
-        val = eventsc.wxUpdateUIEvent_GetChecked(self.this)
+    def GetChecked(self, *_args, **_kwargs):
+        val = apply(eventsc.wxUpdateUIEvent_GetChecked,(self,) + _args, _kwargs)

         return val
         return val

-    def GetEnabled(self):
-        val = eventsc.wxUpdateUIEvent_GetEnabled(self.this)
+    def GetEnabled(self, *_args, **_kwargs):
+        val = apply(eventsc.wxUpdateUIEvent_GetEnabled,(self,) + _args, _kwargs)

         return val
         return val

-    def GetText(self):
-        val = eventsc.wxUpdateUIEvent_GetText(self.this)
+    def GetText(self, *_args, **_kwargs):
+        val = apply(eventsc.wxUpdateUIEvent_GetText,(self,) + _args, _kwargs)

         return val
         return val

-    def GetSetText(self):
-        val = eventsc.wxUpdateUIEvent_GetSetText(self.this)
+    def GetSetText(self, *_args, **_kwargs):
+        val = apply(eventsc.wxUpdateUIEvent_GetSetText,(self,) + _args, _kwargs)

         return val
         return val

-    def GetSetChecked(self):
-        val = eventsc.wxUpdateUIEvent_GetSetChecked(self.this)
+    def GetSetChecked(self, *_args, **_kwargs):
+        val = apply(eventsc.wxUpdateUIEvent_GetSetChecked,(self,) + _args, _kwargs)

         return val
         return val

-    def GetSetEnabled(self):
-        val = eventsc.wxUpdateUIEvent_GetSetEnabled(self.this)
+    def GetSetEnabled(self, *_args, **_kwargs):
+        val = apply(eventsc.wxUpdateUIEvent_GetSetEnabled,(self,) + _args, _kwargs)

         return val
         return val

-    def Check(self,arg0):
-        val = eventsc.wxUpdateUIEvent_Check(self.this,arg0)
+    def Check(self, *_args, **_kwargs):
+        val = apply(eventsc.wxUpdateUIEvent_Check,(self,) + _args, _kwargs)

         return val
         return val

-    def Enable(self,arg0):
-        val = eventsc.wxUpdateUIEvent_Enable(self.this,arg0)
+    def Enable(self, *_args, **_kwargs):
+        val = apply(eventsc.wxUpdateUIEvent_Enable,(self,) + _args, _kwargs)

         return val
         return val

-    def SetText(self,arg0):
-        val = eventsc.wxUpdateUIEvent_SetText(self.this,arg0)
+    def SetText(self, *_args, **_kwargs):
+        val = apply(eventsc.wxUpdateUIEvent_SetText,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxUpdateUIEvent instance>"
+        return "<C wxUpdateUIEvent instance at %s>" % (self.this,)

 class wxUpdateUIEvent(wxUpdateUIEventPtr):
     def __init__(self,this):
         self.this = this
 class wxUpdateUIEvent(wxUpdateUIEventPtr):
     def __init__(self,this):
         self.this = this


@@ -597,7 +591,7 @@ class wxSysColourChangedEventPtr(wxEventPtr):
         self.this = this
         self.thisown = 0
     def __repr__(self):
         self.this = this
         self.thisown = 0
     def __repr__(self):

-        return "<C wxSysColourChangedEvent instance>"
+        return "<C wxSysColourChangedEvent instance at %s>" % (self.this,)

 class wxSysColourChangedEvent(wxSysColourChangedEventPtr):
     def __init__(self,this):
         self.this = this
 class wxSysColourChangedEvent(wxSysColourChangedEventPtr):
     def __init__(self,this):
         self.this = this


@@ -609,20 +603,20 @@ class wxPyEventPtr(wxCommandEventPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self, eventsc=eventsc):
+    def __del__(self,eventsc=eventsc):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            eventsc.delete_wxPyEvent(self.this)
-    def SetUserData(self,arg0):
-        val = eventsc.wxPyEvent_SetUserData(self.this,arg0)
+            eventsc.delete_wxPyEvent(self)
+    def SetUserData(self, *_args, **_kwargs):
+        val = apply(eventsc.wxPyEvent_SetUserData,(self,) + _args, _kwargs)

         return val
         return val

-    def GetUserData(self):
-        val = eventsc.wxPyEvent_GetUserData(self.this)
+    def GetUserData(self, *_args, **_kwargs):
+        val = apply(eventsc.wxPyEvent_GetUserData,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxPyEvent instance>"
+        return "<C wxPyEvent instance at %s>" % (self.this,)

 class wxPyEvent(wxPyEventPtr):
 class wxPyEvent(wxPyEventPtr):

-    def __init__(self,*args) :
-        self.this = apply(eventsc.new_wxPyEvent,()+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(eventsc.new_wxPyEvent,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -632,14 +626,14 @@ class wxNotifyEventPtr(wxCommandEventPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def IsAllowed(self):
-        val = eventsc.wxNotifyEvent_IsAllowed(self.this)
+    def IsAllowed(self, *_args, **_kwargs):
+        val = apply(eventsc.wxNotifyEvent_IsAllowed,(self,) + _args, _kwargs)

         return val
         return val

-    def Veto(self):
-        val = eventsc.wxNotifyEvent_Veto(self.this)
+    def Veto(self, *_args, **_kwargs):
+        val = apply(eventsc.wxNotifyEvent_Veto,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxNotifyEvent instance>"
+        return "<C wxNotifyEvent instance at %s>" % (self.this,)

 class wxNotifyEvent(wxNotifyEventPtr):
     def __init__(self,this):
         self.this = this
 class wxNotifyEvent(wxNotifyEventPtr):
     def __init__(self,this):
         self.this = this

diff --git a/utils/wxPython/src/msw/frames.cpp b/utils/wxPython/src/msw/frames.cpp
index b05bf8a39d146b131155bb048ca7e9dfdd0e6862..ab2d6cf2b92f3d39e56ff5dfde52d215ef6758fa 100644 (file)
--- a/utils/wxPython/src/msw/frames.cpp
+++ b/utils/wxPython/src/msw/frames.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)

- * Version 1.1 (Patch 5)
+ * Version 1.1 (Patch 6)

  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.


@@ -24,16 +24,16 @@
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)

-#      define SWIGEXPORT(a,b) __declspec(dllexport) a b
+#      define SWIGEXPORT(a) __declspec(dllexport) a

 #   else
 #      if defined(__BORLANDC__)
 #   else
 #      if defined(__BORLANDC__)

-#          define SWIGEXPORT(a,b) a _export b
+#          define SWIGEXPORT(a) a _export 

 #      else
 #      else

-#          define SWIGEXPORT(a,b) a b
+#          define SWIGEXPORT(a) a 

 #      endif
 #   endif
 #else
 #      endif
 #   endif
 #else

-#   define SWIGEXPORT(a,b) a b
+#   define SWIGEXPORT(a) a 

 #endif
 
 #ifdef __cplusplus
 #endif
 
 #ifdef __cplusplus


@@ -43,12 +43,12 @@ extern "C" {
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);

+extern char *SWIG_GetPtrObj(PyObject *, void **, char *);

 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif
 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif

-

 #define SWIG_init    initframesc
 
 #define SWIG_name    "framesc"
 #define SWIG_init    initframesc
 
 #define SWIG_name    "framesc"


@@ -58,12 +58,13 @@ extern PyObject *SWIG_newvarlink(void);
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;

-    if (!target) {
+    PyObject*   o3;
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);
         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);


@@ -80,23 +81,23 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
     PyObject*   o3;
 
     PyObject*   o2;
     PyObject*   o3;
 

-    if (!target) {
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }
         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }

-        o3 = PyTuple_New(1);
-        PyTuple_SetItem(o3, 0, o);
+        o3 = PyTuple_New(1);            
+        PyTuple_SetItem(o3, 0, o);      

 
         o2 = target;
 
         o2 = target;

-        target = PySequence_Concat(o2, o3);
-        Py_DECREF(o2);
+        target = PySequence_Concat(o2, o3); 
+        Py_DECREF(o2);                      

         Py_DECREF(o3);
     }
     return target;
         Py_DECREF(o3);
     }
     return target;


@@ -114,6 +115,9 @@ extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
 
 
 static char* wxStringErrorMsg = "string type is required for parameter";
 
 
 static char* wxStringErrorMsg = "string type is required for parameter";

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

 static void *SwigwxFrameTowxWindow(void *ptr) {
     wxFrame *src;
     wxWindow *dest;
 static void *SwigwxFrameTowxWindow(void *ptr) {
     wxFrame *src;
     wxWindow *dest;


@@ -137,21 +141,22 @@ static PyObject *_wrap_new_wxFrame(PyObject *self, PyObject *args) {
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;

-    wxPoint * _arg3 = &wxPyDefaultPosition;
-    wxSize * _arg4 = &wxPyDefaultSize;
-    long  _arg5 = (wxDEFAULT_FRAME_STYLE);
-    char * _arg6 = "frame";
-    char * _argc0 = 0;
+    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    long  _arg5 = (long ) wxDEFAULT_FRAME_STYLE;
+    char * _arg6 = (char *) "frame";
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
     PyObject * _obj2 = 0;

-    char * _argc3 = 0;
-    char * _argc4 = 0;
+    PyObject * _argo3 = 0;
+    PyObject * _argo4 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siO|ssls:new_wxFrame",&_argc0,&_arg1,&_obj2,&_argc3,&_argc4,&_arg5,&_arg6)) 
+    if(!PyArg_ParseTuple(args,"OiO|OOls:new_wxFrame",&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxFrame. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxFrame. Expected _wxWindow_p.");
         return NULL;
         }


@@ -163,14 +168,16 @@ static PyObject *_wrap_new_wxFrame(PyObject *self, PyObject *args) {
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxPoint_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxFrame. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxFrame. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_wxSize_p")) {
+    if (_argo4) {
+        if (_argo4 == Py_None) { _arg4 = NULL; }
+        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxFrame. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxFrame. Expected _wxSize_p.");
         return NULL;
         }


@@ -180,8 +187,13 @@ static PyObject *_wrap_new_wxFrame(PyObject *self, PyObject *args) {
         _result = (wxFrame *)new_wxFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxFrame *)new_wxFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxFrame_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxFrame_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     if (_obj2)
         delete _arg2;
 {
     if (_obj2)
         delete _arg2;


@@ -193,14 +205,15 @@ static PyObject *_wrap_new_wxFrame(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxFrame_Centre(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFrame * _arg0;
 static PyObject *_wrap_wxFrame_Centre(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFrame * _arg0;

-    int  _arg1 = (wxBOTH);
-    char * _argc0 = 0;
+    int  _arg1 = (int ) wxBOTH;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxFrame_Centre",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"O|i:wxFrame_Centre",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_Centre. Expected _wxFrame_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_Centre. Expected _wxFrame_p.");
         return NULL;
         }


@@ -220,13 +233,14 @@ static PyObject *_wrap_wxFrame_Command(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFrame * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxFrame * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxFrame_Command",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxFrame_Command",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_Command. Expected _wxFrame_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_Command. Expected _wxFrame_p.");
         return NULL;
         }


@@ -246,18 +260,19 @@ static PyObject *_wrap_wxFrame_CreateStatusBar(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxStatusBar * _result;
     wxFrame * _arg0;
     PyObject * _resultobj;
     wxStatusBar * _result;
     wxFrame * _arg0;

-    int  _arg1 = 1;
-    long  _arg2 = (wxST_SIZEGRIP);
-    wxWindowID  _arg3 = -1;
-    char * _arg4 = "statusBar";
-    char * _argc0 = 0;
+    int  _arg1 = (int ) 1;
+    long  _arg2 = (long ) wxST_SIZEGRIP;
+    wxWindowID  _arg3 = (wxWindowID ) -1;
+    char * _arg4 = (char *) "statusBar";
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|ilis:wxFrame_CreateStatusBar",&_argc0,&_arg1,&_arg2,&_arg3,&_arg4)) 
+    if(!PyArg_ParseTuple(args,"O|ilis:wxFrame_CreateStatusBar",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_CreateStatusBar. Expected _wxFrame_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_CreateStatusBar. Expected _wxFrame_p.");
         return NULL;
         }


@@ -267,8 +282,13 @@ static PyObject *_wrap_wxFrame_CreateStatusBar(PyObject *self, PyObject *args) {
         _result = (wxStatusBar *)wxFrame_CreateStatusBar(_arg0,_arg1,_arg2,_arg3,_arg4);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxStatusBar *)wxFrame_CreateStatusBar(_arg0,_arg1,_arg2,_arg3,_arg4);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxStatusBar_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxStatusBar_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -277,17 +297,18 @@ static PyObject *_wrap_wxFrame_CreateToolBar(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxToolBar * _result;
     wxFrame * _arg0;
     PyObject * _resultobj;
     wxToolBar * _result;
     wxFrame * _arg0;

-    long  _arg1 = (wxNO_BORDER)|(wxTB_HORIZONTAL)|(wxTB_FLAT);
-    wxWindowID  _arg2 = -1;
-    char * _arg3 = "toolBar";
-    char * _argc0 = 0;
+    long  _arg1 = (long ) wxNO_BORDER|wxTB_HORIZONTAL|wxTB_FLAT;
+    wxWindowID  _arg2 = (wxWindowID ) -1;
+    char * _arg3 = (char *) "toolBar";
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|lis:wxFrame_CreateToolBar",&_argc0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"O|lis:wxFrame_CreateToolBar",&_argo0,&_arg1,&_arg2,&_arg3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_CreateToolBar. Expected _wxFrame_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_CreateToolBar. Expected _wxFrame_p.");
         return NULL;
         }


@@ -297,8 +318,13 @@ static PyObject *_wrap_wxFrame_CreateToolBar(PyObject *self, PyObject *args) {
         _result = (wxToolBar *)wxFrame_CreateToolBar(_arg0,_arg1,_arg2,_arg3);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxToolBar *)wxFrame_CreateToolBar(_arg0,_arg1,_arg2,_arg3);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBar_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBar_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -307,14 +333,15 @@ static PyObject *_wrap_wxFrame_GetMenuBar(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMenuBar * _result;
     wxFrame * _arg0;
     PyObject * _resultobj;
     wxMenuBar * _result;
     wxFrame * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxFrame_GetMenuBar",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxFrame_GetMenuBar",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_GetMenuBar. Expected _wxFrame_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_GetMenuBar. Expected _wxFrame_p.");
         return NULL;
         }


@@ -324,8 +351,13 @@ static PyObject *_wrap_wxFrame_GetMenuBar(PyObject *self, PyObject *args) {
         _result = (wxMenuBar *)wxFrame_GetMenuBar(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxMenuBar *)wxFrame_GetMenuBar(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenuBar_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenuBar_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -334,14 +366,15 @@ static PyObject *_wrap_wxFrame_GetStatusBar(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxStatusBar * _result;
     wxFrame * _arg0;
     PyObject * _resultobj;
     wxStatusBar * _result;
     wxFrame * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxFrame_GetStatusBar",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxFrame_GetStatusBar",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_GetStatusBar. Expected _wxFrame_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_GetStatusBar. Expected _wxFrame_p.");
         return NULL;
         }


@@ -351,8 +384,13 @@ static PyObject *_wrap_wxFrame_GetStatusBar(PyObject *self, PyObject *args) {
         _result = (wxStatusBar *)wxFrame_GetStatusBar(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxStatusBar *)wxFrame_GetStatusBar(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxStatusBar_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxStatusBar_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -361,13 +399,14 @@ static PyObject *_wrap_wxFrame_GetTitle(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxFrame * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxFrame * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxFrame_GetTitle",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxFrame_GetTitle",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_GetTitle. Expected _wxFrame_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_GetTitle. Expected _wxFrame_p.");
         return NULL;
         }


@@ -391,14 +430,15 @@ static PyObject *_wrap_wxFrame_GetToolBar(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxToolBar * _result;
     wxFrame * _arg0;
     PyObject * _resultobj;
     wxToolBar * _result;
     wxFrame * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxFrame_GetToolBar",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxFrame_GetToolBar",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_GetToolBar. Expected _wxFrame_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_GetToolBar. Expected _wxFrame_p.");
         return NULL;
         }


@@ -408,8 +448,13 @@ static PyObject *_wrap_wxFrame_GetToolBar(PyObject *self, PyObject *args) {
         _result = (wxToolBar *)wxFrame_GetToolBar(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxToolBar *)wxFrame_GetToolBar(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBar_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBar_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -418,14 +463,15 @@ static PyObject *_wrap_wxFrame_Iconize(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFrame * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxFrame * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxFrame_Iconize",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxFrame_Iconize",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_Iconize. Expected _wxFrame_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_Iconize. Expected _wxFrame_p.");
         return NULL;
         }


@@ -446,13 +492,14 @@ static PyObject *_wrap_wxFrame_IsIconized(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxFrame * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxFrame * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxFrame_IsIconized",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxFrame_IsIconized",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_IsIconized. Expected _wxFrame_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_IsIconized. Expected _wxFrame_p.");
         return NULL;
         }


@@ -471,14 +518,15 @@ static PyObject *_wrap_wxFrame_Maximize(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFrame * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxFrame * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxFrame_Maximize",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxFrame_Maximize",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_Maximize. Expected _wxFrame_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_Maximize. Expected _wxFrame_p.");
         return NULL;
         }


@@ -499,20 +547,22 @@ static PyObject *_wrap_wxFrame_SetAcceleratorTable(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     wxFrame * _arg0;
     wxAcceleratorTable * _arg1;
     PyObject * _resultobj;
     wxFrame * _arg0;
     wxAcceleratorTable * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxFrame_SetAcceleratorTable",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxFrame_SetAcceleratorTable",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_SetAcceleratorTable. Expected _wxFrame_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_SetAcceleratorTable. Expected _wxFrame_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxAcceleratorTable_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxAcceleratorTable_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFrame_SetAcceleratorTable. Expected _wxAcceleratorTable_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFrame_SetAcceleratorTable. Expected _wxAcceleratorTable_p.");
         return NULL;
         }


@@ -532,20 +582,22 @@ static PyObject *_wrap_wxFrame_SetIcon(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFrame * _arg0;
     wxIcon * _arg1;
     PyObject * _resultobj;
     wxFrame * _arg0;
     wxIcon * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxFrame_SetIcon",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxFrame_SetIcon",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_SetIcon. Expected _wxFrame_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_SetIcon. Expected _wxFrame_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxIcon_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxIcon_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFrame_SetIcon. Expected _wxIcon_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFrame_SetIcon. Expected _wxIcon_p.");
         return NULL;
         }


@@ -565,20 +617,22 @@ static PyObject *_wrap_wxFrame_SetMenuBar(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFrame * _arg0;
     wxMenuBar * _arg1;
     PyObject * _resultobj;
     wxFrame * _arg0;
     wxMenuBar * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxFrame_SetMenuBar",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxFrame_SetMenuBar",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_SetMenuBar. Expected _wxFrame_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_SetMenuBar. Expected _wxFrame_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxMenuBar_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxMenuBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFrame_SetMenuBar. Expected _wxMenuBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFrame_SetMenuBar. Expected _wxMenuBar_p.");
         return NULL;
         }


@@ -598,20 +652,22 @@ static PyObject *_wrap_wxFrame_SetStatusBar(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFrame * _arg0;
     wxStatusBar * _arg1;
     PyObject * _resultobj;
     wxFrame * _arg0;
     wxStatusBar * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxFrame_SetStatusBar",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxFrame_SetStatusBar",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_SetStatusBar. Expected _wxFrame_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_SetStatusBar. Expected _wxFrame_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxStatusBar_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxStatusBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFrame_SetStatusBar. Expected _wxStatusBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFrame_SetStatusBar. Expected _wxStatusBar_p.");
         return NULL;
         }


@@ -631,15 +687,16 @@ static PyObject *_wrap_wxFrame_SetStatusText(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFrame * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxFrame * _arg0;
     wxString * _arg1;

-    int  _arg2 = 0;
-    char * _argc0 = 0;
+    int  _arg2 = (int ) 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO|i:wxFrame_SetStatusText",&_argc0,&_obj1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"OO|i:wxFrame_SetStatusText",&_argo0,&_obj1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_SetStatusText. Expected _wxFrame_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_SetStatusText. Expected _wxFrame_p.");
         return NULL;
         }


@@ -671,14 +728,15 @@ static PyObject *_wrap_wxFrame_SetStatusWidths(PyObject *self, PyObject *args) {
     wxFrame * _arg0;
     int  _arg1;
     int * _arg2;
     wxFrame * _arg0;
     int  _arg1;
     int * _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
 
     self = self;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxFrame_SetStatusWidths",&_argc0,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"OO:wxFrame_SetStatusWidths",&_argo0,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_SetStatusWidths. Expected _wxFrame_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_SetStatusWidths. Expected _wxFrame_p.");
         return NULL;
         }


@@ -716,14 +774,15 @@ static PyObject *_wrap_wxFrame_SetTitle(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFrame * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxFrame * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxFrame_SetTitle",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxFrame_SetTitle",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_SetTitle. Expected _wxFrame_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_SetTitle. Expected _wxFrame_p.");
         return NULL;
         }


@@ -754,20 +813,22 @@ static PyObject *_wrap_wxFrame_SetToolBar(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFrame * _arg0;
     wxToolBar * _arg1;
     PyObject * _resultobj;
     wxFrame * _arg0;
     wxToolBar * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxFrame_SetToolBar",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxFrame_SetToolBar",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_SetToolBar. Expected _wxFrame_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_SetToolBar. Expected _wxFrame_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxToolBar_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxToolBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFrame_SetToolBar. Expected _wxToolBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFrame_SetToolBar. Expected _wxToolBar_p.");
         return NULL;
         }


@@ -813,21 +874,22 @@ static PyObject *_wrap_new_wxMiniFrame(PyObject *self, PyObject *args) {
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;

-    wxPoint * _arg3 = &wxPyDefaultPosition;
-    wxSize * _arg4 = &wxPyDefaultSize;
-    long  _arg5 = (wxDEFAULT_FRAME_STYLE);
-    char * _arg6 = "frame";
-    char * _argc0 = 0;
+    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    long  _arg5 = (long ) wxDEFAULT_FRAME_STYLE;
+    char * _arg6 = (char *) "frame";
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
     PyObject * _obj2 = 0;

-    char * _argc3 = 0;
-    char * _argc4 = 0;
+    PyObject * _argo3 = 0;
+    PyObject * _argo4 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siO|ssls:new_wxMiniFrame",&_argc0,&_arg1,&_obj2,&_argc3,&_argc4,&_arg5,&_arg6)) 
+    if(!PyArg_ParseTuple(args,"OiO|OOls:new_wxMiniFrame",&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxMiniFrame. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxMiniFrame. Expected _wxWindow_p.");
         return NULL;
         }


@@ -839,14 +901,16 @@ static PyObject *_wrap_new_wxMiniFrame(PyObject *self, PyObject *args) {
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxPoint_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxMiniFrame. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxMiniFrame. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_wxSize_p")) {
+    if (_argo4) {
+        if (_argo4 == Py_None) { _arg4 = NULL; }
+        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxMiniFrame. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxMiniFrame. Expected _wxSize_p.");
         return NULL;
         }


@@ -856,8 +920,13 @@ static PyObject *_wrap_new_wxMiniFrame(PyObject *self, PyObject *args) {
         _result = (wxMiniFrame *)new_wxMiniFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxMiniFrame *)new_wxMiniFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMiniFrame_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMiniFrame_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     if (_obj2)
         delete _arg2;
 {
     if (_obj2)
         delete _arg2;


@@ -866,296 +935,306 @@ static PyObject *_wrap_new_wxMiniFrame(PyObject *self, PyObject *args) {
 }
 
 static PyMethodDef framescMethods[] = {
 }
 
 static PyMethodDef framescMethods[] = {

-        { "new_wxMiniFrame", _wrap_new_wxMiniFrame, 1 },
-        { "wxFrame_SetToolBar", _wrap_wxFrame_SetToolBar, 1 },
-        { "wxFrame_SetTitle", _wrap_wxFrame_SetTitle, 1 },
-        { "wxFrame_SetStatusWidths", _wrap_wxFrame_SetStatusWidths, 1 },
-        { "wxFrame_SetStatusText", _wrap_wxFrame_SetStatusText, 1 },
-        { "wxFrame_SetStatusBar", _wrap_wxFrame_SetStatusBar, 1 },
-        { "wxFrame_SetMenuBar", _wrap_wxFrame_SetMenuBar, 1 },
-        { "wxFrame_SetIcon", _wrap_wxFrame_SetIcon, 1 },
-        { "wxFrame_SetAcceleratorTable", _wrap_wxFrame_SetAcceleratorTable, 1 },
-        { "wxFrame_Maximize", _wrap_wxFrame_Maximize, 1 },
-        { "wxFrame_IsIconized", _wrap_wxFrame_IsIconized, 1 },
-        { "wxFrame_Iconize", _wrap_wxFrame_Iconize, 1 },
-        { "wxFrame_GetToolBar", _wrap_wxFrame_GetToolBar, 1 },
-        { "wxFrame_GetTitle", _wrap_wxFrame_GetTitle, 1 },
-        { "wxFrame_GetStatusBar", _wrap_wxFrame_GetStatusBar, 1 },
-        { "wxFrame_GetMenuBar", _wrap_wxFrame_GetMenuBar, 1 },
-        { "wxFrame_CreateToolBar", _wrap_wxFrame_CreateToolBar, 1 },
-        { "wxFrame_CreateStatusBar", _wrap_wxFrame_CreateStatusBar, 1 },
-        { "wxFrame_Command", _wrap_wxFrame_Command, 1 },
-        { "wxFrame_Centre", _wrap_wxFrame_Centre, 1 },
-        { "new_wxFrame", _wrap_new_wxFrame, 1 },
+        { "new_wxMiniFrame", _wrap_new_wxMiniFrame, METH_VARARGS },
+        { "wxFrame_SetToolBar", _wrap_wxFrame_SetToolBar, METH_VARARGS },
+        { "wxFrame_SetTitle", _wrap_wxFrame_SetTitle, METH_VARARGS },
+        { "wxFrame_SetStatusWidths", _wrap_wxFrame_SetStatusWidths, METH_VARARGS },
+        { "wxFrame_SetStatusText", _wrap_wxFrame_SetStatusText, METH_VARARGS },
+        { "wxFrame_SetStatusBar", _wrap_wxFrame_SetStatusBar, METH_VARARGS },
+        { "wxFrame_SetMenuBar", _wrap_wxFrame_SetMenuBar, METH_VARARGS },
+        { "wxFrame_SetIcon", _wrap_wxFrame_SetIcon, METH_VARARGS },
+        { "wxFrame_SetAcceleratorTable", _wrap_wxFrame_SetAcceleratorTable, METH_VARARGS },
+        { "wxFrame_Maximize", _wrap_wxFrame_Maximize, METH_VARARGS },
+        { "wxFrame_IsIconized", _wrap_wxFrame_IsIconized, METH_VARARGS },
+        { "wxFrame_Iconize", _wrap_wxFrame_Iconize, METH_VARARGS },
+        { "wxFrame_GetToolBar", _wrap_wxFrame_GetToolBar, METH_VARARGS },
+        { "wxFrame_GetTitle", _wrap_wxFrame_GetTitle, METH_VARARGS },
+        { "wxFrame_GetStatusBar", _wrap_wxFrame_GetStatusBar, METH_VARARGS },
+        { "wxFrame_GetMenuBar", _wrap_wxFrame_GetMenuBar, METH_VARARGS },
+        { "wxFrame_CreateToolBar", _wrap_wxFrame_CreateToolBar, METH_VARARGS },
+        { "wxFrame_CreateStatusBar", _wrap_wxFrame_CreateStatusBar, METH_VARARGS },
+        { "wxFrame_Command", _wrap_wxFrame_Command, METH_VARARGS },
+        { "wxFrame_Centre", _wrap_wxFrame_Centre, METH_VARARGS },
+        { "new_wxFrame", _wrap_new_wxFrame, METH_VARARGS },

         { NULL, NULL }
 };
         { NULL, NULL }
 };

+#ifdef __cplusplus
+}
+#endif
+/*
+ * This table is used by the pointer type-checker
+ */
+static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
+    { "_wxAcceleratorTable","_class_wxAcceleratorTable",0},
+    { "_wxEvent","_class_wxEvent",0},
+    { "_class_wxActivateEvent","_wxActivateEvent",0},
+    { "_signed_long","_long",0},
+    { "_wxMenuEvent","_class_wxMenuEvent",0},
+    { "_wxPrintQuality","_int",0},
+    { "_wxPrintQuality","_signed_int",0},
+    { "_wxPrintQuality","_unsigned_int",0},
+    { "_wxPrintQuality","_wxWindowID",0},
+    { "_wxPrintQuality","_uint",0},
+    { "_wxPrintQuality","_EBool",0},
+    { "_wxPrintQuality","_size_t",0},
+    { "_class_wxRegionIterator","_wxRegionIterator",0},
+    { "_class_wxMenuBar","_wxMenuBar",0},
+    { "_class_wxEvtHandler","_class_wxMiniFrame",SwigwxMiniFrameTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxMiniFrame",SwigwxMiniFrameTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxFrame",SwigwxFrameTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxFrame",SwigwxFrameTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxEvtHandler",0},
+    { "_wxPaintEvent","_class_wxPaintEvent",0},
+    { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
+    { "_wxCursor","_class_wxCursor",0},
+    { "_wxNotifyEvent","_class_wxNotifyEvent",0},
+    { "_wxMask","_class_wxMask",0},
+    { "_wxPen","_class_wxPen",0},
+    { "_wxUpdateUIEvent","_class_wxUpdateUIEvent",0},
+    { "_byte","_unsigned_char",0},
+    { "_wxStaticBox","_class_wxStaticBox",0},
+    { "_wxChoice","_class_wxChoice",0},
+    { "_wxSlider","_class_wxSlider",0},
+    { "_long","_wxDash",0},
+    { "_long","_unsigned_long",0},
+    { "_long","_signed_long",0},
+    { "_wxImageList","_class_wxImageList",0},
+    { "_wxDropFilesEvent","_class_wxDropFilesEvent",0},
+    { "_wxBitmapButton","_class_wxBitmapButton",0},
+    { "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
+    { "_class_wxGauge","_wxGauge",0},
+    { "_wxDC","_class_wxDC",0},
+    { "_wxSpinEvent","_class_wxSpinEvent",0},
+    { "_size_t","_wxPrintQuality",0},
+    { "_size_t","_unsigned_int",0},
+    { "_size_t","_int",0},
+    { "_size_t","_wxWindowID",0},
+    { "_size_t","_uint",0},
+    { "_class_wxRealPoint","_wxRealPoint",0},
+    { "_wxPrinterDC","_class_wxPrinterDC",0},
+    { "_class_wxMenuItem","_wxMenuItem",0},
+    { "_class_wxPaintEvent","_wxPaintEvent",0},
+    { "_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0},
+    { "_class_wxStatusBar","_wxStatusBar",0},
+    { "_wxPanel","_class_wxPanel",0},
+    { "_wxInitDialogEvent","_class_wxInitDialogEvent",0},
+    { "_wxCheckBox","_class_wxCheckBox",0},
+    { "_wxPyEvent","_class_wxPyEvent",0},
+    { "_wxTextCtrl","_class_wxTextCtrl",0},
+    { "_class_wxMask","_wxMask",0},
+    { "_class_wxKeyEvent","_wxKeyEvent",0},
+    { "_wxColour","_class_wxColour",0},
+    { "_class_wxDialog","_wxDialog",0},
+    { "_wxIdleEvent","_class_wxIdleEvent",0},
+    { "_class_wxUpdateUIEvent","_wxUpdateUIEvent",0},
+    { "_wxToolBar","_class_wxToolBar",0},
+    { "_wxStaticLine","_class_wxStaticLine",0},
+    { "_wxBrush","_class_wxBrush",0},
+    { "_wxMiniFrame","_class_wxMiniFrame",0},
+    { "_wxShowEvent","_class_wxShowEvent",0},
+    { "_uint","_wxPrintQuality",0},
+    { "_uint","_size_t",0},
+    { "_uint","_unsigned_int",0},
+    { "_uint","_int",0},
+    { "_uint","_wxWindowID",0},
+    { "_class_wxEvent","_wxEvent",0},
+    { "_wxCheckListBox","_class_wxCheckListBox",0},
+    { "_wxRect","_class_wxRect",0},
+    { "_wxCommandEvent","_class_wxCommandEvent",0},
+    { "_wxSizeEvent","_class_wxSizeEvent",0},
+    { "_wxPoint","_class_wxPoint",0},
+    { "_class_wxButton","_wxButton",0},
+    { "_wxRadioBox","_class_wxRadioBox",0},
+    { "_wxBitmap","_class_wxBitmap",0},
+    { "_wxPyTimer","_class_wxPyTimer",0},
+    { "_wxWindowDC","_class_wxWindowDC",0},
+    { "_wxScrollBar","_class_wxScrollBar",0},
+    { "_wxSpinButton","_class_wxSpinButton",0},
+    { "_wxToolBarTool","_class_wxToolBarTool",0},
+    { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
+    { "_class_wxNotifyEvent","_wxNotifyEvent",0},
+    { "_class_wxPyEvent","_wxPyEvent",0},
+    { "_class_wxIconizeEvent","_wxIconizeEvent",0},
+    { "_class_wxStaticBitmap","_wxStaticBitmap",0},
+    { "_class_wxToolBar","_wxToolBar",0},
+    { "_class_wxStaticLine","_wxStaticLine",0},
+    { "_wxScrollEvent","_class_wxScrollEvent",0},
+    { "_EBool","_wxPrintQuality",0},
+    { "_EBool","_signed_int",0},
+    { "_EBool","_int",0},
+    { "_EBool","_wxWindowID",0},
+    { "_class_wxRegion","_wxRegion",0},
+    { "_class_wxDropFilesEvent","_wxDropFilesEvent",0},
+    { "_wxStaticText","_class_wxStaticText",0},
+    { "_wxFont","_class_wxFont",0},
+    { "_wxCloseEvent","_class_wxCloseEvent",0},
+    { "_unsigned_long","_wxDash",0},
+    { "_unsigned_long","_long",0},
+    { "_class_wxRect","_wxRect",0},
+    { "_class_wxDC","_wxDC",0},
+    { "_class_wxPyTimer","_wxPyTimer",0},
+    { "_wxFocusEvent","_class_wxFocusEvent",0},
+    { "_wxMaximizeEvent","_class_wxMaximizeEvent",0},
+    { "_class_wxSpinButton","_wxSpinButton",0},
+    { "_wxAcceleratorEntry","_class_wxAcceleratorEntry",0},
+    { "_class_wxPanel","_wxPanel",0},
+    { "_class_wxCheckBox","_wxCheckBox",0},
+    { "_wxComboBox","_class_wxComboBox",0},
+    { "_wxRadioButton","_class_wxRadioButton",0},
+    { "_signed_int","_wxPrintQuality",0},
+    { "_signed_int","_EBool",0},
+    { "_signed_int","_wxWindowID",0},
+    { "_signed_int","_int",0},
+    { "_class_wxTextCtrl","_wxTextCtrl",0},
+    { "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
+    { "_wxMetaFileDC","_class_wxMetaFileDC",0},
+    { "_wxMenu","_class_wxMenu",0},
+    { "_class_wxMoveEvent","_wxMoveEvent",0},
+    { "_wxListBox","_class_wxListBox",0},
+    { "_wxScreenDC","_class_wxScreenDC",0},
+    { "_WXTYPE","_short",0},
+    { "_WXTYPE","_signed_short",0},
+    { "_WXTYPE","_unsigned_short",0},
+    { "_class_wxBrush","_wxBrush",0},
+    { "_unsigned_short","_WXTYPE",0},
+    { "_unsigned_short","_short",0},
+    { "_class_wxWindow","_class_wxMiniFrame",SwigwxMiniFrameTowxWindow},
+    { "_class_wxWindow","_wxMiniFrame",SwigwxMiniFrameTowxWindow},
+    { "_class_wxWindow","_class_wxFrame",SwigwxFrameTowxWindow},
+    { "_class_wxWindow","_wxFrame",SwigwxFrameTowxWindow},
+    { "_class_wxWindow","_wxWindow",0},
+    { "_class_wxStaticText","_wxStaticText",0},
+    { "_class_wxFont","_wxFont",0},
+    { "_class_wxCloseEvent","_wxCloseEvent",0},
+    { "_class_wxMenuEvent","_wxMenuEvent",0},
+    { "_wxClientDC","_class_wxClientDC",0},
+    { "_wxMouseEvent","_class_wxMouseEvent",0},
+    { "_class_wxPoint","_wxPoint",0},
+    { "_wxRealPoint","_class_wxRealPoint",0},
+    { "_class_wxRadioBox","_wxRadioBox",0},
+    { "_signed_short","_WXTYPE",0},
+    { "_signed_short","_short",0},
+    { "_wxMemoryDC","_class_wxMemoryDC",0},
+    { "_wxPaintDC","_class_wxPaintDC",0},
+    { "_class_wxWindowDC","_wxWindowDC",0},
+    { "_class_wxFocusEvent","_wxFocusEvent",0},
+    { "_class_wxMaximizeEvent","_wxMaximizeEvent",0},
+    { "_wxStatusBar","_class_wxStatusBar",0},
+    { "_class_wxToolBarTool","_wxToolBarTool",0},
+    { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
+    { "_class_wxCursor","_wxCursor",0},
+    { "_wxScrolledWindow","_class_wxScrolledWindow",0},
+    { "_unsigned_char","_byte",0},
+    { "_class_wxMetaFileDC","_wxMetaFileDC",0},
+    { "_class_wxMenu","_wxMenu",0},
+    { "_wxControl","_class_wxControl",0},
+    { "_class_wxListBox","_wxListBox",0},
+    { "_unsigned_int","_wxPrintQuality",0},
+    { "_unsigned_int","_size_t",0},
+    { "_unsigned_int","_uint",0},
+    { "_unsigned_int","_wxWindowID",0},
+    { "_unsigned_int","_int",0},
+    { "_wxIcon","_class_wxIcon",0},
+    { "_wxDialog","_class_wxDialog",0},
+    { "_class_wxPen","_wxPen",0},
+    { "_short","_WXTYPE",0},
+    { "_short","_unsigned_short",0},
+    { "_short","_signed_short",0},
+    { "_class_wxStaticBox","_wxStaticBox",0},
+    { "_class_wxScrollEvent","_wxScrollEvent",0},
+    { "_wxJoystickEvent","_class_wxJoystickEvent",0},
+    { "_class_wxChoice","_wxChoice",0},
+    { "_class_wxSlider","_wxSlider",0},
+    { "_class_wxImageList","_wxImageList",0},
+    { "_class_wxBitmapButton","_wxBitmapButton",0},
+    { "_wxFrame","_class_wxMiniFrame",SwigwxMiniFrameTowxFrame},
+    { "_wxFrame","_wxMiniFrame",SwigwxMiniFrameTowxFrame},
+    { "_wxFrame","_class_wxFrame",0},
+    { "_wxWindowID","_wxPrintQuality",0},
+    { "_wxWindowID","_size_t",0},
+    { "_wxWindowID","_EBool",0},
+    { "_wxWindowID","_uint",0},
+    { "_wxWindowID","_int",0},
+    { "_wxWindowID","_signed_int",0},
+    { "_wxWindowID","_unsigned_int",0},
+    { "_int","_wxPrintQuality",0},
+    { "_int","_size_t",0},
+    { "_int","_EBool",0},
+    { "_int","_uint",0},
+    { "_int","_wxWindowID",0},
+    { "_int","_unsigned_int",0},
+    { "_int","_signed_int",0},
+    { "_class_wxMouseEvent","_wxMouseEvent",0},
+    { "_class_wxSpinEvent","_wxSpinEvent",0},
+    { "_wxButton","_class_wxButton",0},
+    { "_wxSize","_class_wxSize",0},
+    { "_wxRegionIterator","_class_wxRegionIterator",0},
+    { "_class_wxPrinterDC","_wxPrinterDC",0},
+    { "_class_wxPaintDC","_wxPaintDC",0},
+    { "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0},
+    { "_class_wxInitDialogEvent","_wxInitDialogEvent",0},
+    { "_class_wxComboBox","_wxComboBox",0},
+    { "_class_wxRadioButton","_wxRadioButton",0},
+    { "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
+    { "_wxIconizeEvent","_class_wxIconizeEvent",0},
+    { "_class_wxControl","_wxControl",0},
+    { "_wxStaticBitmap","_class_wxStaticBitmap",0},
+    { "_class_wxIcon","_wxIcon",0},
+    { "_class_wxColour","_wxColour",0},
+    { "_class_wxScreenDC","_wxScreenDC",0},
+    { "_wxPalette","_class_wxPalette",0},
+    { "_class_wxIdleEvent","_wxIdleEvent",0},
+    { "_wxEraseEvent","_class_wxEraseEvent",0},
+    { "_class_wxJoystickEvent","_wxJoystickEvent",0},
+    { "_class_wxMiniFrame","_wxMiniFrame",0},
+    { "_wxRegion","_class_wxRegion",0},
+    { "_class_wxShowEvent","_wxShowEvent",0},
+    { "_wxActivateEvent","_class_wxActivateEvent",0},
+    { "_wxGauge","_class_wxGauge",0},
+    { "_class_wxCheckListBox","_wxCheckListBox",0},
+    { "_class_wxCommandEvent","_wxCommandEvent",0},
+    { "_class_wxClientDC","_wxClientDC",0},
+    { "_class_wxSizeEvent","_wxSizeEvent",0},
+    { "_class_wxSize","_wxSize",0},
+    { "_class_wxBitmap","_wxBitmap",0},
+    { "_class_wxMemoryDC","_wxMemoryDC",0},
+    { "_wxMenuBar","_class_wxMenuBar",0},
+    { "_wxEvtHandler","_class_wxMiniFrame",SwigwxMiniFrameTowxEvtHandler},
+    { "_wxEvtHandler","_wxMiniFrame",SwigwxMiniFrameTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxFrame",SwigwxFrameTowxEvtHandler},
+    { "_wxEvtHandler","_wxFrame",SwigwxFrameTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxEvtHandler",0},
+    { "_wxMenuItem","_class_wxMenuItem",0},
+    { "_class_wxScrollBar","_wxScrollBar",0},
+    { "_wxDash","_unsigned_long",0},
+    { "_wxDash","_long",0},
+    { "_class_wxScrolledWindow","_wxScrolledWindow",0},
+    { "_wxKeyEvent","_class_wxKeyEvent",0},
+    { "_wxMoveEvent","_class_wxMoveEvent",0},
+    { "_class_wxPalette","_wxPalette",0},
+    { "_class_wxEraseEvent","_wxEraseEvent",0},
+    { "_wxWindow","_class_wxMiniFrame",SwigwxMiniFrameTowxWindow},
+    { "_wxWindow","_wxMiniFrame",SwigwxMiniFrameTowxWindow},
+    { "_wxWindow","_class_wxFrame",SwigwxFrameTowxWindow},
+    { "_wxWindow","_wxFrame",SwigwxFrameTowxWindow},
+    { "_wxWindow","_class_wxWindow",0},
+    { "_class_wxFrame","_class_wxMiniFrame",SwigwxMiniFrameTowxFrame},
+    { "_class_wxFrame","_wxMiniFrame",SwigwxMiniFrameTowxFrame},
+    { "_class_wxFrame","_wxFrame",0},
+{0,0,0}};
+

 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif
 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif

-SWIGEXPORT(void,initframesc)() {
+SWIGEXPORT(void) initframesc() {

         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("framesc", framescMethods);
         d = PyModule_GetDict(m);
         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("framesc", framescMethods);
         d = PyModule_GetDict(m);

-/*
- * These are the pointer type-equivalency mappings. 
- * (Used by the SWIG pointer type-checker).
- */
-        SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_wxEvent","_class_wxEvent",0);
-        SWIG_RegisterMapping("_class_wxActivateEvent","_wxActivateEvent",0);
-        SWIG_RegisterMapping("_signed_long","_long",0);
-        SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_signed_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_unsigned_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_wxWindowID",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_uint",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_EBool",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_size_t",0);
-        SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
-        SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxMiniFrame",SwigwxMiniFrameTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxMiniFrame",SwigwxMiniFrameTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxFrame",SwigwxFrameTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxFrame",SwigwxFrameTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxEvtHandler",0);
-        SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
-        SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
-        SWIG_RegisterMapping("_wxNotifyEvent","_class_wxNotifyEvent",0);
-        SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
-        SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
-        SWIG_RegisterMapping("_wxUpdateUIEvent","_class_wxUpdateUIEvent",0);
-        SWIG_RegisterMapping("_byte","_unsigned_char",0);
-        SWIG_RegisterMapping("_wxStaticBox","_class_wxStaticBox",0);
-        SWIG_RegisterMapping("_wxChoice","_class_wxChoice",0);
-        SWIG_RegisterMapping("_wxSlider","_class_wxSlider",0);
-        SWIG_RegisterMapping("_long","_wxDash",0);
-        SWIG_RegisterMapping("_long","_unsigned_long",0);
-        SWIG_RegisterMapping("_long","_signed_long",0);
-        SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0);
-        SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0);
-        SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_class_wxGauge","_wxGauge",0);
-        SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
-        SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0);
-        SWIG_RegisterMapping("_size_t","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_size_t","_unsigned_int",0);
-        SWIG_RegisterMapping("_size_t","_int",0);
-        SWIG_RegisterMapping("_size_t","_wxWindowID",0);
-        SWIG_RegisterMapping("_size_t","_uint",0);
-        SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
-        SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0);
-        SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0);
-        SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0);
-        SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0);
-        SWIG_RegisterMapping("_class_wxStatusBar","_wxStatusBar",0);
-        SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);
-        SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
-        SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
-        SWIG_RegisterMapping("_wxPyEvent","_class_wxPyEvent",0);
-        SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);
-        SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
-        SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0);
-        SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
-        SWIG_RegisterMapping("_class_wxDialog","_wxDialog",0);
-        SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0);
-        SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0);
-        SWIG_RegisterMapping("_wxToolBar","_class_wxToolBar",0);
-        SWIG_RegisterMapping("_wxStaticLine","_class_wxStaticLine",0);
-        SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
-        SWIG_RegisterMapping("_wxMiniFrame","_class_wxMiniFrame",0);
-        SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0);
-        SWIG_RegisterMapping("_uint","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_uint","_size_t",0);
-        SWIG_RegisterMapping("_uint","_unsigned_int",0);
-        SWIG_RegisterMapping("_uint","_int",0);
-        SWIG_RegisterMapping("_uint","_wxWindowID",0);
-        SWIG_RegisterMapping("_class_wxEvent","_wxEvent",0);
-        SWIG_RegisterMapping("_wxCheckListBox","_class_wxCheckListBox",0);
-        SWIG_RegisterMapping("_wxRect","_class_wxRect",0);
-        SWIG_RegisterMapping("_wxCommandEvent","_class_wxCommandEvent",0);
-        SWIG_RegisterMapping("_wxSizeEvent","_class_wxSizeEvent",0);
-        SWIG_RegisterMapping("_wxPoint","_class_wxPoint",0);
-        SWIG_RegisterMapping("_class_wxButton","_wxButton",0);
-        SWIG_RegisterMapping("_wxRadioBox","_class_wxRadioBox",0);
-        SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
-        SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0);
-        SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0);
-        SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0);
-        SWIG_RegisterMapping("_wxToolBarTool","_class_wxToolBarTool",0);
-        SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_class_wxNotifyEvent","_wxNotifyEvent",0);
-        SWIG_RegisterMapping("_class_wxPyEvent","_wxPyEvent",0);
-        SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
-        SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
-        SWIG_RegisterMapping("_class_wxToolBar","_wxToolBar",0);
-        SWIG_RegisterMapping("_class_wxStaticLine","_wxStaticLine",0);
-        SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0);
-        SWIG_RegisterMapping("_EBool","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_EBool","_signed_int",0);
-        SWIG_RegisterMapping("_EBool","_int",0);
-        SWIG_RegisterMapping("_EBool","_wxWindowID",0);
-        SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
-        SWIG_RegisterMapping("_class_wxDropFilesEvent","_wxDropFilesEvent",0);
-        SWIG_RegisterMapping("_wxStaticText","_class_wxStaticText",0);
-        SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
-        SWIG_RegisterMapping("_wxCloseEvent","_class_wxCloseEvent",0);
-        SWIG_RegisterMapping("_unsigned_long","_wxDash",0);
-        SWIG_RegisterMapping("_unsigned_long","_long",0);
-        SWIG_RegisterMapping("_class_wxRect","_wxRect",0);
-        SWIG_RegisterMapping("_class_wxDC","_wxDC",0);
-        SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxFocusEvent","_class_wxFocusEvent",0);
-        SWIG_RegisterMapping("_wxMaximizeEvent","_class_wxMaximizeEvent",0);
-        SWIG_RegisterMapping("_class_wxSpinButton","_wxSpinButton",0);
-        SWIG_RegisterMapping("_wxAcceleratorEntry","_class_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_class_wxPanel","_wxPanel",0);
-        SWIG_RegisterMapping("_class_wxCheckBox","_wxCheckBox",0);
-        SWIG_RegisterMapping("_wxComboBox","_class_wxComboBox",0);
-        SWIG_RegisterMapping("_wxRadioButton","_class_wxRadioButton",0);
-        SWIG_RegisterMapping("_signed_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_signed_int","_EBool",0);
-        SWIG_RegisterMapping("_signed_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_signed_int","_int",0);
-        SWIG_RegisterMapping("_class_wxTextCtrl","_wxTextCtrl",0);
-        SWIG_RegisterMapping("_wxLayoutConstraints","_class_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_wxMetaFileDC","_class_wxMetaFileDC",0);
-        SWIG_RegisterMapping("_wxMenu","_class_wxMenu",0);
-        SWIG_RegisterMapping("_class_wxMoveEvent","_wxMoveEvent",0);
-        SWIG_RegisterMapping("_wxListBox","_class_wxListBox",0);
-        SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0);
-        SWIG_RegisterMapping("_WXTYPE","_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_signed_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_unsigned_short",0);
-        SWIG_RegisterMapping("_class_wxBrush","_wxBrush",0);
-        SWIG_RegisterMapping("_unsigned_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_unsigned_short","_short",0);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxMiniFrame",SwigwxMiniFrameTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxMiniFrame",SwigwxMiniFrameTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxFrame",SwigwxFrameTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxFrame",SwigwxFrameTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxWindow",0);
-        SWIG_RegisterMapping("_class_wxStaticText","_wxStaticText",0);
-        SWIG_RegisterMapping("_class_wxFont","_wxFont",0);
-        SWIG_RegisterMapping("_class_wxCloseEvent","_wxCloseEvent",0);
-        SWIG_RegisterMapping("_class_wxMenuEvent","_wxMenuEvent",0);
-        SWIG_RegisterMapping("_wxClientDC","_class_wxClientDC",0);
-        SWIG_RegisterMapping("_wxMouseEvent","_class_wxMouseEvent",0);
-        SWIG_RegisterMapping("_class_wxPoint","_wxPoint",0);
-        SWIG_RegisterMapping("_wxRealPoint","_class_wxRealPoint",0);
-        SWIG_RegisterMapping("_class_wxRadioBox","_wxRadioBox",0);
-        SWIG_RegisterMapping("_signed_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_signed_short","_short",0);
-        SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0);
-        SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
-        SWIG_RegisterMapping("_class_wxWindowDC","_wxWindowDC",0);
-        SWIG_RegisterMapping("_class_wxFocusEvent","_wxFocusEvent",0);
-        SWIG_RegisterMapping("_class_wxMaximizeEvent","_wxMaximizeEvent",0);
-        SWIG_RegisterMapping("_wxStatusBar","_class_wxStatusBar",0);
-        SWIG_RegisterMapping("_class_wxToolBarTool","_wxToolBarTool",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
-        SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0);
-        SWIG_RegisterMapping("_unsigned_char","_byte",0);
-        SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0);
-        SWIG_RegisterMapping("_class_wxMenu","_wxMenu",0);
-        SWIG_RegisterMapping("_wxControl","_class_wxControl",0);
-        SWIG_RegisterMapping("_class_wxListBox","_wxListBox",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_unsigned_int","_size_t",0);
-        SWIG_RegisterMapping("_unsigned_int","_uint",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_unsigned_int","_int",0);
-        SWIG_RegisterMapping("_wxIcon","_class_wxIcon",0);
-        SWIG_RegisterMapping("_wxDialog","_class_wxDialog",0);
-        SWIG_RegisterMapping("_class_wxPen","_wxPen",0);
-        SWIG_RegisterMapping("_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_short","_unsigned_short",0);
-        SWIG_RegisterMapping("_short","_signed_short",0);
-        SWIG_RegisterMapping("_class_wxStaticBox","_wxStaticBox",0);
-        SWIG_RegisterMapping("_class_wxScrollEvent","_wxScrollEvent",0);
-        SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0);
-        SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
-        SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);
-        SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0);
-        SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
-        SWIG_RegisterMapping("_wxFrame","_class_wxMiniFrame",SwigwxMiniFrameTowxFrame);
-        SWIG_RegisterMapping("_wxFrame","_wxMiniFrame",SwigwxMiniFrameTowxFrame);
-        SWIG_RegisterMapping("_wxFrame","_class_wxFrame",0);
-        SWIG_RegisterMapping("_wxWindowID","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_wxWindowID","_size_t",0);
-        SWIG_RegisterMapping("_wxWindowID","_EBool",0);
-        SWIG_RegisterMapping("_wxWindowID","_uint",0);
-        SWIG_RegisterMapping("_wxWindowID","_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_signed_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_int","_size_t",0);
-        SWIG_RegisterMapping("_int","_EBool",0);
-        SWIG_RegisterMapping("_int","_uint",0);
-        SWIG_RegisterMapping("_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_int","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_signed_int",0);
-        SWIG_RegisterMapping("_class_wxMouseEvent","_wxMouseEvent",0);
-        SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0);
-        SWIG_RegisterMapping("_wxButton","_class_wxButton",0);
-        SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
-        SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
-        SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
-        SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
-        SWIG_RegisterMapping("_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0);
-        SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0);
-        SWIG_RegisterMapping("_class_wxComboBox","_wxComboBox",0);
-        SWIG_RegisterMapping("_class_wxRadioButton","_wxRadioButton",0);
-        SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_wxIconizeEvent","_class_wxIconizeEvent",0);
-        SWIG_RegisterMapping("_class_wxControl","_wxControl",0);
-        SWIG_RegisterMapping("_wxStaticBitmap","_class_wxStaticBitmap",0);
-        SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
-        SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
-        SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
-        SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
-        SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0);
-        SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
-        SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
-        SWIG_RegisterMapping("_class_wxMiniFrame","_wxMiniFrame",0);
-        SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
-        SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
-        SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
-        SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0);
-        SWIG_RegisterMapping("_class_wxCheckListBox","_wxCheckListBox",0);
-        SWIG_RegisterMapping("_class_wxCommandEvent","_wxCommandEvent",0);
-        SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
-        SWIG_RegisterMapping("_class_wxSizeEvent","_wxSizeEvent",0);
-        SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
-        SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0);
-        SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0);
-        SWIG_RegisterMapping("_wxMenuBar","_class_wxMenuBar",0);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxMiniFrame",SwigwxMiniFrameTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxMiniFrame",SwigwxMiniFrameTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxFrame",SwigwxFrameTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxFrame",SwigwxFrameTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxEvtHandler",0);
-        SWIG_RegisterMapping("_wxMenuItem","_class_wxMenuItem",0);
-        SWIG_RegisterMapping("_class_wxScrollBar","_wxScrollBar",0);
-        SWIG_RegisterMapping("_wxDash","_unsigned_long",0);
-        SWIG_RegisterMapping("_wxDash","_long",0);
-        SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
-        SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0);
-        SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0);
-        SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
-        SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0);
-        SWIG_RegisterMapping("_wxWindow","_class_wxMiniFrame",SwigwxMiniFrameTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxMiniFrame",SwigwxMiniFrameTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxFrame",SwigwxFrameTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxFrame",SwigwxFrameTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxWindow",0);
-        SWIG_RegisterMapping("_class_wxFrame","_class_wxMiniFrame",SwigwxMiniFrameTowxFrame);
-        SWIG_RegisterMapping("_class_wxFrame","_wxMiniFrame",SwigwxMiniFrameTowxFrame);
-        SWIG_RegisterMapping("_class_wxFrame","_wxFrame",0);
+{
+   int i;
+   for (i = 0; _swig_mapping[i].n1; i++)
+        SWIG_RegisterMapping(_swig_mapping[i].n1,_swig_mapping[i].n2,_swig_mapping[i].pcnv);
+}

 }
 }

diff --git a/utils/wxPython/src/msw/frames.py b/utils/wxPython/src/msw/frames.py
index e03413e7997fc845d57d3038af9580f4852959e3..5a7e4fca36b3b4f544928923f5b149a62964b48c 100644 (file)
--- a/utils/wxPython/src/msw/frames.py
+++ b/utils/wxPython/src/msw/frames.py
@@ -17,79 +17,73 @@ class wxFramePtr(wxWindowPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def Centre(self,*args):
-        val = apply(framesc.wxFrame_Centre,(self.this,)+args)
+    def Centre(self, *_args, **_kwargs):
+        val = apply(framesc.wxFrame_Centre,(self,) + _args, _kwargs)

         return val
         return val

-    def Command(self,arg0):
-        val = framesc.wxFrame_Command(self.this,arg0)
+    def Command(self, *_args, **_kwargs):
+        val = apply(framesc.wxFrame_Command,(self,) + _args, _kwargs)

         return val
         return val

-    def CreateStatusBar(self,*args):
-        val = apply(framesc.wxFrame_CreateStatusBar,(self.this,)+args)
-        val = wxStatusBarPtr(val)
+    def CreateStatusBar(self, *_args, **_kwargs):
+        val = apply(framesc.wxFrame_CreateStatusBar,(self,) + _args, _kwargs)
+        if val: val = wxStatusBarPtr(val) 

         return val
         return val

-    def CreateToolBar(self,*args):
-        val = apply(framesc.wxFrame_CreateToolBar,(self.this,)+args)
-        val = wxToolBarPtr(val)
+    def CreateToolBar(self, *_args, **_kwargs):
+        val = apply(framesc.wxFrame_CreateToolBar,(self,) + _args, _kwargs)
+        if val: val = wxToolBarPtr(val) 

         return val
         return val

-    def GetMenuBar(self):
-        val = framesc.wxFrame_GetMenuBar(self.this)
-        val = wxMenuBarPtr(val)
+    def GetMenuBar(self, *_args, **_kwargs):
+        val = apply(framesc.wxFrame_GetMenuBar,(self,) + _args, _kwargs)
+        if val: val = wxMenuBarPtr(val) 

         return val
         return val

-    def GetStatusBar(self):
-        val = framesc.wxFrame_GetStatusBar(self.this)
-        val = wxStatusBarPtr(val)
+    def GetStatusBar(self, *_args, **_kwargs):
+        val = apply(framesc.wxFrame_GetStatusBar,(self,) + _args, _kwargs)
+        if val: val = wxStatusBarPtr(val) 

         return val
         return val

-    def GetTitle(self):
-        val = framesc.wxFrame_GetTitle(self.this)
+    def GetTitle(self, *_args, **_kwargs):
+        val = apply(framesc.wxFrame_GetTitle,(self,) + _args, _kwargs)

         return val
         return val

-    def GetToolBar(self):
-        val = framesc.wxFrame_GetToolBar(self.this)
-        val = wxToolBarPtr(val)
+    def GetToolBar(self, *_args, **_kwargs):
+        val = apply(framesc.wxFrame_GetToolBar,(self,) + _args, _kwargs)
+        if val: val = wxToolBarPtr(val) 

         return val
         return val

-    def Iconize(self,arg0):
-        val = framesc.wxFrame_Iconize(self.this,arg0)
+    def Iconize(self, *_args, **_kwargs):
+        val = apply(framesc.wxFrame_Iconize,(self,) + _args, _kwargs)

         return val
         return val

-    def IsIconized(self):
-        val = framesc.wxFrame_IsIconized(self.this)
+    def IsIconized(self, *_args, **_kwargs):
+        val = apply(framesc.wxFrame_IsIconized,(self,) + _args, _kwargs)

         return val
         return val

-    def Maximize(self,arg0):
-        val = framesc.wxFrame_Maximize(self.this,arg0)
+    def Maximize(self, *_args, **_kwargs):
+        val = apply(framesc.wxFrame_Maximize,(self,) + _args, _kwargs)

         return val
         return val

-    def SetAcceleratorTable(self,arg0):
-        val = framesc.wxFrame_SetAcceleratorTable(self.this,arg0.this)
+    def SetAcceleratorTable(self, *_args, **_kwargs):
+        val = apply(framesc.wxFrame_SetAcceleratorTable,(self,) + _args, _kwargs)

         return val
         return val

-    def SetIcon(self,arg0):
-        val = framesc.wxFrame_SetIcon(self.this,arg0.this)
+    def SetIcon(self, *_args, **_kwargs):
+        val = apply(framesc.wxFrame_SetIcon,(self,) + _args, _kwargs)

         return val
         return val

-    def SetMenuBar(self,arg0):
-        val = framesc.wxFrame_SetMenuBar(self.this,arg0.this)
+    def SetMenuBar(self, *_args, **_kwargs):
+        val = apply(framesc.wxFrame_SetMenuBar,(self,) + _args, _kwargs)

         return val
         return val

-    def SetStatusBar(self,arg0):
-        val = framesc.wxFrame_SetStatusBar(self.this,arg0.this)
+    def SetStatusBar(self, *_args, **_kwargs):
+        val = apply(framesc.wxFrame_SetStatusBar,(self,) + _args, _kwargs)

         return val
         return val

-    def SetStatusText(self,arg0,*args):
-        val = apply(framesc.wxFrame_SetStatusText,(self.this,arg0,)+args)
+    def SetStatusText(self, *_args, **_kwargs):
+        val = apply(framesc.wxFrame_SetStatusText,(self,) + _args, _kwargs)

         return val
         return val

-    def SetStatusWidths(self,arg0,*args):
-        val = apply(framesc.wxFrame_SetStatusWidths,(self.this,arg0,)+args)
+    def SetStatusWidths(self, *_args, **_kwargs):
+        val = apply(framesc.wxFrame_SetStatusWidths,(self,) + _args, _kwargs)

         return val
         return val

-    def SetTitle(self,arg0):
-        val = framesc.wxFrame_SetTitle(self.this,arg0)
+    def SetTitle(self, *_args, **_kwargs):
+        val = apply(framesc.wxFrame_SetTitle,(self,) + _args, _kwargs)

         return val
         return val

-    def SetToolBar(self,arg0):
-        val = framesc.wxFrame_SetToolBar(self.this,arg0.this)
+    def SetToolBar(self, *_args, **_kwargs):
+        val = apply(framesc.wxFrame_SetToolBar,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxFrame instance>"
+        return "<C wxFrame instance at %s>" % (self.this,)

 class wxFrame(wxFramePtr):
 class wxFrame(wxFramePtr):

-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(framesc.new_wxFrame,(arg0.this,arg1,arg2,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(framesc.new_wxFrame,_args,_kwargs)

         self.thisown = 1
         wx._StdFrameCallbacks(self)
 
         self.thisown = 1
         wx._StdFrameCallbacks(self)
 


@@ -101,16 +95,10 @@ class wxMiniFramePtr(wxFramePtr):
         self.this = this
         self.thisown = 0
     def __repr__(self):
         self.this = this
         self.thisown = 0
     def __repr__(self):

-        return "<C wxMiniFrame instance>"
+        return "<C wxMiniFrame instance at %s>" % (self.this,)

 class wxMiniFrame(wxMiniFramePtr):
 class wxMiniFrame(wxMiniFramePtr):

-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(framesc.new_wxMiniFrame,(arg0.this,arg1,arg2,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(framesc.new_wxMiniFrame,_args,_kwargs)

         self.thisown = 1
         wx._StdFrameCallbacks(self)
 
         self.thisown = 1
         wx._StdFrameCallbacks(self)
 

diff --git a/utils/wxPython/src/msw/gdi.cpp b/utils/wxPython/src/msw/gdi.cpp
index b91e6382f4df24935b87c4532f27ed0afd10974e..df658b8553f676e699bc23b31c5e8c13d0cf932e 100644 (file)
--- a/utils/wxPython/src/msw/gdi.cpp
+++ b/utils/wxPython/src/msw/gdi.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)

- * Version 1.1 (Patch 5)
+ * Version 1.1 (Patch 6)

  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.


@@ -24,16 +24,16 @@
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)

-#      define SWIGEXPORT(a,b) __declspec(dllexport) a b
+#      define SWIGEXPORT(a) __declspec(dllexport) a

 #   else
 #      if defined(__BORLANDC__)
 #   else
 #      if defined(__BORLANDC__)

-#          define SWIGEXPORT(a,b) a _export b
+#          define SWIGEXPORT(a) a _export 

 #      else
 #      else

-#          define SWIGEXPORT(a,b) a b
+#          define SWIGEXPORT(a) a 

 #      endif
 #   endif
 #else
 #      endif
 #   endif
 #else

-#   define SWIGEXPORT(a,b) a b
+#   define SWIGEXPORT(a) a 

 #endif
 
 #ifdef __cplusplus
 #endif
 
 #ifdef __cplusplus


@@ -43,12 +43,12 @@ extern "C" {
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);

+extern char *SWIG_GetPtrObj(PyObject *, void **, char *);

 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif
 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif

-

 #define SWIG_init    initgdic
 
 #define SWIG_name    "gdic"
 #define SWIG_init    initgdic
 
 #define SWIG_name    "gdic"


@@ -62,12 +62,13 @@ extern PyObject *SWIG_newvarlink(void);
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;

-    if (!target) {
+    PyObject*   o3;
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);
         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);


@@ -84,23 +85,23 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
     PyObject*   o3;
 
     PyObject*   o2;
     PyObject*   o3;
 

-    if (!target) {
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }
         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }

-        o3 = PyTuple_New(1);
-        PyTuple_SetItem(o3, 0, o);
+        o3 = PyTuple_New(1);            
+        PyTuple_SetItem(o3, 0, o);      

 
         o2 = target;
 
         o2 = target;

-        target = PySequence_Concat(o2, o3);
-        Py_DECREF(o2);
+        target = PySequence_Concat(o2, o3); 
+        Py_DECREF(o2);                      

         Py_DECREF(o3);
     }
     return target;
         Py_DECREF(o3);
     }
     return target;


@@ -198,13 +199,16 @@ extern wxPalette  wxNullPalette;
 extern wxFont  wxNullFont; 
 extern wxColour  wxNullColour; 
 
 extern wxFont  wxNullFont; 
 extern wxColour  wxNullColour; 
 

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

 #endif
 static PyObject *_wrap_wxEmptyBitmap(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxBitmap * _result;
     int  _arg0;
     int  _arg1;
 #endif
 static PyObject *_wrap_wxEmptyBitmap(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxBitmap * _result;
     int  _arg0;
     int  _arg1;

-    int  _arg2 = -1;
+    int  _arg2 = (int ) -1;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;


@@ -215,8 +219,13 @@ static PyObject *_wrap_wxEmptyBitmap(PyObject *self, PyObject *args) {
         _result = (wxBitmap *)wxEmptyBitmap(_arg0,_arg1,_arg2);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxBitmap *)wxEmptyBitmap(_arg0,_arg1,_arg2);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -235,8 +244,13 @@ static PyObject *_wrap_wxNoRefBitmap(PyObject *self, PyObject *args) {
         _result = (wxBitmap *)wxNoRefBitmap(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxBitmap *)wxNoRefBitmap(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -247,7 +261,7 @@ static PyObject *_wrap_wxBitmapFromData(PyObject *self, PyObject *args) {
     long  _arg1;
     int  _arg2;
     int  _arg3;
     long  _arg1;
     int  _arg2;
     int  _arg3;

-    int  _arg4 = 1;
+    int  _arg4 = (int ) 1;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;


@@ -258,8 +272,13 @@ static PyObject *_wrap_wxBitmapFromData(PyObject *self, PyObject *args) {
         _result = (wxBitmap *)wxBitmapFromData(_arg0,_arg1,_arg2,_arg3,_arg4);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxBitmap *)wxBitmapFromData(_arg0,_arg1,_arg2,_arg3,_arg4);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -268,21 +287,23 @@ static PyObject *_wrap_wxMaskColour(PyObject *self, PyObject *args) {
     wxMask * _result;
     wxBitmap * _arg0;
     wxColour * _arg1;
     wxMask * _result;
     wxBitmap * _arg0;
     wxColour * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxMaskColour",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxMaskColour",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMaskColour. Expected _wxBitmap_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMaskColour. Expected _wxBitmap_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxColour_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMaskColour. Expected _wxColour_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMaskColour. Expected _wxColour_p.");
         return NULL;
         }


@@ -292,8 +313,13 @@ static PyObject *_wrap_wxMaskColour(PyObject *self, PyObject *args) {
         _result = (wxMask *)wxMaskColour(*_arg0,*_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxMask *)wxMaskColour(*_arg0,*_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMask_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMask_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -311,8 +337,13 @@ static PyObject *_wrap_wxStockCursor(PyObject *self, PyObject *args) {
         _result = (wxCursor *)wxPyStockCursor(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxCursor *)wxPyStockCursor(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxCursor_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxCursor_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -338,8 +369,13 @@ static PyObject *_wrap_wxNamedColour(PyObject *self, PyObject *args) {
         _result = (wxColour *)wxNamedColour(*_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxColour *)wxNamedColour(*_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     if (_obj0)
         delete _arg0;
 {
     if (_obj0)
         delete _arg0;


@@ -351,14 +387,15 @@ static PyObject *_wrap_wxMemoryDCFromDC(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMemoryDC * _result;
     wxDC * _arg0;
     PyObject * _resultobj;
     wxMemoryDC * _result;
     wxDC * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMemoryDCFromDC",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMemoryDCFromDC",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMemoryDCFromDC. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMemoryDCFromDC. Expected _wxDC_p.");
         return NULL;
         }


@@ -368,8 +405,13 @@ static PyObject *_wrap_wxMemoryDCFromDC(PyObject *self, PyObject *args) {
         _result = (wxMemoryDC *)wxMemoryDCFromDC(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxMemoryDC *)wxMemoryDCFromDC(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMemoryDC_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMemoryDC_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1027,8 +1069,13 @@ static PyObject *_wrap_new_wxBitmap(PyObject *self, PyObject *args) {
         _result = (wxBitmap *)new_wxBitmap(*_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxBitmap *)new_wxBitmap(*_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     if (_obj0)
         delete _arg0;
 {
     if (_obj0)
         delete _arg0;


@@ -1040,13 +1087,14 @@ static PyObject *_wrap_new_wxBitmap(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxBitmap(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxBitmap * _arg0;
 static PyObject *_wrap_delete_wxBitmap(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxBitmap * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:delete_wxBitmap",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxBitmap",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxBitmap. Expected _wxBitmap_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxBitmap. Expected _wxBitmap_p.");
         return NULL;
         }


@@ -1067,14 +1115,15 @@ static PyObject *_wrap_wxBitmap_Create(PyObject *self, PyObject *args) {
     wxBitmap * _arg0;
     int  _arg1;
     int  _arg2;
     wxBitmap * _arg0;
     int  _arg1;
     int  _arg2;

-    int  _arg3 = -1;
-    char * _argc0 = 0;
+    int  _arg3 = (int ) -1;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii|i:wxBitmap_Create",&_argc0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"Oii|i:wxBitmap_Create",&_argo0,&_arg1,&_arg2,&_arg3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_Create. Expected _wxBitmap_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_Create. Expected _wxBitmap_p.");
         return NULL;
         }


@@ -1094,13 +1143,14 @@ static PyObject *_wrap_wxBitmap_GetDepth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxBitmap * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxBitmap * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxBitmap_GetDepth",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxBitmap_GetDepth",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_GetDepth. Expected _wxBitmap_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_GetDepth. Expected _wxBitmap_p.");
         return NULL;
         }


@@ -1119,13 +1169,14 @@ static PyObject *_wrap_wxBitmap_GetHeight(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxBitmap * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxBitmap * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxBitmap_GetHeight",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxBitmap_GetHeight",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_GetHeight. Expected _wxBitmap_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_GetHeight. Expected _wxBitmap_p.");
         return NULL;
         }


@@ -1144,14 +1195,15 @@ static PyObject *_wrap_wxBitmap_GetPalette(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPalette * _result;
     wxBitmap * _arg0;
     PyObject * _resultobj;
     wxPalette * _result;
     wxBitmap * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxBitmap_GetPalette",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxBitmap_GetPalette",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_GetPalette. Expected _wxBitmap_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_GetPalette. Expected _wxBitmap_p.");
         return NULL;
         }


@@ -1161,8 +1213,13 @@ static PyObject *_wrap_wxBitmap_GetPalette(PyObject *self, PyObject *args) {
         _result = (wxPalette *)wxBitmap_GetPalette(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxPalette *)wxBitmap_GetPalette(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPalette_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPalette_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1171,14 +1228,15 @@ static PyObject *_wrap_wxBitmap_GetMask(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMask * _result;
     wxBitmap * _arg0;
     PyObject * _resultobj;
     wxMask * _result;
     wxBitmap * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxBitmap_GetMask",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxBitmap_GetMask",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_GetMask. Expected _wxBitmap_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_GetMask. Expected _wxBitmap_p.");
         return NULL;
         }


@@ -1188,8 +1246,13 @@ static PyObject *_wrap_wxBitmap_GetMask(PyObject *self, PyObject *args) {
         _result = (wxMask *)wxBitmap_GetMask(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxMask *)wxBitmap_GetMask(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMask_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMask_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1198,13 +1261,14 @@ static PyObject *_wrap_wxBitmap_GetWidth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxBitmap * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxBitmap * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxBitmap_GetWidth",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxBitmap_GetWidth",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_GetWidth. Expected _wxBitmap_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_GetWidth. Expected _wxBitmap_p.");
         return NULL;
         }


@@ -1225,14 +1289,15 @@ static PyObject *_wrap_wxBitmap_LoadFile(PyObject *self, PyObject *args) {
     wxBitmap * _arg0;
     wxString * _arg1;
     long  _arg2;
     wxBitmap * _arg0;
     wxString * _arg1;
     long  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sOl:wxBitmap_LoadFile",&_argc0,&_obj1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"OOl:wxBitmap_LoadFile",&_argo0,&_obj1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_LoadFile. Expected _wxBitmap_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_LoadFile. Expected _wxBitmap_p.");
         return NULL;
         }


@@ -1262,13 +1327,14 @@ static PyObject *_wrap_wxBitmap_Ok(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxBitmap * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxBitmap * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxBitmap_Ok",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxBitmap_Ok",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_Ok. Expected _wxBitmap_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_Ok. Expected _wxBitmap_p.");
         return NULL;
         }


@@ -1289,16 +1355,17 @@ static PyObject *_wrap_wxBitmap_SaveFile(PyObject *self, PyObject *args) {
     wxBitmap * _arg0;
     wxString * _arg1;
     int  _arg2;
     wxBitmap * _arg0;
     wxString * _arg1;
     int  _arg2;

-    wxPalette * _arg3 = NULL;
-    char * _argc0 = 0;
+    wxPalette * _arg3 = (wxPalette *) NULL;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
     PyObject * _obj1 = 0;

-    char * _argc3 = 0;
+    PyObject * _argo3 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sOi|s:wxBitmap_SaveFile",&_argc0,&_obj1,&_arg2,&_argc3)) 
+    if(!PyArg_ParseTuple(args,"OOi|O:wxBitmap_SaveFile",&_argo0,&_obj1,&_arg2,&_argo3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_SaveFile. Expected _wxBitmap_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_SaveFile. Expected _wxBitmap_p.");
         return NULL;
         }


@@ -1310,8 +1377,9 @@ static PyObject *_wrap_wxBitmap_SaveFile(PyObject *self, PyObject *args) {
     }
     _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }
     }
     _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxPalette_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPalette_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxBitmap_SaveFile. Expected _wxPalette_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxBitmap_SaveFile. Expected _wxPalette_p.");
         return NULL;
         }


@@ -1334,13 +1402,14 @@ static PyObject *_wrap_wxBitmap_SetDepth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxBitmap * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxBitmap * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxBitmap_SetDepth",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxBitmap_SetDepth",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_SetDepth. Expected _wxBitmap_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_SetDepth. Expected _wxBitmap_p.");
         return NULL;
         }


@@ -1360,13 +1429,14 @@ static PyObject *_wrap_wxBitmap_SetHeight(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxBitmap * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxBitmap * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxBitmap_SetHeight",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxBitmap_SetHeight",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_SetHeight. Expected _wxBitmap_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_SetHeight. Expected _wxBitmap_p.");
         return NULL;
         }


@@ -1386,20 +1456,22 @@ static PyObject *_wrap_wxBitmap_SetMask(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxBitmap * _arg0;
     wxMask * _arg1;
     PyObject * _resultobj;
     wxBitmap * _arg0;
     wxMask * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxBitmap_SetMask",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxBitmap_SetMask",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_SetMask. Expected _wxBitmap_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_SetMask. Expected _wxBitmap_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxMask_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxMask_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxBitmap_SetMask. Expected _wxMask_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxBitmap_SetMask. Expected _wxMask_p.");
         return NULL;
         }


@@ -1419,20 +1491,22 @@ static PyObject *_wrap_wxBitmap_SetPalette(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxBitmap * _arg0;
     wxPalette * _arg1;
     PyObject * _resultobj;
     wxBitmap * _arg0;
     wxPalette * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxBitmap_SetPalette",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxBitmap_SetPalette",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_SetPalette. Expected _wxBitmap_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_SetPalette. Expected _wxBitmap_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPalette_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPalette_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxBitmap_SetPalette. Expected _wxPalette_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxBitmap_SetPalette. Expected _wxPalette_p.");
         return NULL;
         }


@@ -1452,13 +1526,14 @@ static PyObject *_wrap_wxBitmap_SetWidth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxBitmap * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxBitmap * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxBitmap_SetWidth",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxBitmap_SetWidth",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_SetWidth. Expected _wxBitmap_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_SetWidth. Expected _wxBitmap_p.");
         return NULL;
         }


@@ -1478,14 +1553,15 @@ static PyObject *_wrap_new_wxMask(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMask * _result;
     wxBitmap * _arg0;
     PyObject * _resultobj;
     wxMask * _result;
     wxBitmap * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:new_wxMask",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:new_wxMask",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxMask. Expected _wxBitmap_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxMask. Expected _wxBitmap_p.");
         return NULL;
         }


@@ -1495,8 +1571,13 @@ static PyObject *_wrap_new_wxMask(PyObject *self, PyObject *args) {
         _result = (wxMask *)new_wxMask(*_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxMask *)new_wxMask(*_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMask_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMask_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1504,13 +1585,14 @@ static PyObject *_wrap_new_wxMask(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxMask(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMask * _arg0;
 static PyObject *_wrap_delete_wxMask(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMask * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:delete_wxMask",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxMask",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMask_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMask_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxMask. Expected _wxMask_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxMask. Expected _wxMask_p.");
         return NULL;
         }


@@ -1539,8 +1621,8 @@ static PyObject *_wrap_new_wxIcon(PyObject *self, PyObject *args) {
     wxIcon * _result;
     wxString * _arg0;
     long  _arg1;
     wxIcon * _result;
     wxString * _arg0;
     long  _arg1;

-    int  _arg2 = -1;
-    int  _arg3 = -1;
+    int  _arg2 = (int ) -1;
+    int  _arg3 = (int ) -1;

     PyObject * _obj0 = 0;
     char _ptemp[128];
 
     PyObject * _obj0 = 0;
     char _ptemp[128];
 


@@ -1559,8 +1641,13 @@ static PyObject *_wrap_new_wxIcon(PyObject *self, PyObject *args) {
         _result = (wxIcon *)new_wxIcon(*_arg0,_arg1,_arg2,_arg3);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxIcon *)new_wxIcon(*_arg0,_arg1,_arg2,_arg3);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxIcon_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxIcon_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     if (_obj0)
         delete _arg0;
 {
     if (_obj0)
         delete _arg0;


@@ -1572,13 +1659,14 @@ static PyObject *_wrap_new_wxIcon(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxIcon(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxIcon * _arg0;
 static PyObject *_wrap_delete_wxIcon(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxIcon * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:delete_wxIcon",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxIcon",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIcon_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIcon_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxIcon. Expected _wxIcon_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxIcon. Expected _wxIcon_p.");
         return NULL;
         }


@@ -1598,13 +1686,14 @@ static PyObject *_wrap_wxIcon_GetDepth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxIcon * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxIcon * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxIcon_GetDepth",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxIcon_GetDepth",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIcon_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIcon_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_GetDepth. Expected _wxIcon_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_GetDepth. Expected _wxIcon_p.");
         return NULL;
         }


@@ -1623,13 +1712,14 @@ static PyObject *_wrap_wxIcon_GetHeight(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxIcon * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxIcon * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxIcon_GetHeight",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxIcon_GetHeight",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIcon_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIcon_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_GetHeight. Expected _wxIcon_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_GetHeight. Expected _wxIcon_p.");
         return NULL;
         }


@@ -1648,13 +1738,14 @@ static PyObject *_wrap_wxIcon_GetWidth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxIcon * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxIcon * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxIcon_GetWidth",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxIcon_GetWidth",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIcon_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIcon_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_GetWidth. Expected _wxIcon_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_GetWidth. Expected _wxIcon_p.");
         return NULL;
         }


@@ -1675,14 +1766,15 @@ static PyObject *_wrap_wxIcon_LoadFile(PyObject *self, PyObject *args) {
     wxIcon * _arg0;
     wxString * _arg1;
     long  _arg2;
     wxIcon * _arg0;
     wxString * _arg1;
     long  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sOl:wxIcon_LoadFile",&_argc0,&_obj1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"OOl:wxIcon_LoadFile",&_argo0,&_obj1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIcon_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIcon_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_LoadFile. Expected _wxIcon_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_LoadFile. Expected _wxIcon_p.");
         return NULL;
         }


@@ -1712,13 +1804,14 @@ static PyObject *_wrap_wxIcon_Ok(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxIcon * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxIcon * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxIcon_Ok",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxIcon_Ok",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIcon_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIcon_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_Ok. Expected _wxIcon_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_Ok. Expected _wxIcon_p.");
         return NULL;
         }


@@ -1737,13 +1830,14 @@ static PyObject *_wrap_wxIcon_SetDepth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxIcon * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxIcon * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxIcon_SetDepth",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxIcon_SetDepth",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIcon_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIcon_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_SetDepth. Expected _wxIcon_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_SetDepth. Expected _wxIcon_p.");
         return NULL;
         }


@@ -1763,13 +1857,14 @@ static PyObject *_wrap_wxIcon_SetHeight(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxIcon * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxIcon * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxIcon_SetHeight",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxIcon_SetHeight",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIcon_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIcon_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_SetHeight. Expected _wxIcon_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_SetHeight. Expected _wxIcon_p.");
         return NULL;
         }


@@ -1789,13 +1884,14 @@ static PyObject *_wrap_wxIcon_SetWidth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxIcon * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxIcon * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxIcon_SetWidth",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxIcon_SetWidth",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIcon_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIcon_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_SetWidth. Expected _wxIcon_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_SetWidth. Expected _wxIcon_p.");
         return NULL;
         }


@@ -1824,8 +1920,8 @@ static PyObject *_wrap_new_wxCursor(PyObject *self, PyObject *args) {
     wxCursor * _result;
     wxString * _arg0;
     long  _arg1;
     wxCursor * _result;
     wxString * _arg0;
     long  _arg1;

-    int  _arg2 = 0;
-    int  _arg3 = 0;
+    int  _arg2 = (int ) 0;
+    int  _arg3 = (int ) 0;

     PyObject * _obj0 = 0;
     char _ptemp[128];
 
     PyObject * _obj0 = 0;
     char _ptemp[128];
 


@@ -1844,8 +1940,13 @@ static PyObject *_wrap_new_wxCursor(PyObject *self, PyObject *args) {
         _result = (wxCursor *)new_wxCursor(*_arg0,_arg1,_arg2,_arg3);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxCursor *)new_wxCursor(*_arg0,_arg1,_arg2,_arg3);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxCursor_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxCursor_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     if (_obj0)
         delete _arg0;
 {
     if (_obj0)
         delete _arg0;


@@ -1857,13 +1958,14 @@ static PyObject *_wrap_new_wxCursor(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxCursor(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxCursor * _arg0;
 static PyObject *_wrap_delete_wxCursor(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxCursor * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:delete_wxCursor",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxCursor",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCursor_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCursor_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxCursor. Expected _wxCursor_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxCursor. Expected _wxCursor_p.");
         return NULL;
         }


@@ -1883,13 +1985,14 @@ static PyObject *_wrap_wxCursor_Ok(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxCursor * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxCursor * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxCursor_Ok",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxCursor_Ok",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCursor_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCursor_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCursor_Ok. Expected _wxCursor_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCursor_Ok. Expected _wxCursor_p.");
         return NULL;
         }


@@ -1916,8 +2019,8 @@ static PyObject *_wrap_new_wxFont(PyObject *self, PyObject *args) {
     int  _arg1;
     int  _arg2;
     int  _arg3;
     int  _arg1;
     int  _arg2;
     int  _arg3;

-    int  _arg4 = (0);
-    char * _arg5 = "";
+    int  _arg4 = (int ) FALSE;
+    char * _arg5 = (char *) "";

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;


@@ -1928,8 +2031,13 @@ static PyObject *_wrap_new_wxFont(PyObject *self, PyObject *args) {
         _result = (wxFont *)new_wxFont(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxFont *)new_wxFont(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1938,13 +2046,14 @@ static PyObject *_wrap_wxFont_GetFaceName(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxFont * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxFont * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxFont_GetFaceName",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxFont_GetFaceName",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFont_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFont_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_GetFaceName. Expected _wxFont_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_GetFaceName. Expected _wxFont_p.");
         return NULL;
         }


@@ -1968,13 +2077,14 @@ static PyObject *_wrap_wxFont_GetFamily(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxFont * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxFont * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxFont_GetFamily",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxFont_GetFamily",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFont_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFont_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_GetFamily. Expected _wxFont_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_GetFamily. Expected _wxFont_p.");
         return NULL;
         }


@@ -1993,13 +2103,14 @@ static PyObject *_wrap_wxFont_GetFontId(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxFont * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxFont * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxFont_GetFontId",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxFont_GetFontId",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFont_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFont_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_GetFontId. Expected _wxFont_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_GetFontId. Expected _wxFont_p.");
         return NULL;
         }


@@ -2018,13 +2129,14 @@ static PyObject *_wrap_wxFont_GetPointSize(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxFont * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxFont * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxFont_GetPointSize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxFont_GetPointSize",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFont_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFont_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_GetPointSize. Expected _wxFont_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_GetPointSize. Expected _wxFont_p.");
         return NULL;
         }


@@ -2043,13 +2155,14 @@ static PyObject *_wrap_wxFont_GetStyle(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxFont * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxFont * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxFont_GetStyle",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxFont_GetStyle",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFont_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFont_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_GetStyle. Expected _wxFont_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_GetStyle. Expected _wxFont_p.");
         return NULL;
         }


@@ -2068,13 +2181,14 @@ static PyObject *_wrap_wxFont_GetUnderlined(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxFont * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxFont * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxFont_GetUnderlined",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxFont_GetUnderlined",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFont_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFont_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_GetUnderlined. Expected _wxFont_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_GetUnderlined. Expected _wxFont_p.");
         return NULL;
         }


@@ -2093,13 +2207,14 @@ static PyObject *_wrap_wxFont_GetWeight(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxFont * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxFont * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxFont_GetWeight",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxFont_GetWeight",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFont_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFont_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_GetWeight. Expected _wxFont_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_GetWeight. Expected _wxFont_p.");
         return NULL;
         }


@@ -2118,14 +2233,15 @@ static PyObject *_wrap_wxFont_SetFaceName(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFont * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxFont * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxFont_SetFaceName",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxFont_SetFaceName",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFont_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFont_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_SetFaceName. Expected _wxFont_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_SetFaceName. Expected _wxFont_p.");
         return NULL;
         }


@@ -2156,13 +2272,14 @@ static PyObject *_wrap_wxFont_SetFamily(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFont * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxFont * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxFont_SetFamily",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxFont_SetFamily",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFont_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFont_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_SetFamily. Expected _wxFont_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_SetFamily. Expected _wxFont_p.");
         return NULL;
         }


@@ -2182,13 +2299,14 @@ static PyObject *_wrap_wxFont_SetPointSize(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFont * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxFont * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxFont_SetPointSize",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxFont_SetPointSize",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFont_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFont_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_SetPointSize. Expected _wxFont_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_SetPointSize. Expected _wxFont_p.");
         return NULL;
         }


@@ -2208,13 +2326,14 @@ static PyObject *_wrap_wxFont_SetStyle(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFont * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxFont * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxFont_SetStyle",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxFont_SetStyle",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFont_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFont_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_SetStyle. Expected _wxFont_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_SetStyle. Expected _wxFont_p.");
         return NULL;
         }


@@ -2234,14 +2353,15 @@ static PyObject *_wrap_wxFont_SetUnderlined(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFont * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxFont * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxFont_SetUnderlined",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxFont_SetUnderlined",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFont_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFont_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_SetUnderlined. Expected _wxFont_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_SetUnderlined. Expected _wxFont_p.");
         return NULL;
         }


@@ -2262,13 +2382,14 @@ static PyObject *_wrap_wxFont_SetWeight(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFont * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxFont * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxFont_SetWeight",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxFont_SetWeight",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFont_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFont_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_SetWeight. Expected _wxFont_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_SetWeight. Expected _wxFont_p.");
         return NULL;
         }


@@ -2287,9 +2408,9 @@ static PyObject *_wrap_wxFont_SetWeight(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_wxColour(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxColour * _result;
 static PyObject *_wrap_new_wxColour(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxColour * _result;

-    unsigned char  _arg0 = 0;
-    unsigned char  _arg1 = 0;
-    unsigned char  _arg2 = 0;
+    unsigned char  _arg0 = (unsigned char ) 0;
+    unsigned char  _arg1 = (unsigned char ) 0;
+    unsigned char  _arg2 = (unsigned char ) 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;


@@ -2300,8 +2421,13 @@ static PyObject *_wrap_new_wxColour(PyObject *self, PyObject *args) {
         _result = (wxColour *)new_wxColour(_arg0,_arg1,_arg2);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxColour *)new_wxColour(_arg0,_arg1,_arg2);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -2309,13 +2435,14 @@ static PyObject *_wrap_new_wxColour(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxColour(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxColour * _arg0;
 static PyObject *_wrap_delete_wxColour(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxColour * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:delete_wxColour",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxColour",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColour_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxColour. Expected _wxColour_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxColour. Expected _wxColour_p.");
         return NULL;
         }


@@ -2335,13 +2462,14 @@ static PyObject *_wrap_wxColour_Red(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     unsigned char  _result;
     wxColour * _arg0;
     PyObject * _resultobj;
     unsigned char  _result;
     wxColour * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxColour_Red",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxColour_Red",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColour_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColour_Red. Expected _wxColour_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColour_Red. Expected _wxColour_p.");
         return NULL;
         }


@@ -2360,13 +2488,14 @@ static PyObject *_wrap_wxColour_Green(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     unsigned char  _result;
     wxColour * _arg0;
     PyObject * _resultobj;
     unsigned char  _result;
     wxColour * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxColour_Green",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxColour_Green",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColour_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColour_Green. Expected _wxColour_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColour_Green. Expected _wxColour_p.");
         return NULL;
         }


@@ -2385,13 +2514,14 @@ static PyObject *_wrap_wxColour_Blue(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     unsigned char  _result;
     wxColour * _arg0;
     PyObject * _resultobj;
     unsigned char  _result;
     wxColour * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxColour_Blue",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxColour_Blue",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColour_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColour_Blue. Expected _wxColour_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColour_Blue. Expected _wxColour_p.");
         return NULL;
         }


@@ -2410,13 +2540,14 @@ static PyObject *_wrap_wxColour_Ok(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxColour * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxColour * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxColour_Ok",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxColour_Ok",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColour_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColour_Ok. Expected _wxColour_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColour_Ok. Expected _wxColour_p.");
         return NULL;
         }


@@ -2437,13 +2568,14 @@ static PyObject *_wrap_wxColour_Set(PyObject *self, PyObject *args) {
     unsigned char  _arg1;
     unsigned char  _arg2;
     unsigned char  _arg3;
     unsigned char  _arg1;
     unsigned char  _arg2;
     unsigned char  _arg3;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sbbb:wxColour_Set",&_argc0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"Obbb:wxColour_Set",&_argo0,&_arg1,&_arg2,&_arg3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColour_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColour_Set. Expected _wxColour_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColour_Set. Expected _wxColour_p.");
         return NULL;
         }


@@ -2469,13 +2601,14 @@ static PyObject *_wrap_wxColour_Get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     PyObject * _result;
     wxColour * _arg0;
     PyObject * _resultobj;
     PyObject * _result;
     wxColour * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxColour_Get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxColour_Get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColour_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColour_Get. Expected _wxColour_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColour_Get. Expected _wxColour_p.");
         return NULL;
         }


@@ -2499,16 +2632,17 @@ static PyObject *_wrap_new_wxPen(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPen * _result;
     wxColour * _arg0;
     PyObject * _resultobj;
     wxPen * _result;
     wxColour * _arg0;

-    int  _arg1 = 1;
-    int  _arg2 = (wxSOLID);
-    char * _argc0 = 0;
+    int  _arg1 = (int ) 1;
+    int  _arg2 = (int ) wxSOLID;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|ii:new_wxPen",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"O|ii:new_wxPen",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColour_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPen. Expected _wxColour_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPen. Expected _wxColour_p.");
         return NULL;
         }


@@ -2518,8 +2652,13 @@ static PyObject *_wrap_new_wxPen(PyObject *self, PyObject *args) {
         _result = (wxPen *)new_wxPen(_arg0,_arg1,_arg2);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxPen *)new_wxPen(_arg0,_arg1,_arg2);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPen_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPen_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -2528,13 +2667,14 @@ static PyObject *_wrap_wxPen_GetCap(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxPen * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxPen * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPen_GetCap",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPen_GetCap",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPen_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_GetCap. Expected _wxPen_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_GetCap. Expected _wxPen_p.");
         return NULL;
         }


@@ -2553,14 +2693,15 @@ static PyObject *_wrap_wxPen_GetColour(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxColour * _result;
     wxPen * _arg0;
     PyObject * _resultobj;
     wxColour * _result;
     wxPen * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPen_GetColour",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPen_GetColour",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPen_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_GetColour. Expected _wxPen_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_GetColour. Expected _wxPen_p.");
         return NULL;
         }


@@ -2571,8 +2712,13 @@ static PyObject *_wrap_wxPen_GetColour(PyObject *self, PyObject *args) {
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -2581,13 +2727,14 @@ static PyObject *_wrap_wxPen_GetJoin(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxPen * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxPen * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPen_GetJoin",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPen_GetJoin",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPen_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_GetJoin. Expected _wxPen_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_GetJoin. Expected _wxPen_p.");
         return NULL;
         }


@@ -2606,13 +2753,14 @@ static PyObject *_wrap_wxPen_GetStyle(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxPen * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxPen * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPen_GetStyle",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPen_GetStyle",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPen_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_GetStyle. Expected _wxPen_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_GetStyle. Expected _wxPen_p.");
         return NULL;
         }


@@ -2631,13 +2779,14 @@ static PyObject *_wrap_wxPen_GetWidth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxPen * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxPen * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPen_GetWidth",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPen_GetWidth",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPen_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_GetWidth. Expected _wxPen_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_GetWidth. Expected _wxPen_p.");
         return NULL;
         }


@@ -2656,13 +2805,14 @@ static PyObject *_wrap_wxPen_Ok(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxPen * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxPen * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPen_Ok",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPen_Ok",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPen_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_Ok. Expected _wxPen_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_Ok. Expected _wxPen_p.");
         return NULL;
         }


@@ -2681,13 +2831,14 @@ static PyObject *_wrap_wxPen_SetCap(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPen * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxPen * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPen_SetCap",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPen_SetCap",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPen_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetCap. Expected _wxPen_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetCap. Expected _wxPen_p.");
         return NULL;
         }


@@ -2707,20 +2858,22 @@ static PyObject *_wrap_wxPen_SetColour(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPen * _arg0;
     wxColour * _arg1;
     PyObject * _resultobj;
     wxPen * _arg0;
     wxColour * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxPen_SetColour",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxPen_SetColour",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPen_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetColour. Expected _wxPen_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetColour. Expected _wxPen_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxColour_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPen_SetColour. Expected _wxColour_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPen_SetColour. Expected _wxColour_p.");
         return NULL;
         }


@@ -2740,13 +2893,14 @@ static PyObject *_wrap_wxPen_SetJoin(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPen * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxPen * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPen_SetJoin",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPen_SetJoin",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPen_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetJoin. Expected _wxPen_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetJoin. Expected _wxPen_p.");
         return NULL;
         }


@@ -2766,13 +2920,14 @@ static PyObject *_wrap_wxPen_SetStyle(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPen * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxPen * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPen_SetStyle",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPen_SetStyle",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPen_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetStyle. Expected _wxPen_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetStyle. Expected _wxPen_p.");
         return NULL;
         }


@@ -2792,13 +2947,14 @@ static PyObject *_wrap_wxPen_SetWidth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPen * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxPen * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPen_SetWidth",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPen_SetWidth",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPen_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetWidth. Expected _wxPen_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetWidth. Expected _wxPen_p.");
         return NULL;
         }


@@ -2819,20 +2975,22 @@ static PyObject *_wrap_wxPen_GetDashes(PyObject *self, PyObject *args) {
     int  _result;
     wxPen * _arg0;
     wxDash ** _arg1;
     int  _result;
     wxPen * _arg0;
     wxDash ** _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxPen_GetDashes",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxPen_GetDashes",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPen_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_GetDashes. Expected _wxPen_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_GetDashes. Expected _wxPen_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxDash_pp")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxDash_pp")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPen_GetDashes. Expected _wxDash_pp.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPen_GetDashes. Expected _wxDash_pp.");
         return NULL;
         }


@@ -2851,14 +3009,15 @@ static PyObject *_wrap_wxPen_GetStipple(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxBitmap * _result;
     wxPen * _arg0;
     PyObject * _resultobj;
     wxBitmap * _result;
     wxPen * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPen_GetStipple",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPen_GetStipple",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPen_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_GetStipple. Expected _wxPen_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_GetStipple. Expected _wxPen_p.");
         return NULL;
         }


@@ -2868,8 +3027,13 @@ static PyObject *_wrap_wxPen_GetStipple(PyObject *self, PyObject *args) {
         _result = (wxBitmap *)wxPen_GetStipple(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxBitmap *)wxPen_GetStipple(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -2879,14 +3043,15 @@ static PyObject *_wrap_wxPen_SetDashes(PyObject *self, PyObject *args) {
     wxPen * _arg0;
     int  _arg1;
     wxDash * _arg2;
     wxPen * _arg0;
     int  _arg1;
     wxDash * _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
 
     self = self;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxPen_SetDashes",&_argc0,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"OO:wxPen_SetDashes",&_argo0,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPen_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetDashes. Expected _wxPen_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetDashes. Expected _wxPen_p.");
         return NULL;
         }


@@ -2924,20 +3089,22 @@ static PyObject *_wrap_wxPen_SetStipple(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPen * _arg0;
     wxBitmap * _arg1;
     PyObject * _resultobj;
     wxPen * _arg0;
     wxBitmap * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxPen_SetStipple",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxPen_SetStipple",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPen_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetStipple. Expected _wxPen_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetStipple. Expected _wxPen_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPen_SetStipple. Expected _wxBitmap_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPen_SetStipple. Expected _wxBitmap_p.");
         return NULL;
         }


@@ -2960,15 +3127,16 @@ static PyObject *_wrap_new_wxBrush(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxBrush * _result;
     wxColour * _arg0;
     PyObject * _resultobj;
     wxBrush * _result;
     wxColour * _arg0;

-    int  _arg1 = (wxSOLID);
-    char * _argc0 = 0;
+    int  _arg1 = (int ) wxSOLID;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:new_wxBrush",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"O|i:new_wxBrush",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColour_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxBrush. Expected _wxColour_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxBrush. Expected _wxColour_p.");
         return NULL;
         }


@@ -2978,8 +3146,13 @@ static PyObject *_wrap_new_wxBrush(PyObject *self, PyObject *args) {
         _result = (wxBrush *)new_wxBrush(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxBrush *)new_wxBrush(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBrush_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxBrush_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -2988,14 +3161,15 @@ static PyObject *_wrap_wxBrush_GetColour(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxColour * _result;
     wxBrush * _arg0;
     PyObject * _resultobj;
     wxColour * _result;
     wxBrush * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxBrush_GetColour",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxBrush_GetColour",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBrush_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBrush_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBrush_GetColour. Expected _wxBrush_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBrush_GetColour. Expected _wxBrush_p.");
         return NULL;
         }


@@ -3006,8 +3180,13 @@ static PyObject *_wrap_wxBrush_GetColour(PyObject *self, PyObject *args) {
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3016,14 +3195,15 @@ static PyObject *_wrap_wxBrush_GetStipple(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxBitmap * _result;
     wxBrush * _arg0;
     PyObject * _resultobj;
     wxBitmap * _result;
     wxBrush * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxBrush_GetStipple",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxBrush_GetStipple",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBrush_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBrush_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBrush_GetStipple. Expected _wxBrush_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBrush_GetStipple. Expected _wxBrush_p.");
         return NULL;
         }


@@ -3033,8 +3213,13 @@ static PyObject *_wrap_wxBrush_GetStipple(PyObject *self, PyObject *args) {
         _result = (wxBitmap *)wxBrush_GetStipple(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxBitmap *)wxBrush_GetStipple(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3043,13 +3228,14 @@ static PyObject *_wrap_wxBrush_GetStyle(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxBrush * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxBrush * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxBrush_GetStyle",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxBrush_GetStyle",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBrush_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBrush_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBrush_GetStyle. Expected _wxBrush_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBrush_GetStyle. Expected _wxBrush_p.");
         return NULL;
         }


@@ -3068,13 +3254,14 @@ static PyObject *_wrap_wxBrush_Ok(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxBrush * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxBrush * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxBrush_Ok",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxBrush_Ok",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBrush_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBrush_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBrush_Ok. Expected _wxBrush_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBrush_Ok. Expected _wxBrush_p.");
         return NULL;
         }


@@ -3093,20 +3280,22 @@ static PyObject *_wrap_wxBrush_SetColour(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxBrush * _arg0;
     wxColour * _arg1;
     PyObject * _resultobj;
     wxBrush * _arg0;
     wxColour * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxBrush_SetColour",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxBrush_SetColour",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBrush_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBrush_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBrush_SetColour. Expected _wxBrush_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBrush_SetColour. Expected _wxBrush_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxColour_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxBrush_SetColour. Expected _wxColour_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxBrush_SetColour. Expected _wxColour_p.");
         return NULL;
         }


@@ -3126,20 +3315,22 @@ static PyObject *_wrap_wxBrush_SetStipple(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxBrush * _arg0;
     wxBitmap * _arg1;
     PyObject * _resultobj;
     wxBrush * _arg0;
     wxBitmap * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxBrush_SetStipple",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxBrush_SetStipple",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBrush_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBrush_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBrush_SetStipple. Expected _wxBrush_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBrush_SetStipple. Expected _wxBrush_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxBrush_SetStipple. Expected _wxBitmap_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxBrush_SetStipple. Expected _wxBitmap_p.");
         return NULL;
         }


@@ -3159,13 +3350,14 @@ static PyObject *_wrap_wxBrush_SetStyle(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxBrush * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxBrush * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxBrush_SetStyle",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxBrush_SetStyle",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBrush_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBrush_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBrush_SetStyle. Expected _wxBrush_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBrush_SetStyle. Expected _wxBrush_p.");
         return NULL;
         }


@@ -3184,13 +3376,14 @@ static PyObject *_wrap_wxBrush_SetStyle(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxDC(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
 static PyObject *_wrap_delete_wxDC(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:delete_wxDC",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxDC",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxDC. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxDC. Expected _wxDC_p.");
         return NULL;
         }


@@ -3209,13 +3402,14 @@ static PyObject *_wrap_delete_wxDC(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxDC_BeginDrawing(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
 static PyObject *_wrap_wxDC_BeginDrawing(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDC_BeginDrawing",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_BeginDrawing",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_BeginDrawing. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_BeginDrawing. Expected _wxDC_p.");
         return NULL;
         }


@@ -3243,20 +3437,22 @@ static PyObject *_wrap_wxDC_Blit(PyObject *self, PyObject *args) {
     long  _arg6;
     long  _arg7;
     long  _arg8;
     long  _arg6;
     long  _arg7;
     long  _arg8;

-    char * _argc0 = 0;
-    char * _argc5 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo5 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sllllslll:wxDC_Blit",&_argc0,&_arg1,&_arg2,&_arg3,&_arg4,&_argc5,&_arg6,&_arg7,&_arg8)) 
+    if(!PyArg_ParseTuple(args,"OllllOlll:wxDC_Blit",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_argo5,&_arg6,&_arg7,&_arg8)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_Blit. Expected _wxDC_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_Blit. Expected _wxDC_p.");
         return NULL;
         }
     }

-    if (_argc5) {
-        if (SWIG_GetPtr(_argc5,(void **) &_arg5,"_wxDC_p")) {
+    if (_argo5) {
+        if (_argo5 == Py_None) { _arg5 = NULL; }
+        else if (SWIG_GetPtrObj(_argo5,(void **) &_arg5,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of wxDC_Blit. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of wxDC_Blit. Expected _wxDC_p.");
         return NULL;
         }


@@ -3274,13 +3470,14 @@ static PyObject *_wrap_wxDC_Blit(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxDC_Clear(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
 static PyObject *_wrap_wxDC_Clear(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDC_Clear",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_Clear",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_Clear. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_Clear. Expected _wxDC_p.");
         return NULL;
         }


@@ -3301,13 +3498,14 @@ static PyObject *_wrap_wxDC_CrossHair(PyObject *self, PyObject *args) {
     wxDC * _arg0;
     long  _arg1;
     long  _arg2;
     wxDC * _arg0;
     long  _arg1;
     long  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sll:wxDC_CrossHair",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oll:wxDC_CrossHair",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_CrossHair. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_CrossHair. Expected _wxDC_p.");
         return NULL;
         }


@@ -3326,13 +3524,14 @@ static PyObject *_wrap_wxDC_CrossHair(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxDC_DestroyClippingRegion(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
 static PyObject *_wrap_wxDC_DestroyClippingRegion(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDC_DestroyClippingRegion",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_DestroyClippingRegion",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DestroyClippingRegion. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DestroyClippingRegion. Expected _wxDC_p.");
         return NULL;
         }


@@ -3353,13 +3552,14 @@ static PyObject *_wrap_wxDC_DeviceToLogicalX(PyObject *self, PyObject *args) {
     long  _result;
     wxDC * _arg0;
     long  _arg1;
     long  _result;
     wxDC * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxDC_DeviceToLogicalX",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxDC_DeviceToLogicalX",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DeviceToLogicalX. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DeviceToLogicalX. Expected _wxDC_p.");
         return NULL;
         }


@@ -3379,13 +3579,14 @@ static PyObject *_wrap_wxDC_DeviceToLogicalXRel(PyObject *self, PyObject *args)
     long  _result;
     wxDC * _arg0;
     long  _arg1;
     long  _result;
     wxDC * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxDC_DeviceToLogicalXRel",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxDC_DeviceToLogicalXRel",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DeviceToLogicalXRel. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DeviceToLogicalXRel. Expected _wxDC_p.");
         return NULL;
         }


@@ -3405,13 +3606,14 @@ static PyObject *_wrap_wxDC_DeviceToLogicalY(PyObject *self, PyObject *args) {
     long  _result;
     wxDC * _arg0;
     long  _arg1;
     long  _result;
     wxDC * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxDC_DeviceToLogicalY",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxDC_DeviceToLogicalY",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DeviceToLogicalY. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DeviceToLogicalY. Expected _wxDC_p.");
         return NULL;
         }


@@ -3431,13 +3633,14 @@ static PyObject *_wrap_wxDC_DeviceToLogicalYRel(PyObject *self, PyObject *args)
     long  _result;
     wxDC * _arg0;
     long  _arg1;
     long  _result;
     wxDC * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxDC_DeviceToLogicalYRel",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxDC_DeviceToLogicalYRel",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DeviceToLogicalYRel. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DeviceToLogicalYRel. Expected _wxDC_p.");
         return NULL;
         }


@@ -3461,13 +3664,14 @@ static PyObject *_wrap_wxDC_DrawArc(PyObject *self, PyObject *args) {
     long  _arg4;
     long  _arg5;
     long  _arg6;
     long  _arg4;
     long  _arg5;
     long  _arg6;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sllllll:wxDC_DrawArc",&_argc0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6)) 
+    if(!PyArg_ParseTuple(args,"Ollllll:wxDC_DrawArc",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawArc. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawArc. Expected _wxDC_p.");
         return NULL;
         }


@@ -3489,13 +3693,14 @@ static PyObject *_wrap_wxDC_DrawCircle(PyObject *self, PyObject *args) {
     long  _arg1;
     long  _arg2;
     long  _arg3;
     long  _arg1;
     long  _arg2;
     long  _arg3;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"slll:wxDC_DrawCircle",&_argc0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"Olll:wxDC_DrawCircle",&_argo0,&_arg1,&_arg2,&_arg3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawCircle. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawCircle. Expected _wxDC_p.");
         return NULL;
         }


@@ -3518,13 +3723,14 @@ static PyObject *_wrap_wxDC_DrawEllipse(PyObject *self, PyObject *args) {
     long  _arg2;
     long  _arg3;
     long  _arg4;
     long  _arg2;
     long  _arg3;
     long  _arg4;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sllll:wxDC_DrawEllipse",&_argc0,&_arg1,&_arg2,&_arg3,&_arg4)) 
+    if(!PyArg_ParseTuple(args,"Ollll:wxDC_DrawEllipse",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawEllipse. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawEllipse. Expected _wxDC_p.");
         return NULL;
         }


@@ -3549,13 +3755,14 @@ static PyObject *_wrap_wxDC_DrawEllipticArc(PyObject *self, PyObject *args) {
     long  _arg4;
     long  _arg5;
     long  _arg6;
     long  _arg4;
     long  _arg5;
     long  _arg6;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sllllll:wxDC_DrawEllipticArc",&_argc0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6)) 
+    if(!PyArg_ParseTuple(args,"Ollllll:wxDC_DrawEllipticArc",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawEllipticArc. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawEllipticArc. Expected _wxDC_p.");
         return NULL;
         }


@@ -3577,20 +3784,22 @@ static PyObject *_wrap_wxDC_DrawIcon(PyObject *self, PyObject *args) {
     wxIcon * _arg1;
     long  _arg2;
     long  _arg3;
     wxIcon * _arg1;
     long  _arg2;
     long  _arg3;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ssll:wxDC_DrawIcon",&_argc0,&_argc1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"OOll:wxDC_DrawIcon",&_argo0,&_argo1,&_arg2,&_arg3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawIcon. Expected _wxDC_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawIcon. Expected _wxDC_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxIcon_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxIcon_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxDC_DrawIcon. Expected _wxIcon_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxDC_DrawIcon. Expected _wxIcon_p.");
         return NULL;
         }


@@ -3613,13 +3822,14 @@ static PyObject *_wrap_wxDC_DrawLine(PyObject *self, PyObject *args) {
     long  _arg2;
     long  _arg3;
     long  _arg4;
     long  _arg2;
     long  _arg3;
     long  _arg4;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sllll:wxDC_DrawLine",&_argc0,&_arg1,&_arg2,&_arg3,&_arg4)) 
+    if(!PyArg_ParseTuple(args,"Ollll:wxDC_DrawLine",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawLine. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawLine. Expected _wxDC_p.");
         return NULL;
         }


@@ -3640,16 +3850,17 @@ static PyObject *_wrap_wxDC_DrawLines(PyObject *self, PyObject *args) {
     wxDC * _arg0;
     int  _arg1;
     wxPoint * _arg2;
     wxDC * _arg0;
     int  _arg1;
     wxPoint * _arg2;

-    long  _arg3 = 0;
-    long  _arg4 = 0;
-    char * _argc0 = 0;
+    long  _arg3 = (long ) 0;
+    long  _arg4 = (long ) 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
 
     self = self;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO|ll:wxDC_DrawLines",&_argc0,&_obj2,&_arg3,&_arg4)) 
+    if(!PyArg_ParseTuple(args,"OO|ll:wxDC_DrawLines",&_argo0,&_obj2,&_arg3,&_arg4)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawLines. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawLines. Expected _wxDC_p.");
         return NULL;
         }


@@ -3688,17 +3899,18 @@ static PyObject *_wrap_wxDC_DrawPolygon(PyObject *self, PyObject *args) {
     wxDC * _arg0;
     int  _arg1;
     wxPoint * _arg2;
     wxDC * _arg0;
     int  _arg1;
     wxPoint * _arg2;

-    long  _arg3 = 0;
-    long  _arg4 = 0;
-    int  _arg5 = (wxODDEVEN_RULE);
-    char * _argc0 = 0;
+    long  _arg3 = (long ) 0;
+    long  _arg4 = (long ) 0;
+    int  _arg5 = (int ) wxODDEVEN_RULE;
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
 
     self = self;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO|lli:wxDC_DrawPolygon",&_argc0,&_obj2,&_arg3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTuple(args,"OO|lli:wxDC_DrawPolygon",&_argo0,&_obj2,&_arg3,&_arg4,&_arg5)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawPolygon. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawPolygon. Expected _wxDC_p.");
         return NULL;
         }


@@ -3737,13 +3949,14 @@ static PyObject *_wrap_wxDC_DrawPoint(PyObject *self, PyObject *args) {
     wxDC * _arg0;
     long  _arg1;
     long  _arg2;
     wxDC * _arg0;
     long  _arg1;
     long  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sll:wxDC_DrawPoint",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oll:wxDC_DrawPoint",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawPoint. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawPoint. Expected _wxDC_p.");
         return NULL;
         }


@@ -3766,13 +3979,14 @@ static PyObject *_wrap_wxDC_DrawRectangle(PyObject *self, PyObject *args) {
     long  _arg2;
     long  _arg3;
     long  _arg4;
     long  _arg2;
     long  _arg3;
     long  _arg4;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sllll:wxDC_DrawRectangle",&_argc0,&_arg1,&_arg2,&_arg3,&_arg4)) 
+    if(!PyArg_ParseTuple(args,"Ollll:wxDC_DrawRectangle",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawRectangle. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawRectangle. Expected _wxDC_p.");
         return NULL;
         }


@@ -3795,14 +4009,15 @@ static PyObject *_wrap_wxDC_DrawRoundedRectangle(PyObject *self, PyObject *args)
     long  _arg2;
     long  _arg3;
     long  _arg4;
     long  _arg2;
     long  _arg3;
     long  _arg4;

-    long  _arg5 = 20;
-    char * _argc0 = 0;
+    long  _arg5 = (long ) 20;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sllll|l:wxDC_DrawRoundedRectangle",&_argc0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTuple(args,"Ollll|l:wxDC_DrawRoundedRectangle",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawRoundedRectangle. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawRoundedRectangle. Expected _wxDC_p.");
         return NULL;
         }


@@ -3823,14 +4038,15 @@ static PyObject *_wrap_wxDC_DrawSpline(PyObject *self, PyObject *args) {
     wxDC * _arg0;
     int  _arg1;
     wxPoint * _arg2;
     wxDC * _arg0;
     int  _arg1;
     wxPoint * _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
 
     self = self;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxDC_DrawSpline",&_argc0,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"OO:wxDC_DrawSpline",&_argo0,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawSpline. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawSpline. Expected _wxDC_p.");
         return NULL;
         }


@@ -3870,14 +4086,15 @@ static PyObject *_wrap_wxDC_DrawText(PyObject *self, PyObject *args) {
     wxString * _arg1;
     long  _arg2;
     long  _arg3;
     wxString * _arg1;
     long  _arg2;
     long  _arg3;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sOll:wxDC_DrawText",&_argc0,&_obj1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"OOll:wxDC_DrawText",&_argo0,&_obj1,&_arg2,&_arg3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawText. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawText. Expected _wxDC_p.");
         return NULL;
         }


@@ -3907,13 +4124,14 @@ static PyObject *_wrap_wxDC_DrawText(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxDC_EndDoc(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
 static PyObject *_wrap_wxDC_EndDoc(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDC_EndDoc",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_EndDoc",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_EndDoc. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_EndDoc. Expected _wxDC_p.");
         return NULL;
         }


@@ -3932,13 +4150,14 @@ static PyObject *_wrap_wxDC_EndDoc(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxDC_EndDrawing(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
 static PyObject *_wrap_wxDC_EndDrawing(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDC_EndDrawing",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_EndDrawing",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_EndDrawing. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_EndDrawing. Expected _wxDC_p.");
         return NULL;
         }


@@ -3957,13 +4176,14 @@ static PyObject *_wrap_wxDC_EndDrawing(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxDC_EndPage(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
 static PyObject *_wrap_wxDC_EndPage(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDC_EndPage",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_EndPage",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_EndPage. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_EndPage. Expected _wxDC_p.");
         return NULL;
         }


@@ -3985,21 +4205,23 @@ static PyObject *_wrap_wxDC_FloodFill(PyObject *self, PyObject *args) {
     long  _arg1;
     long  _arg2;
     wxColour * _arg3;
     long  _arg1;
     long  _arg2;
     wxColour * _arg3;

-    int  _arg4 = (wxFLOOD_SURFACE);
-    char * _argc0 = 0;
-    char * _argc3 = 0;
+    int  _arg4 = (int ) wxFLOOD_SURFACE;
+    PyObject * _argo0 = 0;
+    PyObject * _argo3 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"slls|i:wxDC_FloodFill",&_argc0,&_arg1,&_arg2,&_argc3,&_arg4)) 
+    if(!PyArg_ParseTuple(args,"OllO|i:wxDC_FloodFill",&_argo0,&_arg1,&_arg2,&_argo3,&_arg4)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_FloodFill. Expected _wxDC_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_FloodFill. Expected _wxDC_p.");
         return NULL;
         }
     }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxColour_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxDC_FloodFill. Expected _wxColour_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxDC_FloodFill. Expected _wxColour_p.");
         return NULL;
         }


@@ -4019,14 +4241,15 @@ static PyObject *_wrap_wxDC_GetBackground(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxBrush * _result;
     wxDC * _arg0;
     PyObject * _resultobj;
     wxBrush * _result;
     wxDC * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDC_GetBackground",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_GetBackground",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetBackground. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetBackground. Expected _wxDC_p.");
         return NULL;
         }


@@ -4037,8 +4260,13 @@ static PyObject *_wrap_wxDC_GetBackground(PyObject *self, PyObject *args) {
     _result = (wxBrush *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxBrush *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBrush_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxBrush_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -4047,14 +4275,15 @@ static PyObject *_wrap_wxDC_GetBrush(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxBrush * _result;
     wxDC * _arg0;
     PyObject * _resultobj;
     wxBrush * _result;
     wxDC * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDC_GetBrush",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_GetBrush",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetBrush. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetBrush. Expected _wxDC_p.");
         return NULL;
         }


@@ -4065,8 +4294,13 @@ static PyObject *_wrap_wxDC_GetBrush(PyObject *self, PyObject *args) {
     _result = (wxBrush *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxBrush *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBrush_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxBrush_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -4075,13 +4309,14 @@ static PyObject *_wrap_wxDC_GetCharHeight(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxDC * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxDC * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDC_GetCharHeight",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_GetCharHeight",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetCharHeight. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetCharHeight. Expected _wxDC_p.");
         return NULL;
         }


@@ -4100,13 +4335,14 @@ static PyObject *_wrap_wxDC_GetCharWidth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxDC * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxDC * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDC_GetCharWidth",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_GetCharWidth",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetCharWidth. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetCharWidth. Expected _wxDC_p.");
         return NULL;
         }


@@ -4132,7 +4368,7 @@ static PyObject *_wrap_wxDC_GetClippingBox(PyObject *self, PyObject *args) {
     long  temp1;
     long * _arg4;
     long  temp2;
     long  temp1;
     long * _arg4;
     long  temp2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 {
 
     self = self;
 {


@@ -4147,10 +4383,11 @@ static PyObject *_wrap_wxDC_GetClippingBox(PyObject *self, PyObject *args) {
 {
   _arg4 = &temp2;
 }
 {
   _arg4 = &temp2;
 }

-    if(!PyArg_ParseTuple(args,"s:wxDC_GetClippingBox",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_GetClippingBox",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetClippingBox. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetClippingBox. Expected _wxDC_p.");
         return NULL;
         }


@@ -4190,14 +4427,15 @@ static PyObject *_wrap_wxDC_GetFont(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFont * _result;
     wxDC * _arg0;
     PyObject * _resultobj;
     wxFont * _result;
     wxDC * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDC_GetFont",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_GetFont",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetFont. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetFont. Expected _wxDC_p.");
         return NULL;
         }


@@ -4208,8 +4446,13 @@ static PyObject *_wrap_wxDC_GetFont(PyObject *self, PyObject *args) {
     _result = (wxFont *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxFont *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -4218,13 +4461,14 @@ static PyObject *_wrap_wxDC_GetLogicalFunction(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxDC * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxDC * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDC_GetLogicalFunction",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_GetLogicalFunction",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetLogicalFunction. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetLogicalFunction. Expected _wxDC_p.");
         return NULL;
         }


@@ -4243,13 +4487,14 @@ static PyObject *_wrap_wxDC_GetMapMode(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxDC * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxDC * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDC_GetMapMode",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_GetMapMode",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetMapMode. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetMapMode. Expected _wxDC_p.");
         return NULL;
         }


@@ -4268,13 +4513,14 @@ static PyObject *_wrap_wxDC_GetOptimization(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxDC * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxDC * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDC_GetOptimization",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_GetOptimization",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetOptimization. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetOptimization. Expected _wxDC_p.");
         return NULL;
         }


@@ -4293,14 +4539,15 @@ static PyObject *_wrap_wxDC_GetPen(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPen * _result;
     wxDC * _arg0;
     PyObject * _resultobj;
     wxPen * _result;
     wxDC * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDC_GetPen",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_GetPen",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetPen. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetPen. Expected _wxDC_p.");
         return NULL;
         }


@@ -4311,8 +4558,13 @@ static PyObject *_wrap_wxDC_GetPen(PyObject *self, PyObject *args) {
     _result = (wxPen *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxPen *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPen_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPen_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -4327,14 +4579,15 @@ static PyObject *_wrap_wxDC_GetPixel(PyObject *self, PyObject *args) {
     wxDC * _arg0;
     long  _arg1;
     long  _arg2;
     wxDC * _arg0;
     long  _arg1;
     long  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sll:wxDC_GetPixel",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oll:wxDC_GetPixel",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetPixel. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetPixel. Expected _wxDC_p.");
         return NULL;
         }


@@ -4344,8 +4597,13 @@ static PyObject *_wrap_wxDC_GetPixel(PyObject *self, PyObject *args) {
         _result = (wxColour *)wxDC_GetPixel(_arg0,_arg1,_arg2);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxColour *)wxDC_GetPixel(_arg0,_arg1,_arg2);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -4357,7 +4615,7 @@ static PyObject *_wrap_wxDC_GetSizeTuple(PyObject *self, PyObject *args) {
     int  temp;
     int * _arg2;
     int  temp0;
     int  temp;
     int * _arg2;
     int  temp0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 {
 
     self = self;
 {


@@ -4366,10 +4624,11 @@ static PyObject *_wrap_wxDC_GetSizeTuple(PyObject *self, PyObject *args) {
 {
   _arg2 = &temp0;
 }
 {
   _arg2 = &temp0;
 }

-    if(!PyArg_ParseTuple(args,"s:wxDC_GetSizeTuple",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_GetSizeTuple",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetSizeTuple. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetSizeTuple. Expected _wxDC_p.");
         return NULL;
         }


@@ -4399,14 +4658,15 @@ static PyObject *_wrap_wxDC_GetSize(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxSize * _result;
     wxDC * _arg0;
     PyObject * _resultobj;
     wxSize * _result;
     wxDC * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDC_GetSize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_GetSize",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetSize. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetSize. Expected _wxDC_p.");
         return NULL;
         }


@@ -4426,14 +4686,15 @@ static PyObject *_wrap_wxDC_GetTextBackground(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxColour * _result;
     wxDC * _arg0;
     PyObject * _resultobj;
     wxColour * _result;
     wxDC * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDC_GetTextBackground",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_GetTextBackground",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetTextBackground. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetTextBackground. Expected _wxDC_p.");
         return NULL;
         }


@@ -4444,8 +4705,13 @@ static PyObject *_wrap_wxDC_GetTextBackground(PyObject *self, PyObject *args) {
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -4458,7 +4724,7 @@ static PyObject *_wrap_wxDC_GetTextExtent(PyObject *self, PyObject *args) {
     long  temp;
     long * _arg3;
     long  temp0;
     long  temp;
     long * _arg3;
     long  temp0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;


@@ -4468,10 +4734,11 @@ static PyObject *_wrap_wxDC_GetTextExtent(PyObject *self, PyObject *args) {
 {
   _arg3 = &temp0;
 }
 {
   _arg3 = &temp0;
 }

-    if(!PyArg_ParseTuple(args,"sO:wxDC_GetTextExtent",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxDC_GetTextExtent",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetTextExtent. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetTextExtent. Expected _wxDC_p.");
         return NULL;
         }


@@ -4520,10 +4787,10 @@ static PyObject *_wrap_wxDC_GetFullTextExtent(PyObject *self, PyObject *args) {
     long  temp1;
     long * _arg5;
     long  temp2;
     long  temp1;
     long * _arg5;
     long  temp2;

-    wxFont * _arg6 = NULL;
-    char * _argc0 = 0;
+    wxFont * _arg6 = (wxFont *) NULL;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
     PyObject * _obj1 = 0;

-    char * _argc6 = 0;
+    PyObject * _argo6 = 0;

 
     self = self;
 {
 
     self = self;
 {


@@ -4538,10 +4805,11 @@ static PyObject *_wrap_wxDC_GetFullTextExtent(PyObject *self, PyObject *args) {
 {
   _arg5 = &temp2;
 }
 {
   _arg5 = &temp2;
 }

-    if(!PyArg_ParseTuple(args,"sO|s:wxDC_GetFullTextExtent",&_argc0,&_obj1,&_argc6)) 
+    if(!PyArg_ParseTuple(args,"OO|O:wxDC_GetFullTextExtent",&_argo0,&_obj1,&_argo6)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetFullTextExtent. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetFullTextExtent. Expected _wxDC_p.");
         return NULL;
         }


@@ -4553,8 +4821,9 @@ static PyObject *_wrap_wxDC_GetFullTextExtent(PyObject *self, PyObject *args) {
     }
     _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }
     }
     _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }

-    if (_argc6) {
-        if (SWIG_GetPtr(_argc6,(void **) &_arg6,"_wxFont_p")) {
+    if (_argo6) {
+        if (_argo6 == Py_None) { _arg6 = NULL; }
+        else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxFont_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of wxDC_GetFullTextExtent. Expected _wxFont_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of wxDC_GetFullTextExtent. Expected _wxFont_p.");
         return NULL;
         }


@@ -4598,14 +4867,15 @@ static PyObject *_wrap_wxDC_GetTextForeground(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxColour * _result;
     wxDC * _arg0;
     PyObject * _resultobj;
     wxColour * _result;
     wxDC * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDC_GetTextForeground",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_GetTextForeground",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetTextForeground. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetTextForeground. Expected _wxDC_p.");
         return NULL;
         }


@@ -4616,8 +4886,13 @@ static PyObject *_wrap_wxDC_GetTextForeground(PyObject *self, PyObject *args) {
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -4627,13 +4902,14 @@ static PyObject *_wrap_wxDC_LogicalToDeviceX(PyObject *self, PyObject *args) {
     long  _result;
     wxDC * _arg0;
     long  _arg1;
     long  _result;
     wxDC * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxDC_LogicalToDeviceX",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxDC_LogicalToDeviceX",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_LogicalToDeviceX. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_LogicalToDeviceX. Expected _wxDC_p.");
         return NULL;
         }


@@ -4653,13 +4929,14 @@ static PyObject *_wrap_wxDC_LogicalToDeviceXRel(PyObject *self, PyObject *args)
     long  _result;
     wxDC * _arg0;
     long  _arg1;
     long  _result;
     wxDC * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxDC_LogicalToDeviceXRel",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxDC_LogicalToDeviceXRel",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_LogicalToDeviceXRel. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_LogicalToDeviceXRel. Expected _wxDC_p.");
         return NULL;
         }


@@ -4679,13 +4956,14 @@ static PyObject *_wrap_wxDC_LogicalToDeviceY(PyObject *self, PyObject *args) {
     long  _result;
     wxDC * _arg0;
     long  _arg1;
     long  _result;
     wxDC * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxDC_LogicalToDeviceY",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxDC_LogicalToDeviceY",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_LogicalToDeviceY. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_LogicalToDeviceY. Expected _wxDC_p.");
         return NULL;
         }


@@ -4705,13 +4983,14 @@ static PyObject *_wrap_wxDC_LogicalToDeviceYRel(PyObject *self, PyObject *args)
     long  _result;
     wxDC * _arg0;
     long  _arg1;
     long  _result;
     wxDC * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxDC_LogicalToDeviceYRel",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxDC_LogicalToDeviceYRel",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_LogicalToDeviceYRel. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_LogicalToDeviceYRel. Expected _wxDC_p.");
         return NULL;
         }


@@ -4730,13 +5009,14 @@ static PyObject *_wrap_wxDC_MaxX(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxDC * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxDC * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDC_MaxX",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_MaxX",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_MaxX. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_MaxX. Expected _wxDC_p.");
         return NULL;
         }


@@ -4755,13 +5035,14 @@ static PyObject *_wrap_wxDC_MaxY(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxDC * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxDC * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDC_MaxY",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_MaxY",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_MaxY. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_MaxY. Expected _wxDC_p.");
         return NULL;
         }


@@ -4780,13 +5061,14 @@ static PyObject *_wrap_wxDC_MinX(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxDC * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxDC * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDC_MinX",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_MinX",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_MinX. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_MinX. Expected _wxDC_p.");
         return NULL;
         }


@@ -4805,13 +5087,14 @@ static PyObject *_wrap_wxDC_MinY(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxDC * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxDC * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDC_MinY",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_MinY",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_MinY. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_MinY. Expected _wxDC_p.");
         return NULL;
         }


@@ -4830,13 +5113,14 @@ static PyObject *_wrap_wxDC_Ok(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxDC * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxDC * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDC_Ok",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_Ok",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_Ok. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_Ok. Expected _wxDC_p.");
         return NULL;
         }


@@ -4856,13 +5140,14 @@ static PyObject *_wrap_wxDC_SetDeviceOrigin(PyObject *self, PyObject *args) {
     wxDC * _arg0;
     long  _arg1;
     long  _arg2;
     wxDC * _arg0;
     long  _arg1;
     long  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sll:wxDC_SetDeviceOrigin",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oll:wxDC_SetDeviceOrigin",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetDeviceOrigin. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetDeviceOrigin. Expected _wxDC_p.");
         return NULL;
         }


@@ -4882,20 +5167,22 @@ static PyObject *_wrap_wxDC_SetBackground(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
     wxBrush * _arg1;
     PyObject * _resultobj;
     wxDC * _arg0;
     wxBrush * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxDC_SetBackground",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxDC_SetBackground",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetBackground. Expected _wxDC_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetBackground. Expected _wxDC_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBrush_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxBrush_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxDC_SetBackground. Expected _wxBrush_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxDC_SetBackground. Expected _wxBrush_p.");
         return NULL;
         }


@@ -4915,13 +5202,14 @@ static PyObject *_wrap_wxDC_SetBackgroundMode(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxDC * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxDC_SetBackgroundMode",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxDC_SetBackgroundMode",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetBackgroundMode. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetBackgroundMode. Expected _wxDC_p.");
         return NULL;
         }


@@ -4944,13 +5232,14 @@ static PyObject *_wrap_wxDC_SetClippingRegion(PyObject *self, PyObject *args) {
     long  _arg2;
     long  _arg3;
     long  _arg4;
     long  _arg2;
     long  _arg3;
     long  _arg4;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sllll:wxDC_SetClippingRegion",&_argc0,&_arg1,&_arg2,&_arg3,&_arg4)) 
+    if(!PyArg_ParseTuple(args,"Ollll:wxDC_SetClippingRegion",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetClippingRegion. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetClippingRegion. Expected _wxDC_p.");
         return NULL;
         }


@@ -4970,20 +5259,22 @@ static PyObject *_wrap_wxDC_SetPalette(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
     wxPalette * _arg1;
     PyObject * _resultobj;
     wxDC * _arg0;
     wxPalette * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxDC_SetPalette",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxDC_SetPalette",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetPalette. Expected _wxDC_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetPalette. Expected _wxDC_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPalette_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPalette_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxDC_SetPalette. Expected _wxPalette_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxDC_SetPalette. Expected _wxPalette_p.");
         return NULL;
         }


@@ -5003,20 +5294,22 @@ static PyObject *_wrap_wxDC_SetBrush(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
     wxBrush * _arg1;
     PyObject * _resultobj;
     wxDC * _arg0;
     wxBrush * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxDC_SetBrush",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxDC_SetBrush",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetBrush. Expected _wxDC_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetBrush. Expected _wxDC_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBrush_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxBrush_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxDC_SetBrush. Expected _wxBrush_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxDC_SetBrush. Expected _wxBrush_p.");
         return NULL;
         }


@@ -5036,20 +5329,22 @@ static PyObject *_wrap_wxDC_SetFont(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
     wxFont * _arg1;
     PyObject * _resultobj;
     wxDC * _arg0;
     wxFont * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxDC_SetFont",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxDC_SetFont",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetFont. Expected _wxDC_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetFont. Expected _wxDC_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxFont_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxFont_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxDC_SetFont. Expected _wxFont_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxDC_SetFont. Expected _wxFont_p.");
         return NULL;
         }


@@ -5069,13 +5364,14 @@ static PyObject *_wrap_wxDC_SetLogicalFunction(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxDC * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxDC_SetLogicalFunction",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxDC_SetLogicalFunction",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetLogicalFunction. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetLogicalFunction. Expected _wxDC_p.");
         return NULL;
         }


@@ -5095,13 +5391,14 @@ static PyObject *_wrap_wxDC_SetMapMode(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxDC * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxDC_SetMapMode",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxDC_SetMapMode",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetMapMode. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetMapMode. Expected _wxDC_p.");
         return NULL;
         }


@@ -5121,14 +5418,15 @@ static PyObject *_wrap_wxDC_SetOptimization(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxDC * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxDC_SetOptimization",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxDC_SetOptimization",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetOptimization. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetOptimization. Expected _wxDC_p.");
         return NULL;
         }


@@ -5149,20 +5447,22 @@ static PyObject *_wrap_wxDC_SetPen(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
     wxPen * _arg1;
     PyObject * _resultobj;
     wxDC * _arg0;
     wxPen * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxDC_SetPen",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxDC_SetPen",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetPen. Expected _wxDC_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetPen. Expected _wxDC_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPen_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPen_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxDC_SetPen. Expected _wxPen_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxDC_SetPen. Expected _wxPen_p.");
         return NULL;
         }


@@ -5182,20 +5482,22 @@ static PyObject *_wrap_wxDC_SetTextBackground(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
     wxColour * _arg1;
     PyObject * _resultobj;
     wxDC * _arg0;
     wxColour * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxDC_SetTextBackground",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxDC_SetTextBackground",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetTextBackground. Expected _wxDC_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetTextBackground. Expected _wxDC_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxColour_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxDC_SetTextBackground. Expected _wxColour_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxDC_SetTextBackground. Expected _wxColour_p.");
         return NULL;
         }


@@ -5215,20 +5517,22 @@ static PyObject *_wrap_wxDC_SetTextForeground(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
     wxColour * _arg1;
     PyObject * _resultobj;
     wxDC * _arg0;
     wxColour * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxDC_SetTextForeground",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxDC_SetTextForeground",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetTextForeground. Expected _wxDC_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetTextForeground. Expected _wxDC_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxColour_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxDC_SetTextForeground. Expected _wxColour_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxDC_SetTextForeground. Expected _wxColour_p.");
         return NULL;
         }


@@ -5249,13 +5553,14 @@ static PyObject *_wrap_wxDC_SetUserScale(PyObject *self, PyObject *args) {
     wxDC * _arg0;
     double  _arg1;
     double  _arg2;
     wxDC * _arg0;
     double  _arg1;
     double  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sdd:wxDC_SetUserScale",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Odd:wxDC_SetUserScale",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetUserScale. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetUserScale. Expected _wxDC_p.");
         return NULL;
         }


@@ -5276,14 +5581,15 @@ static PyObject *_wrap_wxDC_StartDoc(PyObject *self, PyObject *args) {
     bool  _result;
     wxDC * _arg0;
     wxString * _arg1;
     bool  _result;
     wxDC * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxDC_StartDoc",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxDC_StartDoc",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_StartDoc. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_StartDoc. Expected _wxDC_p.");
         return NULL;
         }


@@ -5312,13 +5618,14 @@ static PyObject *_wrap_wxDC_StartDoc(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxDC_StartPage(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
 static PyObject *_wrap_wxDC_StartPage(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDC_StartPage",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_StartPage",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_StartPage. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_StartPage. Expected _wxDC_p.");
         return NULL;
         }


@@ -5351,22 +5658,24 @@ static PyObject *_wrap_wxDC_DrawBitmap(PyObject *self, PyObject *args) {
     wxBitmap * _arg1;
     long  _arg2;
     long  _arg3;
     wxBitmap * _arg1;
     long  _arg2;
     long  _arg3;

-    bool  _arg4 = (1);
-    char * _argc0 = 0;
-    char * _argc1 = 0;
-    int tempbool4;
+    bool  _arg4 = (bool ) TRUE;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    int tempbool4 = (int) TRUE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ssll|i:wxDC_DrawBitmap",&_argc0,&_argc1,&_arg2,&_arg3,&tempbool4)) 
+    if(!PyArg_ParseTuple(args,"OOll|i:wxDC_DrawBitmap",&_argo0,&_argo1,&_arg2,&_arg3,&tempbool4)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawBitmap. Expected _wxDC_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawBitmap. Expected _wxDC_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxDC_DrawBitmap. Expected _wxBitmap_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxDC_DrawBitmap. Expected _wxBitmap_p.");
         return NULL;
         }


@@ -5404,8 +5713,13 @@ static PyObject *_wrap_new_wxMemoryDC(PyObject *self, PyObject *args) {
         _result = (wxMemoryDC *)new_wxMemoryDC();
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxMemoryDC *)new_wxMemoryDC();
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMemoryDC_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMemoryDC_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -5414,20 +5728,22 @@ static PyObject *_wrap_wxMemoryDC_SelectObject(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMemoryDC * _arg0;
     wxBitmap * _arg1;
     PyObject * _resultobj;
     wxMemoryDC * _arg0;
     wxBitmap * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxMemoryDC_SelectObject",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxMemoryDC_SelectObject",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMemoryDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMemoryDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMemoryDC_SelectObject. Expected _wxMemoryDC_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMemoryDC_SelectObject. Expected _wxMemoryDC_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMemoryDC_SelectObject. Expected _wxBitmap_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMemoryDC_SelectObject. Expected _wxBitmap_p.");
         return NULL;
         }


@@ -5464,8 +5780,13 @@ static PyObject *_wrap_new_wxScreenDC(PyObject *self, PyObject *args) {
         _result = (wxScreenDC *)new_wxScreenDC();
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxScreenDC *)new_wxScreenDC();
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxScreenDC_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxScreenDC_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -5475,20 +5796,22 @@ static PyObject *_wrap_wxScreenDC_StartDrawingOnTop(PyObject *self, PyObject *ar
     bool  _result;
     wxScreenDC * _arg0;
     wxWindow * _arg1;
     bool  _result;
     wxScreenDC * _arg0;
     wxWindow * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxScreenDC_StartDrawingOnTop",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxScreenDC_StartDrawingOnTop",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScreenDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScreenDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScreenDC_StartDrawingOnTop. Expected _wxScreenDC_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScreenDC_StartDrawingOnTop. Expected _wxScreenDC_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxScreenDC_StartDrawingOnTop. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxScreenDC_StartDrawingOnTop. Expected _wxWindow_p.");
         return NULL;
         }


@@ -5507,21 +5830,23 @@ static PyObject *_wrap_wxScreenDC_StartDrawingOnTopRect(PyObject *self, PyObject
     PyObject * _resultobj;
     bool  _result;
     wxScreenDC * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxScreenDC * _arg0;

-    wxRect * _arg1 = NULL;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    wxRect * _arg1 = (wxRect *) NULL;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|s:wxScreenDC_StartDrawingOnTopRect",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"O|O:wxScreenDC_StartDrawingOnTopRect",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScreenDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScreenDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScreenDC_StartDrawingOnTopRect. Expected _wxScreenDC_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScreenDC_StartDrawingOnTopRect. Expected _wxScreenDC_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxRect_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxScreenDC_StartDrawingOnTopRect. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxScreenDC_StartDrawingOnTopRect. Expected _wxRect_p.");
         return NULL;
         }


@@ -5540,13 +5865,14 @@ static PyObject *_wrap_wxScreenDC_EndDrawingOnTop(PyObject *self, PyObject *args
     PyObject * _resultobj;
     bool  _result;
     wxScreenDC * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxScreenDC * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxScreenDC_EndDrawingOnTop",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxScreenDC_EndDrawingOnTop",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScreenDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScreenDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScreenDC_EndDrawingOnTop. Expected _wxScreenDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScreenDC_EndDrawingOnTop. Expected _wxScreenDC_p.");
         return NULL;
         }


@@ -5573,14 +5899,15 @@ static PyObject *_wrap_new_wxClientDC(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxClientDC * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxClientDC * _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:new_wxClientDC",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:new_wxClientDC",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxClientDC. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxClientDC. Expected _wxWindow_p.");
         return NULL;
         }


@@ -5590,8 +5917,13 @@ static PyObject *_wrap_new_wxClientDC(PyObject *self, PyObject *args) {
         _result = (wxClientDC *)new_wxClientDC(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxClientDC *)new_wxClientDC(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxClientDC_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxClientDC_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -5608,14 +5940,15 @@ static PyObject *_wrap_new_wxPaintDC(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPaintDC * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxPaintDC * _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:new_wxPaintDC",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:new_wxPaintDC",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPaintDC. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPaintDC. Expected _wxWindow_p.");
         return NULL;
         }


@@ -5625,8 +5958,13 @@ static PyObject *_wrap_new_wxPaintDC(PyObject *self, PyObject *args) {
         _result = (wxPaintDC *)new_wxPaintDC(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxPaintDC *)new_wxPaintDC(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPaintDC_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPaintDC_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -5643,14 +5981,15 @@ static PyObject *_wrap_new_wxWindowDC(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindowDC * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxWindowDC * _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:new_wxWindowDC",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:new_wxWindowDC",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxWindowDC. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxWindowDC. Expected _wxWindow_p.");
         return NULL;
         }


@@ -5660,8 +5999,13 @@ static PyObject *_wrap_new_wxWindowDC(PyObject *self, PyObject *args) {
         _result = (wxWindowDC *)new_wxWindowDC(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxWindowDC *)new_wxWindowDC(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindowDC_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindowDC_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -5680,12 +6024,12 @@ static PyObject *_wrap_new_wxPrinterDC(PyObject *self, PyObject *args) {
     wxString * _arg0;
     wxString * _arg1;
     wxString * _arg2;
     wxString * _arg0;
     wxString * _arg1;
     wxString * _arg2;

-    bool  _arg3 = (1);
-    int  _arg4 = (wxPORTRAIT);
+    bool  _arg3 = (bool ) TRUE;
+    int  _arg4 = (int ) wxPORTRAIT;

     PyObject * _obj0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;
     PyObject * _obj0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;

-    int tempbool3;
+    int tempbool3 = (int) TRUE;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;


@@ -5718,8 +6062,13 @@ static PyObject *_wrap_new_wxPrinterDC(PyObject *self, PyObject *args) {
         _result = (wxPrinterDC *)new_wxPrinterDC(*_arg0,*_arg1,*_arg2,_arg3,_arg4);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxPrinterDC *)new_wxPrinterDC(*_arg0,*_arg1,*_arg2,_arg3,_arg4);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrinterDC_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrinterDC_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     if (_obj0)
         delete _arg0;
 {
     if (_obj0)
         delete _arg0;


@@ -5747,7 +6096,7 @@ static void *SwigwxMetaFileDCTowxDC(void *ptr) {
 static PyObject *_wrap_new_wxMetaFileDC(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMetaFileDC * _result;
 static PyObject *_wrap_new_wxMetaFileDC(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMetaFileDC * _result;

-    wxString * _arg0 = &wxPyEmptyStr;
+    wxString * _arg0 = (wxString *) &wxPyEmptyStr;

     PyObject * _obj0 = 0;
     char _ptemp[128];
 
     PyObject * _obj0 = 0;
     char _ptemp[128];
 


@@ -5767,8 +6116,13 @@ static PyObject *_wrap_new_wxMetaFileDC(PyObject *self, PyObject *args) {
         _result = (wxMetaFileDC *)new_wxMetaFileDC(*_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxMetaFileDC *)new_wxMetaFileDC(*_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMetaFileDC_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMetaFileDC_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     if (_obj0)
         delete _arg0;
 {
     if (_obj0)
         delete _arg0;


@@ -5781,14 +6135,15 @@ static PyObject *_wrap_wxMetaFileDC_Close(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMetaFile * _result;
     wxMetaFileDC * _arg0;
     PyObject * _resultobj;
     wxMetaFile * _result;
     wxMetaFileDC * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMetaFileDC_Close",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMetaFileDC_Close",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMetaFileDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMetaFileDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMetaFileDC_Close. Expected _wxMetaFileDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMetaFileDC_Close. Expected _wxMetaFileDC_p.");
         return NULL;
         }


@@ -5798,8 +6153,13 @@ static PyObject *_wrap_wxMetaFileDC_Close(PyObject *self, PyObject *args) {
         _result = (wxMetaFile *)wxMetaFileDC_Close(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxMetaFile *)wxMetaFileDC_Close(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMetaFile_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMetaFile_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -5851,8 +6211,13 @@ static PyObject *_wrap_new_wxPalette(PyObject *self, PyObject *args) {
         _result = (wxPalette *)new_wxPalette(_arg0,_arg1,_arg2,_arg3);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxPalette *)new_wxPalette(_arg0,_arg1,_arg2,_arg3);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPalette_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPalette_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     delete [] _arg1;
 }
 {
     delete [] _arg1;
 }


@@ -5869,13 +6234,14 @@ static PyObject *_wrap_new_wxPalette(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxPalette(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPalette * _arg0;
 static PyObject *_wrap_delete_wxPalette(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPalette * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:delete_wxPalette",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxPalette",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPalette_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPalette_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPalette. Expected _wxPalette_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPalette. Expected _wxPalette_p.");
         return NULL;
         }


@@ -5898,13 +6264,14 @@ static PyObject *_wrap_wxPalette_GetPixel(PyObject *self, PyObject *args) {
     byte  _arg1;
     byte  _arg2;
     byte  _arg3;
     byte  _arg1;
     byte  _arg2;
     byte  _arg3;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sbbb:wxPalette_GetPixel",&_argc0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"Obbb:wxPalette_GetPixel",&_argo0,&_arg1,&_arg2,&_arg3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPalette_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPalette_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPalette_GetPixel. Expected _wxPalette_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPalette_GetPixel. Expected _wxPalette_p.");
         return NULL;
         }


@@ -5927,34 +6294,38 @@ static PyObject *_wrap_wxPalette_GetRGB(PyObject *self, PyObject *args) {
     byte * _arg2;
     byte * _arg3;
     byte * _arg4;
     byte * _arg2;
     byte * _arg3;
     byte * _arg4;

-    char * _argc0 = 0;
-    char * _argc2 = 0;
-    char * _argc3 = 0;
-    char * _argc4 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;
+    PyObject * _argo3 = 0;
+    PyObject * _argo4 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sisss:wxPalette_GetRGB",&_argc0,&_arg1,&_argc2,&_argc3,&_argc4)) 
+    if(!PyArg_ParseTuple(args,"OiOOO:wxPalette_GetRGB",&_argo0,&_arg1,&_argo2,&_argo3,&_argo4)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPalette_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPalette_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPalette_GetRGB. Expected _wxPalette_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPalette_GetRGB. Expected _wxPalette_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_byte_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_byte_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPalette_GetRGB. Expected _byte_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPalette_GetRGB. Expected _byte_p.");
         return NULL;
         }
     }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_byte_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_byte_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxPalette_GetRGB. Expected _byte_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxPalette_GetRGB. Expected _byte_p.");
         return NULL;
         }
     }

-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_byte_p")) {
+    if (_argo4) {
+        if (_argo4 == Py_None) { _arg4 = NULL; }
+        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_byte_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of wxPalette_GetRGB. Expected _byte_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of wxPalette_GetRGB. Expected _byte_p.");
         return NULL;
         }


@@ -5973,13 +6344,14 @@ static PyObject *_wrap_wxPalette_Ok(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxPalette * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxPalette * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPalette_Ok",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPalette_Ok",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPalette_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPalette_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPalette_Ok. Expected _wxPalette_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPalette_Ok. Expected _wxPalette_p.");
         return NULL;
         }


@@ -5999,9 +6371,9 @@ static PyObject *_wrap_new_wxImageList(PyObject *self, PyObject *args) {
     wxImageList * _result;
     int  _arg0;
     int  _arg1;
     wxImageList * _result;
     int  _arg0;
     int  _arg1;

-    bool  _arg2 = (1);
-    int  _arg3 = 1;
-    int tempbool2;
+    bool  _arg2 = (bool ) TRUE;
+    int  _arg3 = (int ) 1;
+    int tempbool2 = (int) TRUE;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;


@@ -6013,8 +6385,13 @@ static PyObject *_wrap_new_wxImageList(PyObject *self, PyObject *args) {
         _result = (wxImageList *)new_wxImageList(_arg0,_arg1,_arg2,_arg3);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxImageList *)new_wxImageList(_arg0,_arg1,_arg2,_arg3);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxImageList_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxImageList_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -6022,13 +6399,14 @@ static PyObject *_wrap_new_wxImageList(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxImageList(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxImageList * _arg0;
 static PyObject *_wrap_delete_wxImageList(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxImageList * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:delete_wxImageList",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxImageList",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImageList_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxImageList. Expected _wxImageList_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxImageList. Expected _wxImageList_p.");
         return NULL;
         }


@@ -6049,28 +6427,31 @@ static PyObject *_wrap_wxImageList_Add(PyObject *self, PyObject *args) {
     int  _result;
     wxImageList * _arg0;
     wxBitmap * _arg1;
     int  _result;
     wxImageList * _arg0;
     wxBitmap * _arg1;

-    wxBitmap * _arg2 = &wxNullBitmap;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
-    char * _argc2 = 0;
+    wxBitmap * _arg2 = (wxBitmap *) &wxNullBitmap;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss|s:wxImageList_Add",&_argc0,&_argc1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"OO|O:wxImageList_Add",&_argo0,&_argo1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImageList_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_Add. Expected _wxImageList_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_Add. Expected _wxImageList_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxImageList_Add. Expected _wxBitmap_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxImageList_Add. Expected _wxBitmap_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxBitmap_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxImageList_Add. Expected _wxBitmap_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxImageList_Add. Expected _wxBitmap_p.");
         return NULL;
         }


@@ -6091,27 +6472,30 @@ static PyObject *_wrap_wxImageList_AddWithColourMask(PyObject *self, PyObject *a
     wxImageList * _arg0;
     wxBitmap * _arg1;
     wxColour * _arg2;
     wxImageList * _arg0;
     wxBitmap * _arg1;
     wxColour * _arg2;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
-    char * _argc2 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sss:wxImageList_AddWithColourMask",&_argc0,&_argc1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"OOO:wxImageList_AddWithColourMask",&_argo0,&_argo1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImageList_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_AddWithColourMask. Expected _wxImageList_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_AddWithColourMask. Expected _wxImageList_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxImageList_AddWithColourMask. Expected _wxBitmap_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxImageList_AddWithColourMask. Expected _wxBitmap_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxColour_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxImageList_AddWithColourMask. Expected _wxColour_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxImageList_AddWithColourMask. Expected _wxColour_p.");
         return NULL;
         }


@@ -6131,20 +6515,22 @@ static PyObject *_wrap_wxImageList_AddIcon(PyObject *self, PyObject *args) {
     int  _result;
     wxImageList * _arg0;
     wxIcon * _arg1;
     int  _result;
     wxImageList * _arg0;
     wxIcon * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxImageList_AddIcon",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxImageList_AddIcon",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImageList_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_AddIcon. Expected _wxImageList_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_AddIcon. Expected _wxImageList_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxIcon_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxIcon_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxImageList_AddIcon. Expected _wxIcon_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxImageList_AddIcon. Expected _wxIcon_p.");
         return NULL;
         }


@@ -6165,28 +6551,31 @@ static PyObject *_wrap_wxImageList_Replace(PyObject *self, PyObject *args) {
     wxImageList * _arg0;
     int  _arg1;
     wxBitmap * _arg2;
     wxImageList * _arg0;
     int  _arg1;
     wxBitmap * _arg2;

-    wxBitmap * _arg3 = &wxNullBitmap;
-    char * _argc0 = 0;
-    char * _argc2 = 0;
-    char * _argc3 = 0;
+    wxBitmap * _arg3 = (wxBitmap *) &wxNullBitmap;
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;
+    PyObject * _argo3 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sis|s:wxImageList_Replace",&_argc0,&_arg1,&_argc2,&_argc3)) 
+    if(!PyArg_ParseTuple(args,"OiO|O:wxImageList_Replace",&_argo0,&_arg1,&_argo2,&_argo3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImageList_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_Replace. Expected _wxImageList_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_Replace. Expected _wxImageList_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxBitmap_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxImageList_Replace. Expected _wxBitmap_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxImageList_Replace. Expected _wxBitmap_p.");
         return NULL;
         }
     }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxBitmap_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxImageList_Replace. Expected _wxBitmap_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxImageList_Replace. Expected _wxBitmap_p.");
         return NULL;
         }


@@ -6207,20 +6596,22 @@ static PyObject *_wrap_wxImageList_ReplaceIcon(PyObject *self, PyObject *args) {
     wxImageList * _arg0;
     int  _arg1;
     wxIcon * _arg2;
     wxImageList * _arg0;
     int  _arg1;
     wxIcon * _arg2;

-    char * _argc0 = 0;
-    char * _argc2 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sis:wxImageList_ReplaceIcon",&_argc0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"OiO:wxImageList_ReplaceIcon",&_argo0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImageList_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_ReplaceIcon. Expected _wxImageList_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_ReplaceIcon. Expected _wxImageList_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxIcon_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxIcon_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxImageList_ReplaceIcon. Expected _wxIcon_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxImageList_ReplaceIcon. Expected _wxIcon_p.");
         return NULL;
         }


@@ -6243,23 +6634,25 @@ static PyObject *_wrap_wxImageList_Draw(PyObject *self, PyObject *args) {
     wxDC * _arg2;
     int  _arg3;
     int  _arg4;
     wxDC * _arg2;
     int  _arg3;
     int  _arg4;

-    int  _arg5 = (wxIMAGELIST_DRAW_NORMAL);
-    bool  _arg6 = (0);
-    char * _argc0 = 0;
-    char * _argc2 = 0;
-    int tempbool6;
+    int  _arg5 = (int ) (wxIMAGELIST_DRAW_NORMAL);
+    bool  _arg6 = (bool ) FALSE;
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;
+    int tempbool6 = (int) FALSE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sisii|ii:wxImageList_Draw",&_argc0,&_arg1,&_argc2,&_arg3,&_arg4,&_arg5,&tempbool6)) 
+    if(!PyArg_ParseTuple(args,"OiOii|ii:wxImageList_Draw",&_argo0,&_arg1,&_argo2,&_arg3,&_arg4,&_arg5,&tempbool6)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImageList_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_Draw. Expected _wxImageList_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_Draw. Expected _wxImageList_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxDC_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxImageList_Draw. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxImageList_Draw. Expected _wxDC_p.");
         return NULL;
         }


@@ -6279,13 +6672,14 @@ static PyObject *_wrap_wxImageList_GetImageCount(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     int  _result;
     wxImageList * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxImageList * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxImageList_GetImageCount",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxImageList_GetImageCount",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImageList_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_GetImageCount. Expected _wxImageList_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_GetImageCount. Expected _wxImageList_p.");
         return NULL;
         }


@@ -6305,13 +6699,14 @@ static PyObject *_wrap_wxImageList_Remove(PyObject *self, PyObject *args) {
     bool  _result;
     wxImageList * _arg0;
     int  _arg1;
     bool  _result;
     wxImageList * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxImageList_Remove",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxImageList_Remove",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImageList_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_Remove. Expected _wxImageList_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_Remove. Expected _wxImageList_p.");
         return NULL;
         }


@@ -6330,13 +6725,14 @@ static PyObject *_wrap_wxImageList_RemoveAll(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxImageList * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxImageList * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxImageList_RemoveAll",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxImageList_RemoveAll",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImageList_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_RemoveAll. Expected _wxImageList_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_RemoveAll. Expected _wxImageList_p.");
         return NULL;
         }


@@ -6351,195 +6747,362 @@ static PyObject *_wrap_wxImageList_RemoveAll(PyObject *self, PyObject *args) {
 }
 
 static PyMethodDef gdicMethods[] = {
 }
 
 static PyMethodDef gdicMethods[] = {

-        { "wxImageList_RemoveAll", _wrap_wxImageList_RemoveAll, 1 },
-        { "wxImageList_Remove", _wrap_wxImageList_Remove, 1 },
-        { "wxImageList_GetImageCount", _wrap_wxImageList_GetImageCount, 1 },
-        { "wxImageList_Draw", _wrap_wxImageList_Draw, 1 },
-        { "wxImageList_ReplaceIcon", _wrap_wxImageList_ReplaceIcon, 1 },
-        { "wxImageList_Replace", _wrap_wxImageList_Replace, 1 },
-        { "wxImageList_AddIcon", _wrap_wxImageList_AddIcon, 1 },
-        { "wxImageList_AddWithColourMask", _wrap_wxImageList_AddWithColourMask, 1 },
-        { "wxImageList_Add", _wrap_wxImageList_Add, 1 },
-        { "delete_wxImageList", _wrap_delete_wxImageList, 1 },
-        { "new_wxImageList", _wrap_new_wxImageList, 1 },
-        { "wxPalette_Ok", _wrap_wxPalette_Ok, 1 },
-        { "wxPalette_GetRGB", _wrap_wxPalette_GetRGB, 1 },
-        { "wxPalette_GetPixel", _wrap_wxPalette_GetPixel, 1 },
-        { "delete_wxPalette", _wrap_delete_wxPalette, 1 },
-        { "new_wxPalette", _wrap_new_wxPalette, 1 },
-        { "wxMetaFileDC_Close", _wrap_wxMetaFileDC_Close, 1 },
-        { "new_wxMetaFileDC", _wrap_new_wxMetaFileDC, 1 },
-        { "new_wxPrinterDC", _wrap_new_wxPrinterDC, 1 },
-        { "new_wxWindowDC", _wrap_new_wxWindowDC, 1 },
-        { "new_wxPaintDC", _wrap_new_wxPaintDC, 1 },
-        { "new_wxClientDC", _wrap_new_wxClientDC, 1 },
-        { "wxScreenDC_EndDrawingOnTop", _wrap_wxScreenDC_EndDrawingOnTop, 1 },
-        { "wxScreenDC_StartDrawingOnTopRect", _wrap_wxScreenDC_StartDrawingOnTopRect, 1 },
-        { "wxScreenDC_StartDrawingOnTop", _wrap_wxScreenDC_StartDrawingOnTop, 1 },
-        { "new_wxScreenDC", _wrap_new_wxScreenDC, 1 },
-        { "wxMemoryDC_SelectObject", _wrap_wxMemoryDC_SelectObject, 1 },
-        { "new_wxMemoryDC", _wrap_new_wxMemoryDC, 1 },
-        { "wxDC_DrawBitmap", _wrap_wxDC_DrawBitmap, 1 },
-        { "wxDC_StartPage", _wrap_wxDC_StartPage, 1 },
-        { "wxDC_StartDoc", _wrap_wxDC_StartDoc, 1 },
-        { "wxDC_SetUserScale", _wrap_wxDC_SetUserScale, 1 },
-        { "wxDC_SetTextForeground", _wrap_wxDC_SetTextForeground, 1 },
-        { "wxDC_SetTextBackground", _wrap_wxDC_SetTextBackground, 1 },
-        { "wxDC_SetPen", _wrap_wxDC_SetPen, 1 },
-        { "wxDC_SetOptimization", _wrap_wxDC_SetOptimization, 1 },
-        { "wxDC_SetMapMode", _wrap_wxDC_SetMapMode, 1 },
-        { "wxDC_SetLogicalFunction", _wrap_wxDC_SetLogicalFunction, 1 },
-        { "wxDC_SetFont", _wrap_wxDC_SetFont, 1 },
-        { "wxDC_SetBrush", _wrap_wxDC_SetBrush, 1 },
-        { "wxDC_SetPalette", _wrap_wxDC_SetPalette, 1 },
-        { "wxDC_SetClippingRegion", _wrap_wxDC_SetClippingRegion, 1 },
-        { "wxDC_SetBackgroundMode", _wrap_wxDC_SetBackgroundMode, 1 },
-        { "wxDC_SetBackground", _wrap_wxDC_SetBackground, 1 },
-        { "wxDC_SetDeviceOrigin", _wrap_wxDC_SetDeviceOrigin, 1 },
-        { "wxDC_Ok", _wrap_wxDC_Ok, 1 },
-        { "wxDC_MinY", _wrap_wxDC_MinY, 1 },
-        { "wxDC_MinX", _wrap_wxDC_MinX, 1 },
-        { "wxDC_MaxY", _wrap_wxDC_MaxY, 1 },
-        { "wxDC_MaxX", _wrap_wxDC_MaxX, 1 },
-        { "wxDC_LogicalToDeviceYRel", _wrap_wxDC_LogicalToDeviceYRel, 1 },
-        { "wxDC_LogicalToDeviceY", _wrap_wxDC_LogicalToDeviceY, 1 },
-        { "wxDC_LogicalToDeviceXRel", _wrap_wxDC_LogicalToDeviceXRel, 1 },
-        { "wxDC_LogicalToDeviceX", _wrap_wxDC_LogicalToDeviceX, 1 },
-        { "wxDC_GetTextForeground", _wrap_wxDC_GetTextForeground, 1 },
-        { "wxDC_GetFullTextExtent", _wrap_wxDC_GetFullTextExtent, 1 },
-        { "wxDC_GetTextExtent", _wrap_wxDC_GetTextExtent, 1 },
-        { "wxDC_GetTextBackground", _wrap_wxDC_GetTextBackground, 1 },
-        { "wxDC_GetSize", _wrap_wxDC_GetSize, 1 },
-        { "wxDC_GetSizeTuple", _wrap_wxDC_GetSizeTuple, 1 },
-        { "wxDC_GetPixel", _wrap_wxDC_GetPixel, 1 },
-        { "wxDC_GetPen", _wrap_wxDC_GetPen, 1 },
-        { "wxDC_GetOptimization", _wrap_wxDC_GetOptimization, 1 },
-        { "wxDC_GetMapMode", _wrap_wxDC_GetMapMode, 1 },
-        { "wxDC_GetLogicalFunction", _wrap_wxDC_GetLogicalFunction, 1 },
-        { "wxDC_GetFont", _wrap_wxDC_GetFont, 1 },
-        { "wxDC_GetClippingBox", _wrap_wxDC_GetClippingBox, 1 },
-        { "wxDC_GetCharWidth", _wrap_wxDC_GetCharWidth, 1 },
-        { "wxDC_GetCharHeight", _wrap_wxDC_GetCharHeight, 1 },
-        { "wxDC_GetBrush", _wrap_wxDC_GetBrush, 1 },
-        { "wxDC_GetBackground", _wrap_wxDC_GetBackground, 1 },
-        { "wxDC_FloodFill", _wrap_wxDC_FloodFill, 1 },
-        { "wxDC_EndPage", _wrap_wxDC_EndPage, 1 },
-        { "wxDC_EndDrawing", _wrap_wxDC_EndDrawing, 1 },
-        { "wxDC_EndDoc", _wrap_wxDC_EndDoc, 1 },
-        { "wxDC_DrawText", _wrap_wxDC_DrawText, 1 },
-        { "wxDC_DrawSpline", _wrap_wxDC_DrawSpline, 1 },
-        { "wxDC_DrawRoundedRectangle", _wrap_wxDC_DrawRoundedRectangle, 1 },
-        { "wxDC_DrawRectangle", _wrap_wxDC_DrawRectangle, 1 },
-        { "wxDC_DrawPoint", _wrap_wxDC_DrawPoint, 1 },
-        { "wxDC_DrawPolygon", _wrap_wxDC_DrawPolygon, 1 },
-        { "wxDC_DrawLines", _wrap_wxDC_DrawLines, 1 },
-        { "wxDC_DrawLine", _wrap_wxDC_DrawLine, 1 },
-        { "wxDC_DrawIcon", _wrap_wxDC_DrawIcon, 1 },
-        { "wxDC_DrawEllipticArc", _wrap_wxDC_DrawEllipticArc, 1 },
-        { "wxDC_DrawEllipse", _wrap_wxDC_DrawEllipse, 1 },
-        { "wxDC_DrawCircle", _wrap_wxDC_DrawCircle, 1 },
-        { "wxDC_DrawArc", _wrap_wxDC_DrawArc, 1 },
-        { "wxDC_DeviceToLogicalYRel", _wrap_wxDC_DeviceToLogicalYRel, 1 },
-        { "wxDC_DeviceToLogicalY", _wrap_wxDC_DeviceToLogicalY, 1 },
-        { "wxDC_DeviceToLogicalXRel", _wrap_wxDC_DeviceToLogicalXRel, 1 },
-        { "wxDC_DeviceToLogicalX", _wrap_wxDC_DeviceToLogicalX, 1 },
-        { "wxDC_DestroyClippingRegion", _wrap_wxDC_DestroyClippingRegion, 1 },
-        { "wxDC_CrossHair", _wrap_wxDC_CrossHair, 1 },
-        { "wxDC_Clear", _wrap_wxDC_Clear, 1 },
-        { "wxDC_Blit", _wrap_wxDC_Blit, 1 },
-        { "wxDC_BeginDrawing", _wrap_wxDC_BeginDrawing, 1 },
-        { "delete_wxDC", _wrap_delete_wxDC, 1 },
-        { "wxBrush_SetStyle", _wrap_wxBrush_SetStyle, 1 },
-        { "wxBrush_SetStipple", _wrap_wxBrush_SetStipple, 1 },
-        { "wxBrush_SetColour", _wrap_wxBrush_SetColour, 1 },
-        { "wxBrush_Ok", _wrap_wxBrush_Ok, 1 },
-        { "wxBrush_GetStyle", _wrap_wxBrush_GetStyle, 1 },
-        { "wxBrush_GetStipple", _wrap_wxBrush_GetStipple, 1 },
-        { "wxBrush_GetColour", _wrap_wxBrush_GetColour, 1 },
-        { "new_wxBrush", _wrap_new_wxBrush, 1 },
-        { "wxPen_SetStipple", _wrap_wxPen_SetStipple, 1 },
-        { "wxPen_SetDashes", _wrap_wxPen_SetDashes, 1 },
-        { "wxPen_GetStipple", _wrap_wxPen_GetStipple, 1 },
-        { "wxPen_GetDashes", _wrap_wxPen_GetDashes, 1 },
-        { "wxPen_SetWidth", _wrap_wxPen_SetWidth, 1 },
-        { "wxPen_SetStyle", _wrap_wxPen_SetStyle, 1 },
-        { "wxPen_SetJoin", _wrap_wxPen_SetJoin, 1 },
-        { "wxPen_SetColour", _wrap_wxPen_SetColour, 1 },
-        { "wxPen_SetCap", _wrap_wxPen_SetCap, 1 },
-        { "wxPen_Ok", _wrap_wxPen_Ok, 1 },
-        { "wxPen_GetWidth", _wrap_wxPen_GetWidth, 1 },
-        { "wxPen_GetStyle", _wrap_wxPen_GetStyle, 1 },
-        { "wxPen_GetJoin", _wrap_wxPen_GetJoin, 1 },
-        { "wxPen_GetColour", _wrap_wxPen_GetColour, 1 },
-        { "wxPen_GetCap", _wrap_wxPen_GetCap, 1 },
-        { "new_wxPen", _wrap_new_wxPen, 1 },
-        { "wxColour_Get", _wrap_wxColour_Get, 1 },
-        { "wxColour_Set", _wrap_wxColour_Set, 1 },
-        { "wxColour_Ok", _wrap_wxColour_Ok, 1 },
-        { "wxColour_Blue", _wrap_wxColour_Blue, 1 },
-        { "wxColour_Green", _wrap_wxColour_Green, 1 },
-        { "wxColour_Red", _wrap_wxColour_Red, 1 },
-        { "delete_wxColour", _wrap_delete_wxColour, 1 },
-        { "new_wxColour", _wrap_new_wxColour, 1 },
-        { "wxFont_SetWeight", _wrap_wxFont_SetWeight, 1 },
-        { "wxFont_SetUnderlined", _wrap_wxFont_SetUnderlined, 1 },
-        { "wxFont_SetStyle", _wrap_wxFont_SetStyle, 1 },
-        { "wxFont_SetPointSize", _wrap_wxFont_SetPointSize, 1 },
-        { "wxFont_SetFamily", _wrap_wxFont_SetFamily, 1 },
-        { "wxFont_SetFaceName", _wrap_wxFont_SetFaceName, 1 },
-        { "wxFont_GetWeight", _wrap_wxFont_GetWeight, 1 },
-        { "wxFont_GetUnderlined", _wrap_wxFont_GetUnderlined, 1 },
-        { "wxFont_GetStyle", _wrap_wxFont_GetStyle, 1 },
-        { "wxFont_GetPointSize", _wrap_wxFont_GetPointSize, 1 },
-        { "wxFont_GetFontId", _wrap_wxFont_GetFontId, 1 },
-        { "wxFont_GetFamily", _wrap_wxFont_GetFamily, 1 },
-        { "wxFont_GetFaceName", _wrap_wxFont_GetFaceName, 1 },
-        { "new_wxFont", _wrap_new_wxFont, 1 },
-        { "wxCursor_Ok", _wrap_wxCursor_Ok, 1 },
-        { "delete_wxCursor", _wrap_delete_wxCursor, 1 },
-        { "new_wxCursor", _wrap_new_wxCursor, 1 },
-        { "wxIcon_SetWidth", _wrap_wxIcon_SetWidth, 1 },
-        { "wxIcon_SetHeight", _wrap_wxIcon_SetHeight, 1 },
-        { "wxIcon_SetDepth", _wrap_wxIcon_SetDepth, 1 },
-        { "wxIcon_Ok", _wrap_wxIcon_Ok, 1 },
-        { "wxIcon_LoadFile", _wrap_wxIcon_LoadFile, 1 },
-        { "wxIcon_GetWidth", _wrap_wxIcon_GetWidth, 1 },
-        { "wxIcon_GetHeight", _wrap_wxIcon_GetHeight, 1 },
-        { "wxIcon_GetDepth", _wrap_wxIcon_GetDepth, 1 },
-        { "delete_wxIcon", _wrap_delete_wxIcon, 1 },
-        { "new_wxIcon", _wrap_new_wxIcon, 1 },
-        { "delete_wxMask", _wrap_delete_wxMask, 1 },
-        { "new_wxMask", _wrap_new_wxMask, 1 },
-        { "wxBitmap_SetWidth", _wrap_wxBitmap_SetWidth, 1 },
-        { "wxBitmap_SetPalette", _wrap_wxBitmap_SetPalette, 1 },
-        { "wxBitmap_SetMask", _wrap_wxBitmap_SetMask, 1 },
-        { "wxBitmap_SetHeight", _wrap_wxBitmap_SetHeight, 1 },
-        { "wxBitmap_SetDepth", _wrap_wxBitmap_SetDepth, 1 },
-        { "wxBitmap_SaveFile", _wrap_wxBitmap_SaveFile, 1 },
-        { "wxBitmap_Ok", _wrap_wxBitmap_Ok, 1 },
-        { "wxBitmap_LoadFile", _wrap_wxBitmap_LoadFile, 1 },
-        { "wxBitmap_GetWidth", _wrap_wxBitmap_GetWidth, 1 },
-        { "wxBitmap_GetMask", _wrap_wxBitmap_GetMask, 1 },
-        { "wxBitmap_GetPalette", _wrap_wxBitmap_GetPalette, 1 },
-        { "wxBitmap_GetHeight", _wrap_wxBitmap_GetHeight, 1 },
-        { "wxBitmap_GetDepth", _wrap_wxBitmap_GetDepth, 1 },
-        { "wxBitmap_Create", _wrap_wxBitmap_Create, 1 },
-        { "delete_wxBitmap", _wrap_delete_wxBitmap, 1 },
-        { "new_wxBitmap", _wrap_new_wxBitmap, 1 },
-        { "wxMemoryDCFromDC", _wrap_wxMemoryDCFromDC, 1 },
-        { "wxNamedColour", _wrap_wxNamedColour, 1 },
-        { "wxStockCursor", _wrap_wxStockCursor, 1 },
-        { "wxMaskColour", _wrap_wxMaskColour, 1 },
-        { "wxBitmapFromData", _wrap_wxBitmapFromData, 1 },
-        { "wxNoRefBitmap", _wrap_wxNoRefBitmap, 1 },
-        { "wxEmptyBitmap", _wrap_wxEmptyBitmap, 1 },
+        { "wxImageList_RemoveAll", _wrap_wxImageList_RemoveAll, METH_VARARGS },
+        { "wxImageList_Remove", _wrap_wxImageList_Remove, METH_VARARGS },
+        { "wxImageList_GetImageCount", _wrap_wxImageList_GetImageCount, METH_VARARGS },
+        { "wxImageList_Draw", _wrap_wxImageList_Draw, METH_VARARGS },
+        { "wxImageList_ReplaceIcon", _wrap_wxImageList_ReplaceIcon, METH_VARARGS },
+        { "wxImageList_Replace", _wrap_wxImageList_Replace, METH_VARARGS },
+        { "wxImageList_AddIcon", _wrap_wxImageList_AddIcon, METH_VARARGS },
+        { "wxImageList_AddWithColourMask", _wrap_wxImageList_AddWithColourMask, METH_VARARGS },
+        { "wxImageList_Add", _wrap_wxImageList_Add, METH_VARARGS },
+        { "delete_wxImageList", _wrap_delete_wxImageList, METH_VARARGS },
+        { "new_wxImageList", _wrap_new_wxImageList, METH_VARARGS },
+        { "wxPalette_Ok", _wrap_wxPalette_Ok, METH_VARARGS },
+        { "wxPalette_GetRGB", _wrap_wxPalette_GetRGB, METH_VARARGS },
+        { "wxPalette_GetPixel", _wrap_wxPalette_GetPixel, METH_VARARGS },
+        { "delete_wxPalette", _wrap_delete_wxPalette, METH_VARARGS },
+        { "new_wxPalette", _wrap_new_wxPalette, METH_VARARGS },
+        { "wxMetaFileDC_Close", _wrap_wxMetaFileDC_Close, METH_VARARGS },
+        { "new_wxMetaFileDC", _wrap_new_wxMetaFileDC, METH_VARARGS },
+        { "new_wxPrinterDC", _wrap_new_wxPrinterDC, METH_VARARGS },
+        { "new_wxWindowDC", _wrap_new_wxWindowDC, METH_VARARGS },
+        { "new_wxPaintDC", _wrap_new_wxPaintDC, METH_VARARGS },
+        { "new_wxClientDC", _wrap_new_wxClientDC, METH_VARARGS },
+        { "wxScreenDC_EndDrawingOnTop", _wrap_wxScreenDC_EndDrawingOnTop, METH_VARARGS },
+        { "wxScreenDC_StartDrawingOnTopRect", _wrap_wxScreenDC_StartDrawingOnTopRect, METH_VARARGS },
+        { "wxScreenDC_StartDrawingOnTop", _wrap_wxScreenDC_StartDrawingOnTop, METH_VARARGS },
+        { "new_wxScreenDC", _wrap_new_wxScreenDC, METH_VARARGS },
+        { "wxMemoryDC_SelectObject", _wrap_wxMemoryDC_SelectObject, METH_VARARGS },
+        { "new_wxMemoryDC", _wrap_new_wxMemoryDC, METH_VARARGS },
+        { "wxDC_DrawBitmap", _wrap_wxDC_DrawBitmap, METH_VARARGS },
+        { "wxDC_StartPage", _wrap_wxDC_StartPage, METH_VARARGS },
+        { "wxDC_StartDoc", _wrap_wxDC_StartDoc, METH_VARARGS },
+        { "wxDC_SetUserScale", _wrap_wxDC_SetUserScale, METH_VARARGS },
+        { "wxDC_SetTextForeground", _wrap_wxDC_SetTextForeground, METH_VARARGS },
+        { "wxDC_SetTextBackground", _wrap_wxDC_SetTextBackground, METH_VARARGS },
+        { "wxDC_SetPen", _wrap_wxDC_SetPen, METH_VARARGS },
+        { "wxDC_SetOptimization", _wrap_wxDC_SetOptimization, METH_VARARGS },
+        { "wxDC_SetMapMode", _wrap_wxDC_SetMapMode, METH_VARARGS },
+        { "wxDC_SetLogicalFunction", _wrap_wxDC_SetLogicalFunction, METH_VARARGS },
+        { "wxDC_SetFont", _wrap_wxDC_SetFont, METH_VARARGS },
+        { "wxDC_SetBrush", _wrap_wxDC_SetBrush, METH_VARARGS },
+        { "wxDC_SetPalette", _wrap_wxDC_SetPalette, METH_VARARGS },
+        { "wxDC_SetClippingRegion", _wrap_wxDC_SetClippingRegion, METH_VARARGS },
+        { "wxDC_SetBackgroundMode", _wrap_wxDC_SetBackgroundMode, METH_VARARGS },
+        { "wxDC_SetBackground", _wrap_wxDC_SetBackground, METH_VARARGS },
+        { "wxDC_SetDeviceOrigin", _wrap_wxDC_SetDeviceOrigin, METH_VARARGS },
+        { "wxDC_Ok", _wrap_wxDC_Ok, METH_VARARGS },
+        { "wxDC_MinY", _wrap_wxDC_MinY, METH_VARARGS },
+        { "wxDC_MinX", _wrap_wxDC_MinX, METH_VARARGS },
+        { "wxDC_MaxY", _wrap_wxDC_MaxY, METH_VARARGS },
+        { "wxDC_MaxX", _wrap_wxDC_MaxX, METH_VARARGS },
+        { "wxDC_LogicalToDeviceYRel", _wrap_wxDC_LogicalToDeviceYRel, METH_VARARGS },
+        { "wxDC_LogicalToDeviceY", _wrap_wxDC_LogicalToDeviceY, METH_VARARGS },
+        { "wxDC_LogicalToDeviceXRel", _wrap_wxDC_LogicalToDeviceXRel, METH_VARARGS },
+        { "wxDC_LogicalToDeviceX", _wrap_wxDC_LogicalToDeviceX, METH_VARARGS },
+        { "wxDC_GetTextForeground", _wrap_wxDC_GetTextForeground, METH_VARARGS },
+        { "wxDC_GetFullTextExtent", _wrap_wxDC_GetFullTextExtent, METH_VARARGS },
+        { "wxDC_GetTextExtent", _wrap_wxDC_GetTextExtent, METH_VARARGS },
+        { "wxDC_GetTextBackground", _wrap_wxDC_GetTextBackground, METH_VARARGS },
+        { "wxDC_GetSize", _wrap_wxDC_GetSize, METH_VARARGS },
+        { "wxDC_GetSizeTuple", _wrap_wxDC_GetSizeTuple, METH_VARARGS },
+        { "wxDC_GetPixel", _wrap_wxDC_GetPixel, METH_VARARGS },
+        { "wxDC_GetPen", _wrap_wxDC_GetPen, METH_VARARGS },
+        { "wxDC_GetOptimization", _wrap_wxDC_GetOptimization, METH_VARARGS },
+        { "wxDC_GetMapMode", _wrap_wxDC_GetMapMode, METH_VARARGS },
+        { "wxDC_GetLogicalFunction", _wrap_wxDC_GetLogicalFunction, METH_VARARGS },
+        { "wxDC_GetFont", _wrap_wxDC_GetFont, METH_VARARGS },
+        { "wxDC_GetClippingBox", _wrap_wxDC_GetClippingBox, METH_VARARGS },
+        { "wxDC_GetCharWidth", _wrap_wxDC_GetCharWidth, METH_VARARGS },
+        { "wxDC_GetCharHeight", _wrap_wxDC_GetCharHeight, METH_VARARGS },
+        { "wxDC_GetBrush", _wrap_wxDC_GetBrush, METH_VARARGS },
+        { "wxDC_GetBackground", _wrap_wxDC_GetBackground, METH_VARARGS },
+        { "wxDC_FloodFill", _wrap_wxDC_FloodFill, METH_VARARGS },
+        { "wxDC_EndPage", _wrap_wxDC_EndPage, METH_VARARGS },
+        { "wxDC_EndDrawing", _wrap_wxDC_EndDrawing, METH_VARARGS },
+        { "wxDC_EndDoc", _wrap_wxDC_EndDoc, METH_VARARGS },
+        { "wxDC_DrawText", _wrap_wxDC_DrawText, METH_VARARGS },
+        { "wxDC_DrawSpline", _wrap_wxDC_DrawSpline, METH_VARARGS },
+        { "wxDC_DrawRoundedRectangle", _wrap_wxDC_DrawRoundedRectangle, METH_VARARGS },
+        { "wxDC_DrawRectangle", _wrap_wxDC_DrawRectangle, METH_VARARGS },
+        { "wxDC_DrawPoint", _wrap_wxDC_DrawPoint, METH_VARARGS },
+        { "wxDC_DrawPolygon", _wrap_wxDC_DrawPolygon, METH_VARARGS },
+        { "wxDC_DrawLines", _wrap_wxDC_DrawLines, METH_VARARGS },
+        { "wxDC_DrawLine", _wrap_wxDC_DrawLine, METH_VARARGS },
+        { "wxDC_DrawIcon", _wrap_wxDC_DrawIcon, METH_VARARGS },
+        { "wxDC_DrawEllipticArc", _wrap_wxDC_DrawEllipticArc, METH_VARARGS },
+        { "wxDC_DrawEllipse", _wrap_wxDC_DrawEllipse, METH_VARARGS },
+        { "wxDC_DrawCircle", _wrap_wxDC_DrawCircle, METH_VARARGS },
+        { "wxDC_DrawArc", _wrap_wxDC_DrawArc, METH_VARARGS },
+        { "wxDC_DeviceToLogicalYRel", _wrap_wxDC_DeviceToLogicalYRel, METH_VARARGS },
+        { "wxDC_DeviceToLogicalY", _wrap_wxDC_DeviceToLogicalY, METH_VARARGS },
+        { "wxDC_DeviceToLogicalXRel", _wrap_wxDC_DeviceToLogicalXRel, METH_VARARGS },
+        { "wxDC_DeviceToLogicalX", _wrap_wxDC_DeviceToLogicalX, METH_VARARGS },
+        { "wxDC_DestroyClippingRegion", _wrap_wxDC_DestroyClippingRegion, METH_VARARGS },
+        { "wxDC_CrossHair", _wrap_wxDC_CrossHair, METH_VARARGS },
+        { "wxDC_Clear", _wrap_wxDC_Clear, METH_VARARGS },
+        { "wxDC_Blit", _wrap_wxDC_Blit, METH_VARARGS },
+        { "wxDC_BeginDrawing", _wrap_wxDC_BeginDrawing, METH_VARARGS },
+        { "delete_wxDC", _wrap_delete_wxDC, METH_VARARGS },
+        { "wxBrush_SetStyle", _wrap_wxBrush_SetStyle, METH_VARARGS },
+        { "wxBrush_SetStipple", _wrap_wxBrush_SetStipple, METH_VARARGS },
+        { "wxBrush_SetColour", _wrap_wxBrush_SetColour, METH_VARARGS },
+        { "wxBrush_Ok", _wrap_wxBrush_Ok, METH_VARARGS },
+        { "wxBrush_GetStyle", _wrap_wxBrush_GetStyle, METH_VARARGS },
+        { "wxBrush_GetStipple", _wrap_wxBrush_GetStipple, METH_VARARGS },
+        { "wxBrush_GetColour", _wrap_wxBrush_GetColour, METH_VARARGS },
+        { "new_wxBrush", _wrap_new_wxBrush, METH_VARARGS },
+        { "wxPen_SetStipple", _wrap_wxPen_SetStipple, METH_VARARGS },
+        { "wxPen_SetDashes", _wrap_wxPen_SetDashes, METH_VARARGS },
+        { "wxPen_GetStipple", _wrap_wxPen_GetStipple, METH_VARARGS },
+        { "wxPen_GetDashes", _wrap_wxPen_GetDashes, METH_VARARGS },
+        { "wxPen_SetWidth", _wrap_wxPen_SetWidth, METH_VARARGS },
+        { "wxPen_SetStyle", _wrap_wxPen_SetStyle, METH_VARARGS },
+        { "wxPen_SetJoin", _wrap_wxPen_SetJoin, METH_VARARGS },
+        { "wxPen_SetColour", _wrap_wxPen_SetColour, METH_VARARGS },
+        { "wxPen_SetCap", _wrap_wxPen_SetCap, METH_VARARGS },
+        { "wxPen_Ok", _wrap_wxPen_Ok, METH_VARARGS },
+        { "wxPen_GetWidth", _wrap_wxPen_GetWidth, METH_VARARGS },
+        { "wxPen_GetStyle", _wrap_wxPen_GetStyle, METH_VARARGS },
+        { "wxPen_GetJoin", _wrap_wxPen_GetJoin, METH_VARARGS },
+        { "wxPen_GetColour", _wrap_wxPen_GetColour, METH_VARARGS },
+        { "wxPen_GetCap", _wrap_wxPen_GetCap, METH_VARARGS },
+        { "new_wxPen", _wrap_new_wxPen, METH_VARARGS },
+        { "wxColour_Get", _wrap_wxColour_Get, METH_VARARGS },
+        { "wxColour_Set", _wrap_wxColour_Set, METH_VARARGS },
+        { "wxColour_Ok", _wrap_wxColour_Ok, METH_VARARGS },
+        { "wxColour_Blue", _wrap_wxColour_Blue, METH_VARARGS },
+        { "wxColour_Green", _wrap_wxColour_Green, METH_VARARGS },
+        { "wxColour_Red", _wrap_wxColour_Red, METH_VARARGS },
+        { "delete_wxColour", _wrap_delete_wxColour, METH_VARARGS },
+        { "new_wxColour", _wrap_new_wxColour, METH_VARARGS },
+        { "wxFont_SetWeight", _wrap_wxFont_SetWeight, METH_VARARGS },
+        { "wxFont_SetUnderlined", _wrap_wxFont_SetUnderlined, METH_VARARGS },
+        { "wxFont_SetStyle", _wrap_wxFont_SetStyle, METH_VARARGS },
+        { "wxFont_SetPointSize", _wrap_wxFont_SetPointSize, METH_VARARGS },
+        { "wxFont_SetFamily", _wrap_wxFont_SetFamily, METH_VARARGS },
+        { "wxFont_SetFaceName", _wrap_wxFont_SetFaceName, METH_VARARGS },
+        { "wxFont_GetWeight", _wrap_wxFont_GetWeight, METH_VARARGS },
+        { "wxFont_GetUnderlined", _wrap_wxFont_GetUnderlined, METH_VARARGS },
+        { "wxFont_GetStyle", _wrap_wxFont_GetStyle, METH_VARARGS },
+        { "wxFont_GetPointSize", _wrap_wxFont_GetPointSize, METH_VARARGS },
+        { "wxFont_GetFontId", _wrap_wxFont_GetFontId, METH_VARARGS },
+        { "wxFont_GetFamily", _wrap_wxFont_GetFamily, METH_VARARGS },
+        { "wxFont_GetFaceName", _wrap_wxFont_GetFaceName, METH_VARARGS },
+        { "new_wxFont", _wrap_new_wxFont, METH_VARARGS },
+        { "wxCursor_Ok", _wrap_wxCursor_Ok, METH_VARARGS },
+        { "delete_wxCursor", _wrap_delete_wxCursor, METH_VARARGS },
+        { "new_wxCursor", _wrap_new_wxCursor, METH_VARARGS },
+        { "wxIcon_SetWidth", _wrap_wxIcon_SetWidth, METH_VARARGS },
+        { "wxIcon_SetHeight", _wrap_wxIcon_SetHeight, METH_VARARGS },
+        { "wxIcon_SetDepth", _wrap_wxIcon_SetDepth, METH_VARARGS },
+        { "wxIcon_Ok", _wrap_wxIcon_Ok, METH_VARARGS },
+        { "wxIcon_LoadFile", _wrap_wxIcon_LoadFile, METH_VARARGS },
+        { "wxIcon_GetWidth", _wrap_wxIcon_GetWidth, METH_VARARGS },
+        { "wxIcon_GetHeight", _wrap_wxIcon_GetHeight, METH_VARARGS },
+        { "wxIcon_GetDepth", _wrap_wxIcon_GetDepth, METH_VARARGS },
+        { "delete_wxIcon", _wrap_delete_wxIcon, METH_VARARGS },
+        { "new_wxIcon", _wrap_new_wxIcon, METH_VARARGS },
+        { "delete_wxMask", _wrap_delete_wxMask, METH_VARARGS },
+        { "new_wxMask", _wrap_new_wxMask, METH_VARARGS },
+        { "wxBitmap_SetWidth", _wrap_wxBitmap_SetWidth, METH_VARARGS },
+        { "wxBitmap_SetPalette", _wrap_wxBitmap_SetPalette, METH_VARARGS },
+        { "wxBitmap_SetMask", _wrap_wxBitmap_SetMask, METH_VARARGS },
+        { "wxBitmap_SetHeight", _wrap_wxBitmap_SetHeight, METH_VARARGS },
+        { "wxBitmap_SetDepth", _wrap_wxBitmap_SetDepth, METH_VARARGS },
+        { "wxBitmap_SaveFile", _wrap_wxBitmap_SaveFile, METH_VARARGS },
+        { "wxBitmap_Ok", _wrap_wxBitmap_Ok, METH_VARARGS },
+        { "wxBitmap_LoadFile", _wrap_wxBitmap_LoadFile, METH_VARARGS },
+        { "wxBitmap_GetWidth", _wrap_wxBitmap_GetWidth, METH_VARARGS },
+        { "wxBitmap_GetMask", _wrap_wxBitmap_GetMask, METH_VARARGS },
+        { "wxBitmap_GetPalette", _wrap_wxBitmap_GetPalette, METH_VARARGS },
+        { "wxBitmap_GetHeight", _wrap_wxBitmap_GetHeight, METH_VARARGS },
+        { "wxBitmap_GetDepth", _wrap_wxBitmap_GetDepth, METH_VARARGS },
+        { "wxBitmap_Create", _wrap_wxBitmap_Create, METH_VARARGS },
+        { "delete_wxBitmap", _wrap_delete_wxBitmap, METH_VARARGS },
+        { "new_wxBitmap", _wrap_new_wxBitmap, METH_VARARGS },
+        { "wxMemoryDCFromDC", _wrap_wxMemoryDCFromDC, METH_VARARGS },
+        { "wxNamedColour", _wrap_wxNamedColour, METH_VARARGS },
+        { "wxStockCursor", _wrap_wxStockCursor, METH_VARARGS },
+        { "wxMaskColour", _wrap_wxMaskColour, METH_VARARGS },
+        { "wxBitmapFromData", _wrap_wxBitmapFromData, METH_VARARGS },
+        { "wxNoRefBitmap", _wrap_wxNoRefBitmap, METH_VARARGS },
+        { "wxEmptyBitmap", _wrap_wxEmptyBitmap, METH_VARARGS },

         { NULL, NULL }
 };
         { NULL, NULL }
 };

+#ifdef __cplusplus
+}
+#endif
+/*
+ * This table is used by the pointer type-checker
+ */
+static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
+    { "_wxAcceleratorTable","_class_wxAcceleratorTable",0},
+    { "_signed_long","_long",0},
+    { "_wxPrintQuality","_int",0},
+    { "_wxPrintQuality","_signed_int",0},
+    { "_wxPrintQuality","_unsigned_int",0},
+    { "_wxPrintQuality","_wxWindowID",0},
+    { "_wxPrintQuality","_uint",0},
+    { "_wxPrintQuality","_EBool",0},
+    { "_wxPrintQuality","_size_t",0},
+    { "_class_wxRegionIterator","_wxRegionIterator",0},
+    { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
+    { "_wxCursor","_class_wxCursor",0},
+    { "_wxMask","_class_wxMask",0},
+    { "_wxPen","_class_wxPen",0},
+    { "_byte","_unsigned_char",0},
+    { "_long","_wxDash",0},
+    { "_long","_unsigned_long",0},
+    { "_long","_signed_long",0},
+    { "_wxImageList","_class_wxImageList",0},
+    { "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
+    { "_wxDC","_class_wxMetaFileDC",SwigwxMetaFileDCTowxDC},
+    { "_wxDC","_wxMetaFileDC",SwigwxMetaFileDCTowxDC},
+    { "_wxDC","_class_wxPrinterDC",SwigwxPrinterDCTowxDC},
+    { "_wxDC","_wxPrinterDC",SwigwxPrinterDCTowxDC},
+    { "_wxDC","_class_wxWindowDC",SwigwxWindowDCTowxDC},
+    { "_wxDC","_wxWindowDC",SwigwxWindowDCTowxDC},
+    { "_wxDC","_class_wxPaintDC",SwigwxPaintDCTowxDC},
+    { "_wxDC","_wxPaintDC",SwigwxPaintDCTowxDC},
+    { "_wxDC","_class_wxClientDC",SwigwxClientDCTowxDC},
+    { "_wxDC","_wxClientDC",SwigwxClientDCTowxDC},
+    { "_wxDC","_class_wxScreenDC",SwigwxScreenDCTowxDC},
+    { "_wxDC","_wxScreenDC",SwigwxScreenDCTowxDC},
+    { "_wxDC","_class_wxMemoryDC",SwigwxMemoryDCTowxDC},
+    { "_wxDC","_wxMemoryDC",SwigwxMemoryDCTowxDC},
+    { "_wxDC","_class_wxDC",0},
+    { "_size_t","_wxPrintQuality",0},
+    { "_size_t","_unsigned_int",0},
+    { "_size_t","_int",0},
+    { "_size_t","_wxWindowID",0},
+    { "_size_t","_uint",0},
+    { "_class_wxRealPoint","_wxRealPoint",0},
+    { "_wxPrinterDC","_class_wxPrinterDC",0},
+    { "_class_wxMask","_wxMask",0},
+    { "_wxColour","_class_wxColour",0},
+    { "_wxBrush","_class_wxBrush",0},
+    { "_uint","_wxPrintQuality",0},
+    { "_uint","_size_t",0},
+    { "_uint","_unsigned_int",0},
+    { "_uint","_int",0},
+    { "_uint","_wxWindowID",0},
+    { "_wxRect","_class_wxRect",0},
+    { "_wxPoint","_class_wxPoint",0},
+    { "_wxBitmap","_class_wxCursor",SwigwxCursorTowxBitmap},
+    { "_wxBitmap","_wxCursor",SwigwxCursorTowxBitmap},
+    { "_wxBitmap","_class_wxIcon",SwigwxIconTowxBitmap},
+    { "_wxBitmap","_wxIcon",SwigwxIconTowxBitmap},
+    { "_wxBitmap","_class_wxBitmap",0},
+    { "_wxPyTimer","_class_wxPyTimer",0},
+    { "_wxWindowDC","_class_wxWindowDC",0},
+    { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
+    { "_EBool","_wxPrintQuality",0},
+    { "_EBool","_signed_int",0},
+    { "_EBool","_int",0},
+    { "_EBool","_wxWindowID",0},
+    { "_class_wxRegion","_wxRegion",0},
+    { "_wxFont","_class_wxFont",0},
+    { "_unsigned_long","_wxDash",0},
+    { "_unsigned_long","_long",0},
+    { "_class_wxRect","_wxRect",0},
+    { "_class_wxDC","_class_wxMetaFileDC",SwigwxMetaFileDCTowxDC},
+    { "_class_wxDC","_wxMetaFileDC",SwigwxMetaFileDCTowxDC},
+    { "_class_wxDC","_class_wxPrinterDC",SwigwxPrinterDCTowxDC},
+    { "_class_wxDC","_wxPrinterDC",SwigwxPrinterDCTowxDC},
+    { "_class_wxDC","_class_wxWindowDC",SwigwxWindowDCTowxDC},
+    { "_class_wxDC","_wxWindowDC",SwigwxWindowDCTowxDC},
+    { "_class_wxDC","_class_wxPaintDC",SwigwxPaintDCTowxDC},
+    { "_class_wxDC","_wxPaintDC",SwigwxPaintDCTowxDC},
+    { "_class_wxDC","_class_wxClientDC",SwigwxClientDCTowxDC},
+    { "_class_wxDC","_wxClientDC",SwigwxClientDCTowxDC},
+    { "_class_wxDC","_class_wxScreenDC",SwigwxScreenDCTowxDC},
+    { "_class_wxDC","_wxScreenDC",SwigwxScreenDCTowxDC},
+    { "_class_wxDC","_class_wxMemoryDC",SwigwxMemoryDCTowxDC},
+    { "_class_wxDC","_wxMemoryDC",SwigwxMemoryDCTowxDC},
+    { "_class_wxDC","_wxDC",0},
+    { "_class_wxPyTimer","_wxPyTimer",0},
+    { "_wxAcceleratorEntry","_class_wxAcceleratorEntry",0},
+    { "_signed_int","_wxPrintQuality",0},
+    { "_signed_int","_EBool",0},
+    { "_signed_int","_wxWindowID",0},
+    { "_signed_int","_int",0},
+    { "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
+    { "_wxMetaFileDC","_class_wxMetaFileDC",0},
+    { "_wxScreenDC","_class_wxScreenDC",0},
+    { "_WXTYPE","_short",0},
+    { "_WXTYPE","_signed_short",0},
+    { "_WXTYPE","_unsigned_short",0},
+    { "_class_wxBrush","_wxBrush",0},
+    { "_unsigned_short","_WXTYPE",0},
+    { "_unsigned_short","_short",0},
+    { "_class_wxFont","_wxFont",0},
+    { "_wxClientDC","_class_wxClientDC",0},
+    { "_class_wxPoint","_wxPoint",0},
+    { "_wxRealPoint","_class_wxRealPoint",0},
+    { "_signed_short","_WXTYPE",0},
+    { "_signed_short","_short",0},
+    { "_wxMemoryDC","_class_wxMemoryDC",0},
+    { "_wxPaintDC","_class_wxPaintDC",0},
+    { "_class_wxWindowDC","_wxWindowDC",0},
+    { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
+    { "_class_wxCursor","_wxCursor",0},
+    { "_unsigned_char","_byte",0},
+    { "_class_wxMetaFileDC","_wxMetaFileDC",0},
+    { "_unsigned_int","_wxPrintQuality",0},
+    { "_unsigned_int","_size_t",0},
+    { "_unsigned_int","_uint",0},
+    { "_unsigned_int","_wxWindowID",0},
+    { "_unsigned_int","_int",0},
+    { "_wxIcon","_class_wxIcon",0},
+    { "_class_wxPen","_wxPen",0},
+    { "_short","_WXTYPE",0},
+    { "_short","_unsigned_short",0},
+    { "_short","_signed_short",0},
+    { "_class_wxImageList","_wxImageList",0},
+    { "_wxWindowID","_wxPrintQuality",0},
+    { "_wxWindowID","_size_t",0},
+    { "_wxWindowID","_EBool",0},
+    { "_wxWindowID","_uint",0},
+    { "_wxWindowID","_int",0},
+    { "_wxWindowID","_signed_int",0},
+    { "_wxWindowID","_unsigned_int",0},
+    { "_int","_wxPrintQuality",0},
+    { "_int","_size_t",0},
+    { "_int","_EBool",0},
+    { "_int","_uint",0},
+    { "_int","_wxWindowID",0},
+    { "_int","_unsigned_int",0},
+    { "_int","_signed_int",0},
+    { "_wxSize","_class_wxSize",0},
+    { "_wxRegionIterator","_class_wxRegionIterator",0},
+    { "_class_wxPrinterDC","_wxPrinterDC",0},
+    { "_class_wxPaintDC","_wxPaintDC",0},
+    { "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
+    { "_class_wxIcon","_wxIcon",0},
+    { "_class_wxColour","_wxColour",0},
+    { "_class_wxScreenDC","_wxScreenDC",0},
+    { "_wxPalette","_class_wxPalette",0},
+    { "_wxRegion","_class_wxRegion",0},
+    { "_class_wxClientDC","_wxClientDC",0},
+    { "_class_wxSize","_wxSize",0},
+    { "_class_wxBitmap","_class_wxCursor",SwigwxCursorTowxBitmap},
+    { "_class_wxBitmap","_wxCursor",SwigwxCursorTowxBitmap},
+    { "_class_wxBitmap","_class_wxIcon",SwigwxIconTowxBitmap},
+    { "_class_wxBitmap","_wxIcon",SwigwxIconTowxBitmap},
+    { "_class_wxBitmap","_wxBitmap",0},
+    { "_class_wxMemoryDC","_wxMemoryDC",0},
+    { "_wxDash","_unsigned_long",0},
+    { "_wxDash","_long",0},
+    { "_class_wxPalette","_wxPalette",0},
+{0,0,0}};
+

 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif
 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif

-SWIGEXPORT(void,initgdic)() {
+SWIGEXPORT(void) initgdic() {

         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("gdic", gdicMethods);
         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("gdic", gdicMethods);


@@ -6594,166 +7157,9 @@ SWIGEXPORT(void,initgdic)() {
         PyDict_SetItemString(d,"wxIMAGE_LIST_NORMAL", PyInt_FromLong((long) wxIMAGE_LIST_NORMAL));
         PyDict_SetItemString(d,"wxIMAGE_LIST_SMALL", PyInt_FromLong((long) wxIMAGE_LIST_SMALL));
         PyDict_SetItemString(d,"wxIMAGE_LIST_STATE", PyInt_FromLong((long) wxIMAGE_LIST_STATE));
         PyDict_SetItemString(d,"wxIMAGE_LIST_NORMAL", PyInt_FromLong((long) wxIMAGE_LIST_NORMAL));
         PyDict_SetItemString(d,"wxIMAGE_LIST_SMALL", PyInt_FromLong((long) wxIMAGE_LIST_SMALL));
         PyDict_SetItemString(d,"wxIMAGE_LIST_STATE", PyInt_FromLong((long) wxIMAGE_LIST_STATE));

-/*
- * These are the pointer type-equivalency mappings. 
- * (Used by the SWIG pointer type-checker).
- */
-        SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_signed_long","_long",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_signed_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_unsigned_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_wxWindowID",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_uint",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_EBool",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_size_t",0);
-        SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
-        SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
-        SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
-        SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
-        SWIG_RegisterMapping("_byte","_unsigned_char",0);
-        SWIG_RegisterMapping("_long","_wxDash",0);
-        SWIG_RegisterMapping("_long","_unsigned_long",0);
-        SWIG_RegisterMapping("_long","_signed_long",0);
-        SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_wxDC","_class_wxMetaFileDC",SwigwxMetaFileDCTowxDC);
-        SWIG_RegisterMapping("_wxDC","_wxMetaFileDC",SwigwxMetaFileDCTowxDC);
-        SWIG_RegisterMapping("_wxDC","_class_wxPrinterDC",SwigwxPrinterDCTowxDC);
-        SWIG_RegisterMapping("_wxDC","_wxPrinterDC",SwigwxPrinterDCTowxDC);
-        SWIG_RegisterMapping("_wxDC","_class_wxWindowDC",SwigwxWindowDCTowxDC);
-        SWIG_RegisterMapping("_wxDC","_wxWindowDC",SwigwxWindowDCTowxDC);
-        SWIG_RegisterMapping("_wxDC","_class_wxPaintDC",SwigwxPaintDCTowxDC);
-        SWIG_RegisterMapping("_wxDC","_wxPaintDC",SwigwxPaintDCTowxDC);
-        SWIG_RegisterMapping("_wxDC","_class_wxClientDC",SwigwxClientDCTowxDC);
-        SWIG_RegisterMapping("_wxDC","_wxClientDC",SwigwxClientDCTowxDC);
-        SWIG_RegisterMapping("_wxDC","_class_wxScreenDC",SwigwxScreenDCTowxDC);
-        SWIG_RegisterMapping("_wxDC","_wxScreenDC",SwigwxScreenDCTowxDC);
-        SWIG_RegisterMapping("_wxDC","_class_wxMemoryDC",SwigwxMemoryDCTowxDC);
-        SWIG_RegisterMapping("_wxDC","_wxMemoryDC",SwigwxMemoryDCTowxDC);
-        SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
-        SWIG_RegisterMapping("_size_t","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_size_t","_unsigned_int",0);
-        SWIG_RegisterMapping("_size_t","_int",0);
-        SWIG_RegisterMapping("_size_t","_wxWindowID",0);
-        SWIG_RegisterMapping("_size_t","_uint",0);
-        SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
-        SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0);
-        SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
-        SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
-        SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
-        SWIG_RegisterMapping("_uint","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_uint","_size_t",0);
-        SWIG_RegisterMapping("_uint","_unsigned_int",0);
-        SWIG_RegisterMapping("_uint","_int",0);
-        SWIG_RegisterMapping("_uint","_wxWindowID",0);
-        SWIG_RegisterMapping("_wxRect","_class_wxRect",0);
-        SWIG_RegisterMapping("_wxPoint","_class_wxPoint",0);
-        SWIG_RegisterMapping("_wxBitmap","_class_wxCursor",SwigwxCursorTowxBitmap);
-        SWIG_RegisterMapping("_wxBitmap","_wxCursor",SwigwxCursorTowxBitmap);
-        SWIG_RegisterMapping("_wxBitmap","_class_wxIcon",SwigwxIconTowxBitmap);
-        SWIG_RegisterMapping("_wxBitmap","_wxIcon",SwigwxIconTowxBitmap);
-        SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
-        SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0);
-        SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_EBool","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_EBool","_signed_int",0);
-        SWIG_RegisterMapping("_EBool","_int",0);
-        SWIG_RegisterMapping("_EBool","_wxWindowID",0);
-        SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
-        SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
-        SWIG_RegisterMapping("_unsigned_long","_wxDash",0);
-        SWIG_RegisterMapping("_unsigned_long","_long",0);
-        SWIG_RegisterMapping("_class_wxRect","_wxRect",0);
-        SWIG_RegisterMapping("_class_wxDC","_class_wxMetaFileDC",SwigwxMetaFileDCTowxDC);
-        SWIG_RegisterMapping("_class_wxDC","_wxMetaFileDC",SwigwxMetaFileDCTowxDC);
-        SWIG_RegisterMapping("_class_wxDC","_class_wxPrinterDC",SwigwxPrinterDCTowxDC);
-        SWIG_RegisterMapping("_class_wxDC","_wxPrinterDC",SwigwxPrinterDCTowxDC);
-        SWIG_RegisterMapping("_class_wxDC","_class_wxWindowDC",SwigwxWindowDCTowxDC);
-        SWIG_RegisterMapping("_class_wxDC","_wxWindowDC",SwigwxWindowDCTowxDC);
-        SWIG_RegisterMapping("_class_wxDC","_class_wxPaintDC",SwigwxPaintDCTowxDC);
-        SWIG_RegisterMapping("_class_wxDC","_wxPaintDC",SwigwxPaintDCTowxDC);
-        SWIG_RegisterMapping("_class_wxDC","_class_wxClientDC",SwigwxClientDCTowxDC);
-        SWIG_RegisterMapping("_class_wxDC","_wxClientDC",SwigwxClientDCTowxDC);
-        SWIG_RegisterMapping("_class_wxDC","_class_wxScreenDC",SwigwxScreenDCTowxDC);
-        SWIG_RegisterMapping("_class_wxDC","_wxScreenDC",SwigwxScreenDCTowxDC);
-        SWIG_RegisterMapping("_class_wxDC","_class_wxMemoryDC",SwigwxMemoryDCTowxDC);
-        SWIG_RegisterMapping("_class_wxDC","_wxMemoryDC",SwigwxMemoryDCTowxDC);
-        SWIG_RegisterMapping("_class_wxDC","_wxDC",0);
-        SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxAcceleratorEntry","_class_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_signed_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_signed_int","_EBool",0);
-        SWIG_RegisterMapping("_signed_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_signed_int","_int",0);
-        SWIG_RegisterMapping("_wxLayoutConstraints","_class_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_wxMetaFileDC","_class_wxMetaFileDC",0);
-        SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0);
-        SWIG_RegisterMapping("_WXTYPE","_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_signed_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_unsigned_short",0);
-        SWIG_RegisterMapping("_class_wxBrush","_wxBrush",0);
-        SWIG_RegisterMapping("_unsigned_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_unsigned_short","_short",0);
-        SWIG_RegisterMapping("_class_wxFont","_wxFont",0);
-        SWIG_RegisterMapping("_wxClientDC","_class_wxClientDC",0);
-        SWIG_RegisterMapping("_class_wxPoint","_wxPoint",0);
-        SWIG_RegisterMapping("_wxRealPoint","_class_wxRealPoint",0);
-        SWIG_RegisterMapping("_signed_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_signed_short","_short",0);
-        SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0);
-        SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
-        SWIG_RegisterMapping("_class_wxWindowDC","_wxWindowDC",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
-        SWIG_RegisterMapping("_unsigned_char","_byte",0);
-        SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_unsigned_int","_size_t",0);
-        SWIG_RegisterMapping("_unsigned_int","_uint",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_unsigned_int","_int",0);
-        SWIG_RegisterMapping("_wxIcon","_class_wxIcon",0);
-        SWIG_RegisterMapping("_class_wxPen","_wxPen",0);
-        SWIG_RegisterMapping("_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_short","_unsigned_short",0);
-        SWIG_RegisterMapping("_short","_signed_short",0);
-        SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0);
-        SWIG_RegisterMapping("_wxWindowID","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_wxWindowID","_size_t",0);
-        SWIG_RegisterMapping("_wxWindowID","_EBool",0);
-        SWIG_RegisterMapping("_wxWindowID","_uint",0);
-        SWIG_RegisterMapping("_wxWindowID","_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_signed_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_int","_size_t",0);
-        SWIG_RegisterMapping("_int","_EBool",0);
-        SWIG_RegisterMapping("_int","_uint",0);
-        SWIG_RegisterMapping("_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_int","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_signed_int",0);
-        SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
-        SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
-        SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
-        SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
-        SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
-        SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
-        SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
-        SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
-        SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
-        SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
-        SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
-        SWIG_RegisterMapping("_class_wxBitmap","_class_wxCursor",SwigwxCursorTowxBitmap);
-        SWIG_RegisterMapping("_class_wxBitmap","_wxCursor",SwigwxCursorTowxBitmap);
-        SWIG_RegisterMapping("_class_wxBitmap","_class_wxIcon",SwigwxIconTowxBitmap);
-        SWIG_RegisterMapping("_class_wxBitmap","_wxIcon",SwigwxIconTowxBitmap);
-        SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0);
-        SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0);
-        SWIG_RegisterMapping("_wxDash","_unsigned_long",0);
-        SWIG_RegisterMapping("_wxDash","_long",0);
-        SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
+{
+   int i;
+   for (i = 0; _swig_mapping[i].n1; i++)
+        SWIG_RegisterMapping(_swig_mapping[i].n1,_swig_mapping[i].n2,_swig_mapping[i].pcnv);
+}

 }
 }

diff --git a/utils/wxPython/src/msw/gdi.py b/utils/wxPython/src/msw/gdi.py
index f0ae8fe03b788e00950f95bf19087b545a4d0d19..053800cf1d84e66e659cdb1457a87e98c1ee5557 100644 (file)
--- a/utils/wxPython/src/msw/gdi.py
+++ b/utils/wxPython/src/msw/gdi.py
@@ -6,62 +6,58 @@ class wxBitmapPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self, gdic=gdic):
+    def __del__(self,gdic=gdic):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            gdic.delete_wxBitmap(self.this)
-    def Create(self,arg0,arg1,*args):
-        val = apply(gdic.wxBitmap_Create,(self.this,arg0,arg1,)+args)
+            gdic.delete_wxBitmap(self)
+    def Create(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_Create,(self,) + _args, _kwargs)

         return val
         return val

-    def GetDepth(self):
-        val = gdic.wxBitmap_GetDepth(self.this)
+    def GetDepth(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_GetDepth,(self,) + _args, _kwargs)

         return val
         return val

-    def GetHeight(self):
-        val = gdic.wxBitmap_GetHeight(self.this)
+    def GetHeight(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_GetHeight,(self,) + _args, _kwargs)

         return val
         return val

-    def GetPalette(self):
-        val = gdic.wxBitmap_GetPalette(self.this)
-        val = wxPalettePtr(val)
+    def GetPalette(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_GetPalette,(self,) + _args, _kwargs)
+        if val: val = wxPalettePtr(val) 

         return val
         return val

-    def GetMask(self):
-        val = gdic.wxBitmap_GetMask(self.this)
-        val = wxMaskPtr(val)
+    def GetMask(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_GetMask,(self,) + _args, _kwargs)
+        if val: val = wxMaskPtr(val) 

         return val
         return val

-    def GetWidth(self):
-        val = gdic.wxBitmap_GetWidth(self.this)
+    def GetWidth(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_GetWidth,(self,) + _args, _kwargs)

         return val
         return val

-    def LoadFile(self,arg0,arg1):
-        val = gdic.wxBitmap_LoadFile(self.this,arg0,arg1)
+    def LoadFile(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_LoadFile,(self,) + _args, _kwargs)

         return val
         return val

-    def Ok(self):
-        val = gdic.wxBitmap_Ok(self.this)
+    def Ok(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_Ok,(self,) + _args, _kwargs)

         return val
         return val

-    def SaveFile(self,arg0,arg1,*args):
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        args = tuple(argl)
-        val = apply(gdic.wxBitmap_SaveFile,(self.this,arg0,arg1,)+args)
+    def SaveFile(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_SaveFile,(self,) + _args, _kwargs)

         return val
         return val

-    def SetDepth(self,arg0):
-        val = gdic.wxBitmap_SetDepth(self.this,arg0)
+    def SetDepth(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_SetDepth,(self,) + _args, _kwargs)

         return val
         return val

-    def SetHeight(self,arg0):
-        val = gdic.wxBitmap_SetHeight(self.this,arg0)
+    def SetHeight(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_SetHeight,(self,) + _args, _kwargs)

         return val
         return val

-    def SetMask(self,arg0):
-        val = gdic.wxBitmap_SetMask(self.this,arg0.this)
+    def SetMask(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_SetMask,(self,) + _args, _kwargs)

         return val
         return val

-    def SetPalette(self,arg0):
-        val = gdic.wxBitmap_SetPalette(self.this,arg0.this)
+    def SetPalette(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_SetPalette,(self,) + _args, _kwargs)

         return val
         return val

-    def SetWidth(self,arg0):
-        val = gdic.wxBitmap_SetWidth(self.this,arg0)
+    def SetWidth(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_SetWidth,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxBitmap instance>"
+        return "<C wxBitmap instance at %s>" % (self.this,)

 class wxBitmap(wxBitmapPtr):
 class wxBitmap(wxBitmapPtr):

-    def __init__(self,arg0,arg1) :
-        self.this = gdic.new_wxBitmap(arg0,arg1)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxBitmap,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -71,14 +67,14 @@ class wxMaskPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self, gdic=gdic):
+    def __del__(self,gdic=gdic):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            gdic.delete_wxMask(self.this)
+            gdic.delete_wxMask(self)

     def __repr__(self):
     def __repr__(self):

-        return "<C wxMask instance>"
+        return "<C wxMask instance at %s>" % (self.this,)

 class wxMask(wxMaskPtr):
 class wxMask(wxMaskPtr):

-    def __init__(self,arg0) :
-        self.this = gdic.new_wxMask(arg0.this)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxMask,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -88,38 +84,38 @@ class wxIconPtr(wxBitmapPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self, gdic=gdic):
+    def __del__(self,gdic=gdic):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            gdic.delete_wxIcon(self.this)
-    def GetDepth(self):
-        val = gdic.wxIcon_GetDepth(self.this)
+            gdic.delete_wxIcon(self)
+    def GetDepth(self, *_args, **_kwargs):
+        val = apply(gdic.wxIcon_GetDepth,(self,) + _args, _kwargs)

         return val
         return val

-    def GetHeight(self):
-        val = gdic.wxIcon_GetHeight(self.this)
+    def GetHeight(self, *_args, **_kwargs):
+        val = apply(gdic.wxIcon_GetHeight,(self,) + _args, _kwargs)

         return val
         return val

-    def GetWidth(self):
-        val = gdic.wxIcon_GetWidth(self.this)
+    def GetWidth(self, *_args, **_kwargs):
+        val = apply(gdic.wxIcon_GetWidth,(self,) + _args, _kwargs)

         return val
         return val

-    def LoadFile(self,arg0,arg1):
-        val = gdic.wxIcon_LoadFile(self.this,arg0,arg1)
+    def LoadFile(self, *_args, **_kwargs):
+        val = apply(gdic.wxIcon_LoadFile,(self,) + _args, _kwargs)

         return val
         return val

-    def Ok(self):
-        val = gdic.wxIcon_Ok(self.this)
+    def Ok(self, *_args, **_kwargs):
+        val = apply(gdic.wxIcon_Ok,(self,) + _args, _kwargs)

         return val
         return val

-    def SetDepth(self,arg0):
-        val = gdic.wxIcon_SetDepth(self.this,arg0)
+    def SetDepth(self, *_args, **_kwargs):
+        val = apply(gdic.wxIcon_SetDepth,(self,) + _args, _kwargs)

         return val
         return val

-    def SetHeight(self,arg0):
-        val = gdic.wxIcon_SetHeight(self.this,arg0)
+    def SetHeight(self, *_args, **_kwargs):
+        val = apply(gdic.wxIcon_SetHeight,(self,) + _args, _kwargs)

         return val
         return val

-    def SetWidth(self,arg0):
-        val = gdic.wxIcon_SetWidth(self.this,arg0)
+    def SetWidth(self, *_args, **_kwargs):
+        val = apply(gdic.wxIcon_SetWidth,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxIcon instance>"
+        return "<C wxIcon instance at %s>" % (self.this,)

 class wxIcon(wxIconPtr):
 class wxIcon(wxIconPtr):

-    def __init__(self,arg0,arg1,*args) :
-        self.this = apply(gdic.new_wxIcon,(arg0,arg1,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxIcon,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -129,17 +125,17 @@ class wxCursorPtr(wxBitmapPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self, gdic=gdic):
+    def __del__(self,gdic=gdic):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            gdic.delete_wxCursor(self.this)
-    def Ok(self):
-        val = gdic.wxCursor_Ok(self.this)
+            gdic.delete_wxCursor(self)
+    def Ok(self, *_args, **_kwargs):
+        val = apply(gdic.wxCursor_Ok,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxCursor instance>"
+        return "<C wxCursor instance at %s>" % (self.this,)

 class wxCursor(wxCursorPtr):
 class wxCursor(wxCursorPtr):

-    def __init__(self,arg0,arg1,*args) :
-        self.this = apply(gdic.new_wxCursor,(arg0,arg1,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxCursor,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -149,50 +145,50 @@ class wxFontPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetFaceName(self):
-        val = gdic.wxFont_GetFaceName(self.this)
+    def GetFaceName(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_GetFaceName,(self,) + _args, _kwargs)

         return val
         return val

-    def GetFamily(self):
-        val = gdic.wxFont_GetFamily(self.this)
+    def GetFamily(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_GetFamily,(self,) + _args, _kwargs)

         return val
         return val

-    def GetFontId(self):
-        val = gdic.wxFont_GetFontId(self.this)
+    def GetFontId(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_GetFontId,(self,) + _args, _kwargs)

         return val
         return val

-    def GetPointSize(self):
-        val = gdic.wxFont_GetPointSize(self.this)
+    def GetPointSize(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_GetPointSize,(self,) + _args, _kwargs)

         return val
         return val

-    def GetStyle(self):
-        val = gdic.wxFont_GetStyle(self.this)
+    def GetStyle(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_GetStyle,(self,) + _args, _kwargs)

         return val
         return val

-    def GetUnderlined(self):
-        val = gdic.wxFont_GetUnderlined(self.this)
+    def GetUnderlined(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_GetUnderlined,(self,) + _args, _kwargs)

         return val
         return val

-    def GetWeight(self):
-        val = gdic.wxFont_GetWeight(self.this)
+    def GetWeight(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_GetWeight,(self,) + _args, _kwargs)

         return val
         return val

-    def SetFaceName(self,arg0):
-        val = gdic.wxFont_SetFaceName(self.this,arg0)
+    def SetFaceName(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_SetFaceName,(self,) + _args, _kwargs)

         return val
         return val

-    def SetFamily(self,arg0):
-        val = gdic.wxFont_SetFamily(self.this,arg0)
+    def SetFamily(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_SetFamily,(self,) + _args, _kwargs)

         return val
         return val

-    def SetPointSize(self,arg0):
-        val = gdic.wxFont_SetPointSize(self.this,arg0)
+    def SetPointSize(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_SetPointSize,(self,) + _args, _kwargs)

         return val
         return val

-    def SetStyle(self,arg0):
-        val = gdic.wxFont_SetStyle(self.this,arg0)
+    def SetStyle(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_SetStyle,(self,) + _args, _kwargs)

         return val
         return val

-    def SetUnderlined(self,arg0):
-        val = gdic.wxFont_SetUnderlined(self.this,arg0)
+    def SetUnderlined(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_SetUnderlined,(self,) + _args, _kwargs)

         return val
         return val

-    def SetWeight(self,arg0):
-        val = gdic.wxFont_SetWeight(self.this,arg0)
+    def SetWeight(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_SetWeight,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxFont instance>"
+        return "<C wxFont instance at %s>" % (self.this,)

 class wxFont(wxFontPtr):
 class wxFont(wxFontPtr):

-    def __init__(self,arg0,arg1,arg2,arg3,*args) :
-        self.this = apply(gdic.new_wxFont,(arg0,arg1,arg2,arg3,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxFont,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -202,32 +198,32 @@ class wxColourPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self, gdic=gdic):
+    def __del__(self,gdic=gdic):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            gdic.delete_wxColour(self.this)
-    def Red(self):
-        val = gdic.wxColour_Red(self.this)
+            gdic.delete_wxColour(self)
+    def Red(self, *_args, **_kwargs):
+        val = apply(gdic.wxColour_Red,(self,) + _args, _kwargs)

         return val
         return val

-    def Green(self):
-        val = gdic.wxColour_Green(self.this)
+    def Green(self, *_args, **_kwargs):
+        val = apply(gdic.wxColour_Green,(self,) + _args, _kwargs)

         return val
         return val

-    def Blue(self):
-        val = gdic.wxColour_Blue(self.this)
+    def Blue(self, *_args, **_kwargs):
+        val = apply(gdic.wxColour_Blue,(self,) + _args, _kwargs)

         return val
         return val

-    def Ok(self):
-        val = gdic.wxColour_Ok(self.this)
+    def Ok(self, *_args, **_kwargs):
+        val = apply(gdic.wxColour_Ok,(self,) + _args, _kwargs)

         return val
         return val

-    def Set(self,arg0,arg1,arg2):
-        val = gdic.wxColour_Set(self.this,arg0,arg1,arg2)
+    def Set(self, *_args, **_kwargs):
+        val = apply(gdic.wxColour_Set,(self,) + _args, _kwargs)

         return val
         return val

-    def Get(self):
-        val = gdic.wxColour_Get(self.this)
+    def Get(self, *_args, **_kwargs):
+        val = apply(gdic.wxColour_Get,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxColour instance>"
+        return "<C wxColour instance at %s>" % (self.this,)

 class wxColour(wxColourPtr):
 class wxColour(wxColourPtr):

-    def __init__(self,*args) :
-        self.this = apply(gdic.new_wxColour,()+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxColour,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -237,58 +233,58 @@ class wxPenPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetCap(self):
-        val = gdic.wxPen_GetCap(self.this)
+    def GetCap(self, *_args, **_kwargs):
+        val = apply(gdic.wxPen_GetCap,(self,) + _args, _kwargs)

         return val
         return val

-    def GetColour(self):
-        val = gdic.wxPen_GetColour(self.this)
-        val = wxColourPtr(val)
+    def GetColour(self, *_args, **_kwargs):
+        val = apply(gdic.wxPen_GetColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) 

         return val
         return val

-    def GetJoin(self):
-        val = gdic.wxPen_GetJoin(self.this)
+    def GetJoin(self, *_args, **_kwargs):
+        val = apply(gdic.wxPen_GetJoin,(self,) + _args, _kwargs)

         return val
         return val

-    def GetStyle(self):
-        val = gdic.wxPen_GetStyle(self.this)
+    def GetStyle(self, *_args, **_kwargs):
+        val = apply(gdic.wxPen_GetStyle,(self,) + _args, _kwargs)

         return val
         return val

-    def GetWidth(self):
-        val = gdic.wxPen_GetWidth(self.this)
+    def GetWidth(self, *_args, **_kwargs):
+        val = apply(gdic.wxPen_GetWidth,(self,) + _args, _kwargs)

         return val
         return val

-    def Ok(self):
-        val = gdic.wxPen_Ok(self.this)
+    def Ok(self, *_args, **_kwargs):
+        val = apply(gdic.wxPen_Ok,(self,) + _args, _kwargs)

         return val
         return val

-    def SetCap(self,arg0):
-        val = gdic.wxPen_SetCap(self.this,arg0)
+    def SetCap(self, *_args, **_kwargs):
+        val = apply(gdic.wxPen_SetCap,(self,) + _args, _kwargs)

         return val
         return val

-    def SetColour(self,arg0):
-        val = gdic.wxPen_SetColour(self.this,arg0.this)
+    def SetColour(self, *_args, **_kwargs):
+        val = apply(gdic.wxPen_SetColour,(self,) + _args, _kwargs)

         return val
         return val

-    def SetJoin(self,arg0):
-        val = gdic.wxPen_SetJoin(self.this,arg0)
+    def SetJoin(self, *_args, **_kwargs):
+        val = apply(gdic.wxPen_SetJoin,(self,) + _args, _kwargs)

         return val
         return val

-    def SetStyle(self,arg0):
-        val = gdic.wxPen_SetStyle(self.this,arg0)
+    def SetStyle(self, *_args, **_kwargs):
+        val = apply(gdic.wxPen_SetStyle,(self,) + _args, _kwargs)

         return val
         return val

-    def SetWidth(self,arg0):
-        val = gdic.wxPen_SetWidth(self.this,arg0)
+    def SetWidth(self, *_args, **_kwargs):
+        val = apply(gdic.wxPen_SetWidth,(self,) + _args, _kwargs)

         return val
         return val

-    def GetDashes(self,arg0):
-        val = gdic.wxPen_GetDashes(self.this,arg0)
+    def GetDashes(self, *_args, **_kwargs):
+        val = apply(gdic.wxPen_GetDashes,(self,) + _args, _kwargs)

         return val
         return val

-    def GetStipple(self):
-        val = gdic.wxPen_GetStipple(self.this)
-        val = wxBitmapPtr(val)
+    def GetStipple(self, *_args, **_kwargs):
+        val = apply(gdic.wxPen_GetStipple,(self,) + _args, _kwargs)
+        if val: val = wxBitmapPtr(val) 

         return val
         return val

-    def SetDashes(self,arg0,*args):
-        val = apply(gdic.wxPen_SetDashes,(self.this,arg0,)+args)
+    def SetDashes(self, *_args, **_kwargs):
+        val = apply(gdic.wxPen_SetDashes,(self,) + _args, _kwargs)

         return val
         return val

-    def SetStipple(self,arg0):
-        val = gdic.wxPen_SetStipple(self.this,arg0.this)
+    def SetStipple(self, *_args, **_kwargs):
+        val = apply(gdic.wxPen_SetStipple,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxPen instance>"
+        return "<C wxPen instance at %s>" % (self.this,)

 class wxPen(wxPenPtr):
 class wxPen(wxPenPtr):

-    def __init__(self,arg0,*args) :
-        self.this = apply(gdic.new_wxPen,(arg0.this,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxPen,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -298,34 +294,34 @@ class wxBrushPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetColour(self):
-        val = gdic.wxBrush_GetColour(self.this)
-        val = wxColourPtr(val)
+    def GetColour(self, *_args, **_kwargs):
+        val = apply(gdic.wxBrush_GetColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) 

         return val
         return val

-    def GetStipple(self):
-        val = gdic.wxBrush_GetStipple(self.this)
-        val = wxBitmapPtr(val)
+    def GetStipple(self, *_args, **_kwargs):
+        val = apply(gdic.wxBrush_GetStipple,(self,) + _args, _kwargs)
+        if val: val = wxBitmapPtr(val) 

         return val
         return val

-    def GetStyle(self):
-        val = gdic.wxBrush_GetStyle(self.this)
+    def GetStyle(self, *_args, **_kwargs):
+        val = apply(gdic.wxBrush_GetStyle,(self,) + _args, _kwargs)

         return val
         return val

-    def Ok(self):
-        val = gdic.wxBrush_Ok(self.this)
+    def Ok(self, *_args, **_kwargs):
+        val = apply(gdic.wxBrush_Ok,(self,) + _args, _kwargs)

         return val
         return val

-    def SetColour(self,arg0):
-        val = gdic.wxBrush_SetColour(self.this,arg0.this)
+    def SetColour(self, *_args, **_kwargs):
+        val = apply(gdic.wxBrush_SetColour,(self,) + _args, _kwargs)

         return val
         return val

-    def SetStipple(self,arg0):
-        val = gdic.wxBrush_SetStipple(self.this,arg0.this)
+    def SetStipple(self, *_args, **_kwargs):
+        val = apply(gdic.wxBrush_SetStipple,(self,) + _args, _kwargs)

         return val
         return val

-    def SetStyle(self,arg0):
-        val = gdic.wxBrush_SetStyle(self.this,arg0)
+    def SetStyle(self, *_args, **_kwargs):
+        val = apply(gdic.wxBrush_SetStyle,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxBrush instance>"
+        return "<C wxBrush instance at %s>" % (self.this,)

 class wxBrush(wxBrushPtr):
 class wxBrush(wxBrushPtr):

-    def __init__(self,arg0,*args) :
-        self.this = apply(gdic.new_wxBrush,(arg0.this,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxBrush,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -335,244 +331,226 @@ class wxDCPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self, gdic=gdic):
+    def __del__(self,gdic=gdic):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            gdic.delete_wxDC(self.this)
-    def BeginDrawing(self):
-        val = gdic.wxDC_BeginDrawing(self.this)
+            gdic.delete_wxDC(self)
+    def BeginDrawing(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_BeginDrawing,(self,) + _args, _kwargs)

         return val
         return val

-    def Blit(self,arg0,arg1,arg2,arg3,arg4,arg5,arg6,arg7):
-        val = gdic.wxDC_Blit(self.this,arg0,arg1,arg2,arg3,arg4.this,arg5,arg6,arg7)
+    def Blit(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_Blit,(self,) + _args, _kwargs)

         return val
         return val

-    def Clear(self):
-        val = gdic.wxDC_Clear(self.this)
+    def Clear(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_Clear,(self,) + _args, _kwargs)

         return val
         return val

-    def CrossHair(self,arg0,arg1):
-        val = gdic.wxDC_CrossHair(self.this,arg0,arg1)
+    def CrossHair(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_CrossHair,(self,) + _args, _kwargs)

         return val
         return val

-    def DestroyClippingRegion(self):
-        val = gdic.wxDC_DestroyClippingRegion(self.this)
+    def DestroyClippingRegion(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DestroyClippingRegion,(self,) + _args, _kwargs)

         return val
         return val

-    def DeviceToLogicalX(self,arg0):
-        val = gdic.wxDC_DeviceToLogicalX(self.this,arg0)
+    def DeviceToLogicalX(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DeviceToLogicalX,(self,) + _args, _kwargs)

         return val
         return val

-    def DeviceToLogicalXRel(self,arg0):
-        val = gdic.wxDC_DeviceToLogicalXRel(self.this,arg0)
+    def DeviceToLogicalXRel(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DeviceToLogicalXRel,(self,) + _args, _kwargs)

         return val
         return val

-    def DeviceToLogicalY(self,arg0):
-        val = gdic.wxDC_DeviceToLogicalY(self.this,arg0)
+    def DeviceToLogicalY(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DeviceToLogicalY,(self,) + _args, _kwargs)

         return val
         return val

-    def DeviceToLogicalYRel(self,arg0):
-        val = gdic.wxDC_DeviceToLogicalYRel(self.this,arg0)
+    def DeviceToLogicalYRel(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DeviceToLogicalYRel,(self,) + _args, _kwargs)

         return val
         return val

-    def DrawArc(self,arg0,arg1,arg2,arg3,arg4,arg5):
-        val = gdic.wxDC_DrawArc(self.this,arg0,arg1,arg2,arg3,arg4,arg5)
+    def DrawArc(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawArc,(self,) + _args, _kwargs)

         return val
         return val

-    def DrawCircle(self,arg0,arg1,arg2):
-        val = gdic.wxDC_DrawCircle(self.this,arg0,arg1,arg2)
+    def DrawCircle(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawCircle,(self,) + _args, _kwargs)

         return val
         return val

-    def DrawEllipse(self,arg0,arg1,arg2,arg3):
-        val = gdic.wxDC_DrawEllipse(self.this,arg0,arg1,arg2,arg3)
+    def DrawEllipse(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawEllipse,(self,) + _args, _kwargs)

         return val
         return val

-    def DrawEllipticArc(self,arg0,arg1,arg2,arg3,arg4,arg5):
-        val = gdic.wxDC_DrawEllipticArc(self.this,arg0,arg1,arg2,arg3,arg4,arg5)
+    def DrawEllipticArc(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawEllipticArc,(self,) + _args, _kwargs)

         return val
         return val

-    def DrawIcon(self,arg0,arg1,arg2):
-        val = gdic.wxDC_DrawIcon(self.this,arg0.this,arg1,arg2)
+    def DrawIcon(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawIcon,(self,) + _args, _kwargs)

         return val
         return val

-    def DrawLine(self,arg0,arg1,arg2,arg3):
-        val = gdic.wxDC_DrawLine(self.this,arg0,arg1,arg2,arg3)
+    def DrawLine(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawLine,(self,) + _args, _kwargs)

         return val
         return val

-    def DrawLines(self,arg0,*args):
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        args = tuple(argl)
-        val = apply(gdic.wxDC_DrawLines,(self.this,arg0,)+args)
+    def DrawLines(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawLines,(self,) + _args, _kwargs)

         return val
         return val

-    def DrawPolygon(self,arg0,*args):
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        args = tuple(argl)
-        val = apply(gdic.wxDC_DrawPolygon,(self.this,arg0,)+args)
+    def DrawPolygon(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawPolygon,(self,) + _args, _kwargs)

         return val
         return val

-    def DrawPoint(self,arg0,arg1):
-        val = gdic.wxDC_DrawPoint(self.this,arg0,arg1)
+    def DrawPoint(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawPoint,(self,) + _args, _kwargs)

         return val
         return val

-    def DrawRectangle(self,arg0,arg1,arg2,arg3):
-        val = gdic.wxDC_DrawRectangle(self.this,arg0,arg1,arg2,arg3)
+    def DrawRectangle(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawRectangle,(self,) + _args, _kwargs)

         return val
         return val

-    def DrawRoundedRectangle(self,arg0,arg1,arg2,arg3,*args):
-        val = apply(gdic.wxDC_DrawRoundedRectangle,(self.this,arg0,arg1,arg2,arg3,)+args)
+    def DrawRoundedRectangle(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawRoundedRectangle,(self,) + _args, _kwargs)

         return val
         return val

-    def DrawSpline(self,arg0,*args):
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        args = tuple(argl)
-        val = apply(gdic.wxDC_DrawSpline,(self.this,arg0,)+args)
+    def DrawSpline(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawSpline,(self,) + _args, _kwargs)

         return val
         return val

-    def DrawText(self,arg0,arg1,arg2):
-        val = gdic.wxDC_DrawText(self.this,arg0,arg1,arg2)
+    def DrawText(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawText,(self,) + _args, _kwargs)

         return val
         return val

-    def EndDoc(self):
-        val = gdic.wxDC_EndDoc(self.this)
+    def EndDoc(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_EndDoc,(self,) + _args, _kwargs)

         return val
         return val

-    def EndDrawing(self):
-        val = gdic.wxDC_EndDrawing(self.this)
+    def EndDrawing(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_EndDrawing,(self,) + _args, _kwargs)

         return val
         return val

-    def EndPage(self):
-        val = gdic.wxDC_EndPage(self.this)
+    def EndPage(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_EndPage,(self,) + _args, _kwargs)

         return val
         return val

-    def FloodFill(self,arg0,arg1,arg2,*args):
-        val = apply(gdic.wxDC_FloodFill,(self.this,arg0,arg1,arg2.this,)+args)
+    def FloodFill(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_FloodFill,(self,) + _args, _kwargs)

         return val
         return val

-    def GetBackground(self):
-        val = gdic.wxDC_GetBackground(self.this)
-        val = wxBrushPtr(val)
+    def GetBackground(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetBackground,(self,) + _args, _kwargs)
+        if val: val = wxBrushPtr(val) 

         return val
         return val

-    def GetBrush(self):
-        val = gdic.wxDC_GetBrush(self.this)
-        val = wxBrushPtr(val)
+    def GetBrush(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetBrush,(self,) + _args, _kwargs)
+        if val: val = wxBrushPtr(val) 

         return val
         return val

-    def GetCharHeight(self):
-        val = gdic.wxDC_GetCharHeight(self.this)
+    def GetCharHeight(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetCharHeight,(self,) + _args, _kwargs)

         return val
         return val

-    def GetCharWidth(self):
-        val = gdic.wxDC_GetCharWidth(self.this)
+    def GetCharWidth(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetCharWidth,(self,) + _args, _kwargs)

         return val
         return val

-    def GetClippingBox(self):
-        val = gdic.wxDC_GetClippingBox(self.this)
+    def GetClippingBox(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetClippingBox,(self,) + _args, _kwargs)

         return val
         return val

-    def GetFont(self):
-        val = gdic.wxDC_GetFont(self.this)
-        val = wxFontPtr(val)
+    def GetFont(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetFont,(self,) + _args, _kwargs)
+        if val: val = wxFontPtr(val) 

         return val
         return val

-    def GetLogicalFunction(self):
-        val = gdic.wxDC_GetLogicalFunction(self.this)
+    def GetLogicalFunction(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetLogicalFunction,(self,) + _args, _kwargs)

         return val
         return val

-    def GetMapMode(self):
-        val = gdic.wxDC_GetMapMode(self.this)
+    def GetMapMode(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetMapMode,(self,) + _args, _kwargs)

         return val
         return val

-    def GetOptimization(self):
-        val = gdic.wxDC_GetOptimization(self.this)
+    def GetOptimization(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetOptimization,(self,) + _args, _kwargs)

         return val
         return val

-    def GetPen(self):
-        val = gdic.wxDC_GetPen(self.this)
-        val = wxPenPtr(val)
+    def GetPen(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetPen,(self,) + _args, _kwargs)
+        if val: val = wxPenPtr(val) 

         return val
         return val

-    def GetPixel(self,arg0,arg1):
-        val = gdic.wxDC_GetPixel(self.this,arg0,arg1)
-        val = wxColourPtr(val)
-        val.thisown = 1
+    def GetPixel(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetPixel,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetSizeTuple(self):
-        val = gdic.wxDC_GetSizeTuple(self.this)
+    def GetSizeTuple(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetSizeTuple,(self,) + _args, _kwargs)

         return val
         return val

-    def GetSize(self):
-        val = gdic.wxDC_GetSize(self.this)
-        val = wxSizePtr(val)
-        val.thisown = 1
+    def GetSize(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetSize,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1

         return val
         return val

-    def GetTextBackground(self):
-        val = gdic.wxDC_GetTextBackground(self.this)
-        val = wxColourPtr(val)
+    def GetTextBackground(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetTextBackground,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) 

         return val
         return val

-    def GetTextExtent(self,arg0):
-        val = gdic.wxDC_GetTextExtent(self.this,arg0)
+    def GetTextExtent(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetTextExtent,(self,) + _args, _kwargs)

         return val
         return val

-    def GetFullTextExtent(self,arg0,*args):
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        args = tuple(argl)
-        val = apply(gdic.wxDC_GetFullTextExtent,(self.this,arg0,)+args)
+    def GetFullTextExtent(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetFullTextExtent,(self,) + _args, _kwargs)

         return val
         return val

-    def GetTextForeground(self):
-        val = gdic.wxDC_GetTextForeground(self.this)
-        val = wxColourPtr(val)
+    def GetTextForeground(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetTextForeground,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) 

         return val
         return val

-    def LogicalToDeviceX(self,arg0):
-        val = gdic.wxDC_LogicalToDeviceX(self.this,arg0)
+    def LogicalToDeviceX(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_LogicalToDeviceX,(self,) + _args, _kwargs)

         return val
         return val

-    def LogicalToDeviceXRel(self,arg0):
-        val = gdic.wxDC_LogicalToDeviceXRel(self.this,arg0)
+    def LogicalToDeviceXRel(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_LogicalToDeviceXRel,(self,) + _args, _kwargs)

         return val
         return val

-    def LogicalToDeviceY(self,arg0):
-        val = gdic.wxDC_LogicalToDeviceY(self.this,arg0)
+    def LogicalToDeviceY(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_LogicalToDeviceY,(self,) + _args, _kwargs)

         return val
         return val

-    def LogicalToDeviceYRel(self,arg0):
-        val = gdic.wxDC_LogicalToDeviceYRel(self.this,arg0)
+    def LogicalToDeviceYRel(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_LogicalToDeviceYRel,(self,) + _args, _kwargs)

         return val
         return val

-    def MaxX(self):
-        val = gdic.wxDC_MaxX(self.this)
+    def MaxX(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_MaxX,(self,) + _args, _kwargs)

         return val
         return val

-    def MaxY(self):
-        val = gdic.wxDC_MaxY(self.this)
+    def MaxY(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_MaxY,(self,) + _args, _kwargs)

         return val
         return val

-    def MinX(self):
-        val = gdic.wxDC_MinX(self.this)
+    def MinX(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_MinX,(self,) + _args, _kwargs)

         return val
         return val

-    def MinY(self):
-        val = gdic.wxDC_MinY(self.this)
+    def MinY(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_MinY,(self,) + _args, _kwargs)

         return val
         return val

-    def Ok(self):
-        val = gdic.wxDC_Ok(self.this)
+    def Ok(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_Ok,(self,) + _args, _kwargs)

         return val
         return val

-    def SetDeviceOrigin(self,arg0,arg1):
-        val = gdic.wxDC_SetDeviceOrigin(self.this,arg0,arg1)
+    def SetDeviceOrigin(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetDeviceOrigin,(self,) + _args, _kwargs)

         return val
         return val

-    def SetBackground(self,arg0):
-        val = gdic.wxDC_SetBackground(self.this,arg0.this)
+    def SetBackground(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetBackground,(self,) + _args, _kwargs)

         return val
         return val

-    def SetBackgroundMode(self,arg0):
-        val = gdic.wxDC_SetBackgroundMode(self.this,arg0)
+    def SetBackgroundMode(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetBackgroundMode,(self,) + _args, _kwargs)

         return val
         return val

-    def SetClippingRegion(self,arg0,arg1,arg2,arg3):
-        val = gdic.wxDC_SetClippingRegion(self.this,arg0,arg1,arg2,arg3)
+    def SetClippingRegion(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetClippingRegion,(self,) + _args, _kwargs)

         return val
         return val

-    def SetPalette(self,arg0):
-        val = gdic.wxDC_SetPalette(self.this,arg0.this)
+    def SetPalette(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetPalette,(self,) + _args, _kwargs)

         return val
         return val

-    def SetBrush(self,arg0):
-        val = gdic.wxDC_SetBrush(self.this,arg0.this)
+    def SetBrush(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetBrush,(self,) + _args, _kwargs)

         return val
         return val

-    def SetFont(self,arg0):
-        val = gdic.wxDC_SetFont(self.this,arg0.this)
+    def SetFont(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetFont,(self,) + _args, _kwargs)

         return val
         return val

-    def SetLogicalFunction(self,arg0):
-        val = gdic.wxDC_SetLogicalFunction(self.this,arg0)
+    def SetLogicalFunction(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetLogicalFunction,(self,) + _args, _kwargs)

         return val
         return val

-    def SetMapMode(self,arg0):
-        val = gdic.wxDC_SetMapMode(self.this,arg0)
+    def SetMapMode(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetMapMode,(self,) + _args, _kwargs)

         return val
         return val

-    def SetOptimization(self,arg0):
-        val = gdic.wxDC_SetOptimization(self.this,arg0)
+    def SetOptimization(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetOptimization,(self,) + _args, _kwargs)

         return val
         return val

-    def SetPen(self,arg0):
-        val = gdic.wxDC_SetPen(self.this,arg0.this)
+    def SetPen(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetPen,(self,) + _args, _kwargs)

         return val
         return val

-    def SetTextBackground(self,arg0):
-        val = gdic.wxDC_SetTextBackground(self.this,arg0.this)
+    def SetTextBackground(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetTextBackground,(self,) + _args, _kwargs)

         return val
         return val

-    def SetTextForeground(self,arg0):
-        val = gdic.wxDC_SetTextForeground(self.this,arg0.this)
+    def SetTextForeground(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetTextForeground,(self,) + _args, _kwargs)

         return val
         return val

-    def SetUserScale(self,arg0,arg1):
-        val = gdic.wxDC_SetUserScale(self.this,arg0,arg1)
+    def SetUserScale(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetUserScale,(self,) + _args, _kwargs)

         return val
         return val

-    def StartDoc(self,arg0):
-        val = gdic.wxDC_StartDoc(self.this,arg0)
+    def StartDoc(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_StartDoc,(self,) + _args, _kwargs)

         return val
         return val

-    def StartPage(self):
-        val = gdic.wxDC_StartPage(self.this)
+    def StartPage(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_StartPage,(self,) + _args, _kwargs)

         return val
         return val

-    def DrawBitmap(self,arg0,arg1,arg2,*args):
-        val = apply(gdic.wxDC_DrawBitmap,(self.this,arg0.this,arg1,arg2,)+args)
+    def DrawBitmap(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawBitmap,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxDC instance>"
+        return "<C wxDC instance at %s>" % (self.this,)

 class wxDC(wxDCPtr):
     def __init__(self,this):
         self.this = this
 class wxDC(wxDCPtr):
     def __init__(self,this):
         self.this = this


@@ -584,14 +562,14 @@ class wxMemoryDCPtr(wxDCPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def SelectObject(self,arg0):
-        val = gdic.wxMemoryDC_SelectObject(self.this,arg0.this)
+    def SelectObject(self, *_args, **_kwargs):
+        val = apply(gdic.wxMemoryDC_SelectObject,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxMemoryDC instance>"
+        return "<C wxMemoryDC instance at %s>" % (self.this,)

 class wxMemoryDC(wxMemoryDCPtr):
 class wxMemoryDC(wxMemoryDCPtr):

-    def __init__(self) :
-        self.this = gdic.new_wxMemoryDC()
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxMemoryDC,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -601,24 +579,20 @@ class wxScreenDCPtr(wxDCPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def StartDrawingOnTop(self,arg0):
-        val = gdic.wxScreenDC_StartDrawingOnTop(self.this,arg0.this)
+    def StartDrawingOnTop(self, *_args, **_kwargs):
+        val = apply(gdic.wxScreenDC_StartDrawingOnTop,(self,) + _args, _kwargs)

         return val
         return val

-    def StartDrawingOnTopRect(self,*args):
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        args = tuple(argl)
-        val = apply(gdic.wxScreenDC_StartDrawingOnTopRect,(self.this,)+args)
+    def StartDrawingOnTopRect(self, *_args, **_kwargs):
+        val = apply(gdic.wxScreenDC_StartDrawingOnTopRect,(self,) + _args, _kwargs)

         return val
         return val

-    def EndDrawingOnTop(self):
-        val = gdic.wxScreenDC_EndDrawingOnTop(self.this)
+    def EndDrawingOnTop(self, *_args, **_kwargs):
+        val = apply(gdic.wxScreenDC_EndDrawingOnTop,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxScreenDC instance>"
+        return "<C wxScreenDC instance at %s>" % (self.this,)

 class wxScreenDC(wxScreenDCPtr):
 class wxScreenDC(wxScreenDCPtr):

-    def __init__(self) :
-        self.this = gdic.new_wxScreenDC()
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxScreenDC,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -629,10 +603,10 @@ class wxClientDCPtr(wxDCPtr):
         self.this = this
         self.thisown = 0
     def __repr__(self):
         self.this = this
         self.thisown = 0
     def __repr__(self):

-        return "<C wxClientDC instance>"
+        return "<C wxClientDC instance at %s>" % (self.this,)

 class wxClientDC(wxClientDCPtr):
 class wxClientDC(wxClientDCPtr):

-    def __init__(self,arg0) :
-        self.this = gdic.new_wxClientDC(arg0.this)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxClientDC,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -643,10 +617,10 @@ class wxPaintDCPtr(wxDCPtr):
         self.this = this
         self.thisown = 0
     def __repr__(self):
         self.this = this
         self.thisown = 0
     def __repr__(self):

-        return "<C wxPaintDC instance>"
+        return "<C wxPaintDC instance at %s>" % (self.this,)

 class wxPaintDC(wxPaintDCPtr):
 class wxPaintDC(wxPaintDCPtr):

-    def __init__(self,arg0) :
-        self.this = gdic.new_wxPaintDC(arg0.this)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxPaintDC,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -657,10 +631,10 @@ class wxWindowDCPtr(wxDCPtr):
         self.this = this
         self.thisown = 0
     def __repr__(self):
         self.this = this
         self.thisown = 0
     def __repr__(self):

-        return "<C wxWindowDC instance>"
+        return "<C wxWindowDC instance at %s>" % (self.this,)

 class wxWindowDC(wxWindowDCPtr):
 class wxWindowDC(wxWindowDCPtr):

-    def __init__(self,arg0) :
-        self.this = gdic.new_wxWindowDC(arg0.this)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxWindowDC,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -671,10 +645,10 @@ class wxPrinterDCPtr(wxDCPtr):
         self.this = this
         self.thisown = 0
     def __repr__(self):
         self.this = this
         self.thisown = 0
     def __repr__(self):

-        return "<C wxPrinterDC instance>"
+        return "<C wxPrinterDC instance at %s>" % (self.this,)

 class wxPrinterDC(wxPrinterDCPtr):
 class wxPrinterDC(wxPrinterDCPtr):

-    def __init__(self,arg0,arg1,arg2,*args) :
-        self.this = apply(gdic.new_wxPrinterDC,(arg0,arg1,arg2,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxPrinterDC,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -684,14 +658,14 @@ class wxMetaFileDCPtr(wxDCPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def Close(self):
-        val = gdic.wxMetaFileDC_Close(self.this)
+    def Close(self, *_args, **_kwargs):
+        val = apply(gdic.wxMetaFileDC_Close,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxMetaFileDC instance>"
+        return "<C wxMetaFileDC instance at %s>" % (self.this,)

 class wxMetaFileDC(wxMetaFileDCPtr):
 class wxMetaFileDC(wxMetaFileDCPtr):

-    def __init__(self,*args) :
-        self.this = apply(gdic.new_wxMetaFileDC,()+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxMetaFileDC,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -701,23 +675,23 @@ class wxPalettePtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self, gdic=gdic):
+    def __del__(self,gdic=gdic):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            gdic.delete_wxPalette(self.this)
-    def GetPixel(self,arg0,arg1,arg2):
-        val = gdic.wxPalette_GetPixel(self.this,arg0,arg1,arg2)
+            gdic.delete_wxPalette(self)
+    def GetPixel(self, *_args, **_kwargs):
+        val = apply(gdic.wxPalette_GetPixel,(self,) + _args, _kwargs)

         return val
         return val

-    def GetRGB(self,arg0,arg1,arg2,arg3):
-        val = gdic.wxPalette_GetRGB(self.this,arg0,arg1,arg2,arg3)
+    def GetRGB(self, *_args, **_kwargs):
+        val = apply(gdic.wxPalette_GetRGB,(self,) + _args, _kwargs)

         return val
         return val

-    def Ok(self):
-        val = gdic.wxPalette_Ok(self.this)
+    def Ok(self, *_args, **_kwargs):
+        val = apply(gdic.wxPalette_Ok,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxPalette instance>"
+        return "<C wxPalette instance at %s>" % (self.this,)

 class wxPalette(wxPalettePtr):
 class wxPalette(wxPalettePtr):

-    def __init__(self,arg0,arg1,arg2) :
-        self.this = gdic.new_wxPalette(arg0,arg1,arg2)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxPalette,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -727,49 +701,41 @@ class wxImageListPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self, gdic=gdic):
+    def __del__(self,gdic=gdic):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            gdic.delete_wxImageList(self.this)
-    def Add(self,arg0,*args):
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        args = tuple(argl)
-        val = apply(gdic.wxImageList_Add,(self.this,arg0.this,)+args)
+            gdic.delete_wxImageList(self)
+    def Add(self, *_args, **_kwargs):
+        val = apply(gdic.wxImageList_Add,(self,) + _args, _kwargs)

         return val
         return val

-    def AddWithColourMask(self,arg0,arg1):
-        val = gdic.wxImageList_AddWithColourMask(self.this,arg0.this,arg1.this)
+    def AddWithColourMask(self, *_args, **_kwargs):
+        val = apply(gdic.wxImageList_AddWithColourMask,(self,) + _args, _kwargs)

         return val
         return val

-    def AddIcon(self,arg0):
-        val = gdic.wxImageList_AddIcon(self.this,arg0.this)
+    def AddIcon(self, *_args, **_kwargs):
+        val = apply(gdic.wxImageList_AddIcon,(self,) + _args, _kwargs)

         return val
         return val

-    def Replace(self,arg0,arg1,*args):
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        args = tuple(argl)
-        val = apply(gdic.wxImageList_Replace,(self.this,arg0,arg1.this,)+args)
+    def Replace(self, *_args, **_kwargs):
+        val = apply(gdic.wxImageList_Replace,(self,) + _args, _kwargs)

         return val
         return val

-    def ReplaceIcon(self,arg0,arg1):
-        val = gdic.wxImageList_ReplaceIcon(self.this,arg0,arg1.this)
+    def ReplaceIcon(self, *_args, **_kwargs):
+        val = apply(gdic.wxImageList_ReplaceIcon,(self,) + _args, _kwargs)

         return val
         return val

-    def Draw(self,arg0,arg1,arg2,arg3,*args):
-        val = apply(gdic.wxImageList_Draw,(self.this,arg0,arg1.this,arg2,arg3,)+args)
+    def Draw(self, *_args, **_kwargs):
+        val = apply(gdic.wxImageList_Draw,(self,) + _args, _kwargs)

         return val
         return val

-    def GetImageCount(self):
-        val = gdic.wxImageList_GetImageCount(self.this)
+    def GetImageCount(self, *_args, **_kwargs):
+        val = apply(gdic.wxImageList_GetImageCount,(self,) + _args, _kwargs)

         return val
         return val

-    def Remove(self,arg0):
-        val = gdic.wxImageList_Remove(self.this,arg0)
+    def Remove(self, *_args, **_kwargs):
+        val = apply(gdic.wxImageList_Remove,(self,) + _args, _kwargs)

         return val
         return val

-    def RemoveAll(self):
-        val = gdic.wxImageList_RemoveAll(self.this)
+    def RemoveAll(self, *_args, **_kwargs):
+        val = apply(gdic.wxImageList_RemoveAll,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxImageList instance>"
+        return "<C wxImageList instance at %s>" % (self.this,)

 class wxImageList(wxImageListPtr):
 class wxImageList(wxImageListPtr):

-    def __init__(self,arg0,arg1,*args) :
-        self.this = apply(gdic.new_wxImageList,(arg0,arg1,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxImageList,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -779,45 +745,39 @@ class wxImageList(wxImageListPtr):
 
 #-------------- FUNCTION WRAPPERS ------------------
 
 
 #-------------- FUNCTION WRAPPERS ------------------
 

-def wxEmptyBitmap(arg0,arg1,*args):
-    val = apply(gdic.wxEmptyBitmap,(arg0,arg1,)+args)
-    val = wxBitmapPtr(val)
-    val.thisown = 1
+def wxEmptyBitmap(*_args, **_kwargs):
+    val = apply(gdic.wxEmptyBitmap,_args,_kwargs)
+    if val: val = wxBitmapPtr(val); val.thisown = 1

     return val
 
     return val
 

-def wxNoRefBitmap(arg0,arg1):
-    val = gdic.wxNoRefBitmap(arg0,arg1)
-    val = wxBitmapPtr(val)
+def wxNoRefBitmap(*_args, **_kwargs):
+    val = apply(gdic.wxNoRefBitmap,_args,_kwargs)
+    if val: val = wxBitmapPtr(val)

     return val
 
     return val
 

-def wxBitmapFromData(arg0,arg1,arg2,arg3,*args):
-    val = apply(gdic.wxBitmapFromData,(arg0,arg1,arg2,arg3,)+args)
-    val = wxBitmapPtr(val)
-    val.thisown = 1
+def wxBitmapFromData(*_args, **_kwargs):
+    val = apply(gdic.wxBitmapFromData,_args,_kwargs)
+    if val: val = wxBitmapPtr(val); val.thisown = 1

     return val
 
     return val
 

-def wxMaskColour(arg0,arg1):
-    val = gdic.wxMaskColour(arg0.this,arg1.this)
-    val = wxMaskPtr(val)
-    val.thisown = 1
+def wxMaskColour(*_args, **_kwargs):
+    val = apply(gdic.wxMaskColour,_args,_kwargs)
+    if val: val = wxMaskPtr(val); val.thisown = 1

     return val
 
     return val
 

-def wxStockCursor(arg0):
-    val = gdic.wxStockCursor(arg0)
-    val = wxCursorPtr(val)
-    val.thisown = 1
+def wxStockCursor(*_args, **_kwargs):
+    val = apply(gdic.wxStockCursor,_args,_kwargs)
+    if val: val = wxCursorPtr(val); val.thisown = 1

     return val
 
     return val
 

-def wxNamedColour(arg0):
-    val = gdic.wxNamedColour(arg0)
-    val = wxColourPtr(val)
-    val.thisown = 1
+def wxNamedColour(*_args, **_kwargs):
+    val = apply(gdic.wxNamedColour,_args,_kwargs)
+    if val: val = wxColourPtr(val); val.thisown = 1

     return val
 
     return val
 

-def wxMemoryDCFromDC(arg0):
-    val = gdic.wxMemoryDCFromDC(arg0.this)
-    val = wxMemoryDCPtr(val)
-    val.thisown = 1
+def wxMemoryDCFromDC(*_args, **_kwargs):
+    val = apply(gdic.wxMemoryDCFromDC,_args,_kwargs)
+    if val: val = wxMemoryDCPtr(val); val.thisown = 1

     return val
 
 
     return val
 
 

diff --git a/utils/wxPython/src/msw/glcanvas.cpp b/utils/wxPython/src/msw/glcanvas.cpp
index e1d0ec65c5fb97f44ecabbab6814d9110535defd..5a6e137741cc2ac3e434809d5e6cefb447caef2b 100644 (file)
--- a/utils/wxPython/src/msw/glcanvas.cpp
+++ b/utils/wxPython/src/msw/glcanvas.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)

- * Version 1.1 (Patch 5)
+ * Version 1.1 (Patch 6)

  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.


@@ -24,16 +24,16 @@
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)

-#      define SWIGEXPORT(a,b) __declspec(dllexport) a b
+#      define SWIGEXPORT(a) __declspec(dllexport) a

 #   else
 #      if defined(__BORLANDC__)
 #   else
 #      if defined(__BORLANDC__)

-#          define SWIGEXPORT(a,b) a _export b
+#          define SWIGEXPORT(a) a _export 

 #      else
 #      else

-#          define SWIGEXPORT(a,b) a b
+#          define SWIGEXPORT(a) a 

 #      endif
 #   endif
 #else
 #      endif
 #   endif
 #else

-#   define SWIGEXPORT(a,b) a b
+#   define SWIGEXPORT(a) a 

 #endif
 
 #ifdef __cplusplus
 #endif
 
 #ifdef __cplusplus


@@ -43,12 +43,12 @@ extern "C" {
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);

+extern char *SWIG_GetPtrObj(PyObject *, void **, char *);

 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif
 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif

-

 #define SWIG_init    initglcanvasc
 
 #define SWIG_name    "glcanvasc"
 #define SWIG_init    initglcanvasc
 
 #define SWIG_name    "glcanvasc"


@@ -58,12 +58,13 @@ extern PyObject *SWIG_newvarlink(void);
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;

-    if (!target) {
+    PyObject*   o3;
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);
         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);


@@ -80,23 +81,23 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
     PyObject*   o3;
 
     PyObject*   o2;
     PyObject*   o3;
 

-    if (!target) {
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }
         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }

-        o3 = PyTuple_New(1);
-        PyTuple_SetItem(o3, 0, o);
+        o3 = PyTuple_New(1);            
+        PyTuple_SetItem(o3, 0, o);      

 
         o2 = target;
 
         o2 = target;

-        target = PySequence_Concat(o2, o3);
-        Py_DECREF(o2);
+        target = PySequence_Concat(o2, o3); 
+        Py_DECREF(o2);                      

         Py_DECREF(o3);
     }
     return target;
         Py_DECREF(o3);
     }
     return target;


@@ -120,6 +121,9 @@ static char* wxStringErrorMsg = "string type is required for parameter";
     static wxPoint  wxPyDefaultPosition(-1, -1);
     static wxSize   wxPyDefaultSize(-1, -1);
 #endif
     static wxPoint  wxPyDefaultPosition(-1, -1);
     static wxSize   wxPyDefaultSize(-1, -1);
 #endif

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

 static PyObject *_wrap_glArrayElementEXT(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLint  _arg0;
 static PyObject *_wrap_glArrayElementEXT(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLint  _arg0;


@@ -144,13 +148,14 @@ static PyObject *_wrap_glColorPointerEXT(PyObject *self, PyObject *args) {
     GLsizei  _arg2;
     GLsizei  _arg3;
     GLvoid * _arg4;
     GLsizei  _arg2;
     GLsizei  _arg3;
     GLvoid * _arg4;

-    char * _argc4 = 0;
+    PyObject * _argo4 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iiiis:glColorPointerEXT",&_arg0,&_arg1,&_arg2,&_arg3,&_argc4)) 
+    if(!PyArg_ParseTuple(args,"iiiiO:glColorPointerEXT",&_arg0,&_arg1,&_arg2,&_arg3,&_argo4)) 

         return NULL;
         return NULL;

-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,(char *) 0 )) {
+    if (_argo4) {
+        if (_argo4 == Py_None) { _arg4 = NULL; }
+        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,(char *) 0 )) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of glColorPointerEXT. Expected _GLvoid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of glColorPointerEXT. Expected _GLvoid_p.");
         return NULL;
         }


@@ -189,13 +194,14 @@ static PyObject *_wrap_glEdgeFlagPointerEXT(PyObject *self, PyObject *args) {
     GLsizei  _arg0;
     GLsizei  _arg1;
     GLboolean * _arg2;
     GLsizei  _arg0;
     GLsizei  _arg1;
     GLboolean * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glEdgeFlagPointerEXT",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glEdgeFlagPointerEXT",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_GLboolean_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_GLboolean_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glEdgeFlagPointerEXT. Expected _GLboolean_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glEdgeFlagPointerEXT. Expected _GLboolean_p.");
         return NULL;
         }


@@ -214,13 +220,14 @@ static PyObject *_wrap_glGetPointervEXT(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLvoid ** _arg1;
     PyObject * _resultobj;
     GLenum  _arg0;
     GLvoid ** _arg1;

-    char * _argc1 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"is:glGetPointervEXT",&_arg0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"iO:glGetPointervEXT",&_arg0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,(char *) 0 )) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,(char *) 0 )) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glGetPointervEXT. Expected _GLvoid_pp.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glGetPointervEXT. Expected _GLvoid_pp.");
         return NULL;
         }


@@ -241,13 +248,14 @@ static PyObject *_wrap_glIndexPointerEXT(PyObject *self, PyObject *args) {
     GLsizei  _arg1;
     GLsizei  _arg2;
     GLvoid * _arg3;
     GLsizei  _arg1;
     GLsizei  _arg2;
     GLvoid * _arg3;

-    char * _argc3 = 0;
+    PyObject * _argo3 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iiis:glIndexPointerEXT",&_arg0,&_arg1,&_arg2,&_argc3)) 
+    if(!PyArg_ParseTuple(args,"iiiO:glIndexPointerEXT",&_arg0,&_arg1,&_arg2,&_argo3)) 

         return NULL;
         return NULL;

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,(char *) 0 )) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,(char *) 0 )) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of glIndexPointerEXT. Expected _GLvoid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of glIndexPointerEXT. Expected _GLvoid_p.");
         return NULL;
         }


@@ -268,13 +276,14 @@ static PyObject *_wrap_glNormalPointerEXT(PyObject *self, PyObject *args) {
     GLsizei  _arg1;
     GLsizei  _arg2;
     GLvoid * _arg3;
     GLsizei  _arg1;
     GLsizei  _arg2;
     GLvoid * _arg3;

-    char * _argc3 = 0;
+    PyObject * _argo3 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iiis:glNormalPointerEXT",&_arg0,&_arg1,&_arg2,&_argc3)) 
+    if(!PyArg_ParseTuple(args,"iiiO:glNormalPointerEXT",&_arg0,&_arg1,&_arg2,&_argo3)) 

         return NULL;
         return NULL;

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,(char *) 0 )) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,(char *) 0 )) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of glNormalPointerEXT. Expected _GLvoid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of glNormalPointerEXT. Expected _GLvoid_p.");
         return NULL;
         }


@@ -296,13 +305,14 @@ static PyObject *_wrap_glTexCoordPointerEXT(PyObject *self, PyObject *args) {
     GLsizei  _arg2;
     GLsizei  _arg3;
     GLvoid * _arg4;
     GLsizei  _arg2;
     GLsizei  _arg3;
     GLvoid * _arg4;

-    char * _argc4 = 0;
+    PyObject * _argo4 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iiiis:glTexCoordPointerEXT",&_arg0,&_arg1,&_arg2,&_arg3,&_argc4)) 
+    if(!PyArg_ParseTuple(args,"iiiiO:glTexCoordPointerEXT",&_arg0,&_arg1,&_arg2,&_arg3,&_argo4)) 

         return NULL;
         return NULL;

-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,(char *) 0 )) {
+    if (_argo4) {
+        if (_argo4 == Py_None) { _arg4 = NULL; }
+        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,(char *) 0 )) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of glTexCoordPointerEXT. Expected _GLvoid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of glTexCoordPointerEXT. Expected _GLvoid_p.");
         return NULL;
         }


@@ -324,13 +334,14 @@ static PyObject *_wrap_glVertexPointerEXT(PyObject *self, PyObject *args) {
     GLsizei  _arg2;
     GLsizei  _arg3;
     GLvoid * _arg4;
     GLsizei  _arg2;
     GLsizei  _arg3;
     GLvoid * _arg4;

-    char * _argc4 = 0;
+    PyObject * _argo4 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iiiis:glVertexPointerEXT",&_arg0,&_arg1,&_arg2,&_arg3,&_argc4)) 
+    if(!PyArg_ParseTuple(args,"iiiiO:glVertexPointerEXT",&_arg0,&_arg1,&_arg2,&_arg3,&_argo4)) 

         return NULL;
         return NULL;

-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,(char *) 0 )) {
+    if (_argo4) {
+        if (_argo4 == Py_None) { _arg4 = NULL; }
+        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,(char *) 0 )) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of glVertexPointerEXT. Expected _GLvoid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of glVertexPointerEXT. Expected _GLvoid_p.");
         return NULL;
         }


@@ -353,13 +364,14 @@ static PyObject *_wrap_glColorSubtableEXT(PyObject *self, PyObject *args) {
     GLenum  _arg3;
     GLenum  _arg4;
     GLvoid * _arg5;
     GLenum  _arg3;
     GLenum  _arg4;
     GLvoid * _arg5;

-    char * _argc5 = 0;
+    PyObject * _argo5 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iiiiis:glColorSubtableEXT",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_argc5)) 
+    if(!PyArg_ParseTuple(args,"iiiiiO:glColorSubtableEXT",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_argo5)) 

         return NULL;
         return NULL;

-    if (_argc5) {
-        if (SWIG_GetPtr(_argc5,(void **) &_arg5,(char *) 0 )) {
+    if (_argo5) {
+        if (_argo5 == Py_None) { _arg5 = NULL; }
+        else if (SWIG_GetPtrObj(_argo5,(void **) &_arg5,(char *) 0 )) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of glColorSubtableEXT. Expected _GLvoid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of glColorSubtableEXT. Expected _GLvoid_p.");
         return NULL;
         }


@@ -382,13 +394,14 @@ static PyObject *_wrap_glColorTableEXT(PyObject *self, PyObject *args) {
     GLenum  _arg3;
     GLenum  _arg4;
     GLvoid * _arg5;
     GLenum  _arg3;
     GLenum  _arg4;
     GLvoid * _arg5;

-    char * _argc5 = 0;
+    PyObject * _argo5 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iiiiis:glColorTableEXT",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_argc5)) 
+    if(!PyArg_ParseTuple(args,"iiiiiO:glColorTableEXT",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_argo5)) 

         return NULL;
         return NULL;

-    if (_argc5) {
-        if (SWIG_GetPtr(_argc5,(void **) &_arg5,(char *) 0 )) {
+    if (_argo5) {
+        if (_argo5 == Py_None) { _arg5 = NULL; }
+        else if (SWIG_GetPtrObj(_argo5,(void **) &_arg5,(char *) 0 )) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of glColorTableEXT. Expected _GLvoid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of glColorTableEXT. Expected _GLvoid_p.");
         return NULL;
         }


@@ -430,13 +443,14 @@ static PyObject *_wrap_glGetColorTableEXT(PyObject *self, PyObject *args) {
     GLenum  _arg1;
     GLenum  _arg2;
     GLvoid * _arg3;
     GLenum  _arg1;
     GLenum  _arg2;
     GLvoid * _arg3;

-    char * _argc3 = 0;
+    PyObject * _argo3 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iiis:glGetColorTableEXT",&_arg0,&_arg1,&_arg2,&_argc3)) 
+    if(!PyArg_ParseTuple(args,"iiiO:glGetColorTableEXT",&_arg0,&_arg1,&_arg2,&_argo3)) 

         return NULL;
         return NULL;

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,(char *) 0 )) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,(char *) 0 )) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of glGetColorTableEXT. Expected _GLvoid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of glGetColorTableEXT. Expected _GLvoid_p.");
         return NULL;
         }


@@ -456,13 +470,14 @@ static PyObject *_wrap_glGetColorTableParamaterfvEXT(PyObject *self, PyObject *a
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glGetColorTableParamaterfvEXT",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glGetColorTableParamaterfvEXT",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_GLfloat_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glGetColorTableParamaterfvEXT. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glGetColorTableParamaterfvEXT. Expected _GLfloat_p.");
         return NULL;
         }


@@ -482,13 +497,14 @@ static PyObject *_wrap_glGetColorTavleParameterivEXT(PyObject *self, PyObject *a
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glGetColorTavleParameterivEXT",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glGetColorTavleParameterivEXT",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_GLint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_GLint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glGetColorTavleParameterivEXT. Expected _GLint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glGetColorTavleParameterivEXT. Expected _GLint_p.");
         return NULL;
         }


@@ -541,13 +557,14 @@ static PyObject *_wrap_glCullParameterdvSGI(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLdouble * _arg1;
     PyObject * _resultobj;
     GLenum  _arg0;
     GLdouble * _arg1;

-    char * _argc1 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"is:glCullParameterdvSGI",&_arg0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"iO:glCullParameterdvSGI",&_arg0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_GLdouble_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_GLdouble_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glCullParameterdvSGI. Expected _GLdouble_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glCullParameterdvSGI. Expected _GLdouble_p.");
         return NULL;
         }


@@ -566,13 +583,14 @@ static PyObject *_wrap_glCullParameterfvSGI(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLfloat * _arg1;
     PyObject * _resultobj;
     GLenum  _arg0;
     GLfloat * _arg1;

-    char * _argc1 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"is:glCullParameterfvSGI",&_arg0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"iO:glCullParameterfvSGI",&_arg0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_GLfloat_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glCullParameterfvSGI. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glCullParameterfvSGI. Expected _GLfloat_p.");
         return NULL;
         }


@@ -685,20 +703,22 @@ static PyObject *_wrap_glAreTexturesResident(PyObject *self, PyObject *args) {
     GLsizei  _arg0;
     GLuint * _arg1;
     GLboolean * _arg2;
     GLsizei  _arg0;
     GLuint * _arg1;
     GLboolean * _arg2;

-    char * _argc1 = 0;
-    char * _argc2 = 0;
+    PyObject * _argo1 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iss:glAreTexturesResident",&_arg0,&_argc1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iOO:glAreTexturesResident",&_arg0,&_argo1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_GLuint_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_GLuint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glAreTexturesResident. Expected _GLuint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glAreTexturesResident. Expected _GLuint_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_GLboolean_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_GLboolean_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glAreTexturesResident. Expected _GLboolean_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glAreTexturesResident. Expected _GLboolean_p.");
         return NULL;
         }


@@ -773,13 +793,14 @@ static PyObject *_wrap_glBitmap(PyObject *self, PyObject *args) {
     GLfloat  _arg4;
     GLfloat  _arg5;
     GLubyte * _arg6;
     GLfloat  _arg4;
     GLfloat  _arg5;
     GLubyte * _arg6;

-    char * _argc6 = 0;
+    PyObject * _argo6 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iiffffs:glBitmap",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_argc6)) 
+    if(!PyArg_ParseTuple(args,"iiffffO:glBitmap",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_argo6)) 

         return NULL;
         return NULL;

-    if (_argc6) {
-        if (SWIG_GetPtr(_argc6,(void **) &_arg6,"_GLubyte_p")) {
+    if (_argo6) {
+        if (_argo6 == Py_None) { _arg6 = NULL; }
+        else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_GLubyte_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of glBitmap. Expected _GLubyte_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of glBitmap. Expected _GLubyte_p.");
         return NULL;
         }


@@ -834,13 +855,14 @@ static PyObject *_wrap_glCallLists(PyObject *self, PyObject *args) {
     GLsizei  _arg0;
     GLenum  _arg1;
     GLvoid * _arg2;
     GLsizei  _arg0;
     GLenum  _arg1;
     GLvoid * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glCallLists",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glCallLists",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,(char *) 0 )) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,(char *) 0 )) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glCallLists. Expected _GLvoid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glCallLists. Expected _GLvoid_p.");
         return NULL;
         }


@@ -967,13 +989,14 @@ static PyObject *_wrap_glClipPlane(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLdouble * _arg1;
     PyObject * _resultobj;
     GLenum  _arg0;
     GLdouble * _arg1;

-    char * _argc1 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"is:glClipPlane",&_arg0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"iO:glClipPlane",&_arg0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_GLdouble_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_GLdouble_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glClipPlane. Expected _GLdouble_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glClipPlane. Expected _GLdouble_p.");
         return NULL;
         }


@@ -1010,13 +1033,14 @@ static PyObject *_wrap_glColor3b(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glColor3bv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLbyte * _arg0;
 static PyObject *_wrap_glColor3bv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLbyte * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glColor3bv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glColor3bv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLbyte_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLbyte_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glColor3bv. Expected _GLbyte_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glColor3bv. Expected _GLbyte_p.");
         return NULL;
         }


@@ -1053,13 +1077,14 @@ static PyObject *_wrap_glColor3d(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glColor3dv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;
 static PyObject *_wrap_glColor3dv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glColor3dv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glColor3dv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLdouble_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLdouble_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glColor3dv. Expected _GLdouble_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glColor3dv. Expected _GLdouble_p.");
         return NULL;
         }


@@ -1096,13 +1121,14 @@ static PyObject *_wrap_glColor3f(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glColor3fv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;
 static PyObject *_wrap_glColor3fv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glColor3fv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glColor3fv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLfloat_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glColor3fv. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glColor3fv. Expected _GLfloat_p.");
         return NULL;
         }


@@ -1139,13 +1165,14 @@ static PyObject *_wrap_glColor3i(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glColor3iv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLint * _arg0;
 static PyObject *_wrap_glColor3iv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLint * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glColor3iv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glColor3iv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glColor3iv. Expected _GLint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glColor3iv. Expected _GLint_p.");
         return NULL;
         }


@@ -1182,13 +1209,14 @@ static PyObject *_wrap_glColor3s(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glColor3sv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLshort * _arg0;
 static PyObject *_wrap_glColor3sv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLshort * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glColor3sv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glColor3sv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLshort_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLshort_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glColor3sv. Expected _GLshort_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glColor3sv. Expected _GLshort_p.");
         return NULL;
         }


@@ -1225,13 +1253,14 @@ static PyObject *_wrap_glColor3ub(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glColor3ubv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLubyte * _arg0;
 static PyObject *_wrap_glColor3ubv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLubyte * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glColor3ubv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glColor3ubv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLubyte_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLubyte_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glColor3ubv. Expected _GLubyte_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glColor3ubv. Expected _GLubyte_p.");
         return NULL;
         }


@@ -1268,13 +1297,14 @@ static PyObject *_wrap_glColor3ui(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glColor3uiv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLuint * _arg0;
 static PyObject *_wrap_glColor3uiv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLuint * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glColor3uiv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glColor3uiv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLuint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLuint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glColor3uiv. Expected _GLuint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glColor3uiv. Expected _GLuint_p.");
         return NULL;
         }


@@ -1311,13 +1341,14 @@ static PyObject *_wrap_glColor3us(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glColor3usv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLushort * _arg0;
 static PyObject *_wrap_glColor3usv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLushort * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glColor3usv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glColor3usv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLushort_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLushort_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glColor3usv. Expected _GLushort_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glColor3usv. Expected _GLushort_p.");
         return NULL;
         }


@@ -1355,13 +1386,14 @@ static PyObject *_wrap_glColor4b(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glColor4bv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLbyte * _arg0;
 static PyObject *_wrap_glColor4bv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLbyte * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glColor4bv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glColor4bv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLbyte_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLbyte_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glColor4bv. Expected _GLbyte_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glColor4bv. Expected _GLbyte_p.");
         return NULL;
         }


@@ -1399,13 +1431,14 @@ static PyObject *_wrap_glColor4d(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glColor4dv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;
 static PyObject *_wrap_glColor4dv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glColor4dv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glColor4dv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLdouble_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLdouble_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glColor4dv. Expected _GLdouble_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glColor4dv. Expected _GLdouble_p.");
         return NULL;
         }


@@ -1443,13 +1476,14 @@ static PyObject *_wrap_glColor4f(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glColor4fv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;
 static PyObject *_wrap_glColor4fv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glColor4fv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glColor4fv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLfloat_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glColor4fv. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glColor4fv. Expected _GLfloat_p.");
         return NULL;
         }


@@ -1487,13 +1521,14 @@ static PyObject *_wrap_glColor4i(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glColor4iv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLint * _arg0;
 static PyObject *_wrap_glColor4iv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLint * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glColor4iv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glColor4iv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glColor4iv. Expected _GLint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glColor4iv. Expected _GLint_p.");
         return NULL;
         }


@@ -1531,13 +1566,14 @@ static PyObject *_wrap_glColor4s(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glColor4sv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLshort * _arg0;
 static PyObject *_wrap_glColor4sv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLshort * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glColor4sv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glColor4sv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLshort_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLshort_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glColor4sv. Expected _GLshort_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glColor4sv. Expected _GLshort_p.");
         return NULL;
         }


@@ -1575,13 +1611,14 @@ static PyObject *_wrap_glColor4ub(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glColor4ubv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLubyte * _arg0;
 static PyObject *_wrap_glColor4ubv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLubyte * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glColor4ubv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glColor4ubv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLubyte_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLubyte_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glColor4ubv. Expected _GLubyte_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glColor4ubv. Expected _GLubyte_p.");
         return NULL;
         }


@@ -1619,13 +1656,14 @@ static PyObject *_wrap_glColor4ui(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glColor4uiv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLuint * _arg0;
 static PyObject *_wrap_glColor4uiv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLuint * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glColor4uiv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glColor4uiv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLuint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLuint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glColor4uiv. Expected _GLuint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glColor4uiv. Expected _GLuint_p.");
         return NULL;
         }


@@ -1663,13 +1701,14 @@ static PyObject *_wrap_glColor4us(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glColor4usv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLushort * _arg0;
 static PyObject *_wrap_glColor4usv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLushort * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glColor4usv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glColor4usv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLushort_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLushort_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glColor4usv. Expected _GLushort_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glColor4usv. Expected _GLushort_p.");
         return NULL;
         }


@@ -1728,13 +1767,14 @@ static PyObject *_wrap_glColorPointer(PyObject *self, PyObject *args) {
     GLenum  _arg1;
     GLsizei  _arg2;
     GLvoid * _arg3;
     GLenum  _arg1;
     GLsizei  _arg2;
     GLvoid * _arg3;

-    char * _argc3 = 0;
+    PyObject * _argo3 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iiis:glColorPointer",&_arg0,&_arg1,&_arg2,&_argc3)) 
+    if(!PyArg_ParseTuple(args,"iiiO:glColorPointer",&_arg0,&_arg1,&_arg2,&_argo3)) 

         return NULL;
         return NULL;

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,(char *) 0 )) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,(char *) 0 )) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of glColorPointer. Expected _GLvoid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of glColorPointer. Expected _GLvoid_p.");
         return NULL;
         }


@@ -1902,13 +1942,14 @@ static PyObject *_wrap_glDeleteTextures(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLsizei  _arg0;
     GLuint * _arg1;
     PyObject * _resultobj;
     GLsizei  _arg0;
     GLuint * _arg1;

-    char * _argc1 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"is:glDeleteTextures",&_arg0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"iO:glDeleteTextures",&_arg0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_GLuint_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_GLuint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glDeleteTextures. Expected _GLuint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glDeleteTextures. Expected _GLuint_p.");
         return NULL;
         }


@@ -2051,13 +2092,14 @@ static PyObject *_wrap_glDrawElements(PyObject *self, PyObject *args) {
     GLsizei  _arg1;
     GLenum  _arg2;
     GLvoid * _arg3;
     GLsizei  _arg1;
     GLenum  _arg2;
     GLvoid * _arg3;

-    char * _argc3 = 0;
+    PyObject * _argo3 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iiis:glDrawElements",&_arg0,&_arg1,&_arg2,&_argc3)) 
+    if(!PyArg_ParseTuple(args,"iiiO:glDrawElements",&_arg0,&_arg1,&_arg2,&_argo3)) 

         return NULL;
         return NULL;

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,(char *) 0 )) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,(char *) 0 )) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of glDrawElements. Expected _GLvoid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of glDrawElements. Expected _GLvoid_p.");
         return NULL;
         }


@@ -2079,13 +2121,14 @@ static PyObject *_wrap_glDrawPixels(PyObject *self, PyObject *args) {
     GLenum  _arg2;
     GLenum  _arg3;
     GLvoid * _arg4;
     GLenum  _arg2;
     GLenum  _arg3;
     GLvoid * _arg4;

-    char * _argc4 = 0;
+    PyObject * _argo4 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iiiis:glDrawPixels",&_arg0,&_arg1,&_arg2,&_arg3,&_argc4)) 
+    if(!PyArg_ParseTuple(args,"iiiiO:glDrawPixels",&_arg0,&_arg1,&_arg2,&_arg3,&_argo4)) 

         return NULL;
         return NULL;

-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,(char *) 0 )) {
+    if (_argo4) {
+        if (_argo4 == Py_None) { _arg4 = NULL; }
+        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,(char *) 0 )) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of glDrawPixels. Expected _GLvoid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of glDrawPixels. Expected _GLvoid_p.");
         return NULL;
         }


@@ -2121,13 +2164,14 @@ static PyObject *_wrap_glEdgeFlagPointer(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLsizei  _arg0;
     GLvoid * _arg1;
     PyObject * _resultobj;
     GLsizei  _arg0;
     GLvoid * _arg1;

-    char * _argc1 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"is:glEdgeFlagPointer",&_arg0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"iO:glEdgeFlagPointer",&_arg0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,(char *) 0 )) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,(char *) 0 )) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glEdgeFlagPointer. Expected _GLvoid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glEdgeFlagPointer. Expected _GLvoid_p.");
         return NULL;
         }


@@ -2145,13 +2189,14 @@ static PyObject *_wrap_glEdgeFlagPointer(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glEdgeFlagv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLboolean * _arg0;
 static PyObject *_wrap_glEdgeFlagv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLboolean * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glEdgeFlagv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glEdgeFlagv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLboolean_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLboolean_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glEdgeFlagv. Expected _GLboolean_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glEdgeFlagv. Expected _GLboolean_p.");
         return NULL;
         }


@@ -2252,13 +2297,14 @@ static PyObject *_wrap_glEvalCoord1d(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glEvalCoord1dv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;
 static PyObject *_wrap_glEvalCoord1dv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glEvalCoord1dv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glEvalCoord1dv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLdouble_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLdouble_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glEvalCoord1dv. Expected _GLdouble_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glEvalCoord1dv. Expected _GLdouble_p.");
         return NULL;
         }


@@ -2293,13 +2339,14 @@ static PyObject *_wrap_glEvalCoord1f(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glEvalCoord1fv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;
 static PyObject *_wrap_glEvalCoord1fv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glEvalCoord1fv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glEvalCoord1fv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLfloat_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glEvalCoord1fv. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glEvalCoord1fv. Expected _GLfloat_p.");
         return NULL;
         }


@@ -2335,13 +2382,14 @@ static PyObject *_wrap_glEvalCoord2d(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glEvalCoord2dv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;
 static PyObject *_wrap_glEvalCoord2dv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glEvalCoord2dv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glEvalCoord2dv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLdouble_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLdouble_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glEvalCoord2dv. Expected _GLdouble_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glEvalCoord2dv. Expected _GLdouble_p.");
         return NULL;
         }


@@ -2377,13 +2425,14 @@ static PyObject *_wrap_glEvalCoord2f(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glEvalCoord2fv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;
 static PyObject *_wrap_glEvalCoord2fv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glEvalCoord2fv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glEvalCoord2fv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLfloat_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glEvalCoord2fv. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glEvalCoord2fv. Expected _GLfloat_p.");
         return NULL;
         }


@@ -2478,13 +2527,14 @@ static PyObject *_wrap_glFeedbackBuffer(PyObject *self, PyObject *args) {
     GLsizei  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;
     GLsizei  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glFeedbackBuffer",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glFeedbackBuffer",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_GLfloat_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glFeedbackBuffer. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glFeedbackBuffer. Expected _GLfloat_p.");
         return NULL;
         }


@@ -2553,13 +2603,14 @@ static PyObject *_wrap_glFogfv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLfloat * _arg1;
     PyObject * _resultobj;
     GLenum  _arg0;
     GLfloat * _arg1;

-    char * _argc1 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"is:glFogfv",&_arg0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"iO:glFogfv",&_arg0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_GLfloat_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glFogfv. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glFogfv. Expected _GLfloat_p.");
         return NULL;
         }


@@ -2596,13 +2647,14 @@ static PyObject *_wrap_glFogiv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLint * _arg1;
     PyObject * _resultobj;
     GLenum  _arg0;
     GLint * _arg1;

-    char * _argc1 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"is:glFogiv",&_arg0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"iO:glFogiv",&_arg0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_GLint_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_GLint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glFogiv. Expected _GLint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glFogiv. Expected _GLint_p.");
         return NULL;
         }


@@ -2677,13 +2729,14 @@ static PyObject *_wrap_glGenTextures(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLsizei  _arg0;
     GLuint * _arg1;
     PyObject * _resultobj;
     GLsizei  _arg0;
     GLuint * _arg1;

-    char * _argc1 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"is:glGenTextures",&_arg0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"iO:glGenTextures",&_arg0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_GLuint_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_GLuint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glGenTextures. Expected _GLuint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glGenTextures. Expected _GLuint_p.");
         return NULL;
         }


@@ -2702,13 +2755,14 @@ static PyObject *_wrap_glGetBooleanv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLboolean * _arg1;
     PyObject * _resultobj;
     GLenum  _arg0;
     GLboolean * _arg1;

-    char * _argc1 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"is:glGetBooleanv",&_arg0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"iO:glGetBooleanv",&_arg0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_GLboolean_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_GLboolean_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glGetBooleanv. Expected _GLboolean_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glGetBooleanv. Expected _GLboolean_p.");
         return NULL;
         }


@@ -2727,13 +2781,14 @@ static PyObject *_wrap_glGetClipPlane(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLdouble * _arg1;
     PyObject * _resultobj;
     GLenum  _arg0;
     GLdouble * _arg1;

-    char * _argc1 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"is:glGetClipPlane",&_arg0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"iO:glGetClipPlane",&_arg0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_GLdouble_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_GLdouble_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glGetClipPlane. Expected _GLdouble_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glGetClipPlane. Expected _GLdouble_p.");
         return NULL;
         }


@@ -2752,13 +2807,14 @@ static PyObject *_wrap_glGetDoublev(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLdouble * _arg1;
     PyObject * _resultobj;
     GLenum  _arg0;
     GLdouble * _arg1;

-    char * _argc1 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"is:glGetDoublev",&_arg0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"iO:glGetDoublev",&_arg0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_GLdouble_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_GLdouble_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glGetDoublev. Expected _GLdouble_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glGetDoublev. Expected _GLdouble_p.");
         return NULL;
         }


@@ -2793,13 +2849,14 @@ static PyObject *_wrap_glGetFloatv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLfloat * _arg1;
     PyObject * _resultobj;
     GLenum  _arg0;
     GLfloat * _arg1;

-    char * _argc1 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"is:glGetFloatv",&_arg0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"iO:glGetFloatv",&_arg0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_GLfloat_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glGetFloatv. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glGetFloatv. Expected _GLfloat_p.");
         return NULL;
         }


@@ -2818,13 +2875,14 @@ static PyObject *_wrap_glGetIntegerv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLint * _arg1;
     PyObject * _resultobj;
     GLenum  _arg0;
     GLint * _arg1;

-    char * _argc1 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"is:glGetIntegerv",&_arg0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"iO:glGetIntegerv",&_arg0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_GLint_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_GLint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glGetIntegerv. Expected _GLint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glGetIntegerv. Expected _GLint_p.");
         return NULL;
         }


@@ -2844,13 +2902,14 @@ static PyObject *_wrap_glGetLightfv(PyObject *self, PyObject *args) {
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glGetLightfv",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glGetLightfv",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_GLfloat_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glGetLightfv. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glGetLightfv. Expected _GLfloat_p.");
         return NULL;
         }


@@ -2870,13 +2929,14 @@ static PyObject *_wrap_glGetLightiv(PyObject *self, PyObject *args) {
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glGetLightiv",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glGetLightiv",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_GLint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_GLint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glGetLightiv. Expected _GLint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glGetLightiv. Expected _GLint_p.");
         return NULL;
         }


@@ -2896,13 +2956,14 @@ static PyObject *_wrap_glGetMapdv(PyObject *self, PyObject *args) {
     GLenum  _arg0;
     GLenum  _arg1;
     GLdouble * _arg2;
     GLenum  _arg0;
     GLenum  _arg1;
     GLdouble * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glGetMapdv",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glGetMapdv",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_GLdouble_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_GLdouble_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glGetMapdv. Expected _GLdouble_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glGetMapdv. Expected _GLdouble_p.");
         return NULL;
         }


@@ -2922,13 +2983,14 @@ static PyObject *_wrap_glGetMapfv(PyObject *self, PyObject *args) {
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glGetMapfv",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glGetMapfv",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_GLfloat_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glGetMapfv. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glGetMapfv. Expected _GLfloat_p.");
         return NULL;
         }


@@ -2948,13 +3010,14 @@ static PyObject *_wrap_glGetMapiv(PyObject *self, PyObject *args) {
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glGetMapiv",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glGetMapiv",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_GLint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_GLint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glGetMapiv. Expected _GLint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glGetMapiv. Expected _GLint_p.");
         return NULL;
         }


@@ -2974,13 +3037,14 @@ static PyObject *_wrap_glGetMaterialfv(PyObject *self, PyObject *args) {
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glGetMaterialfv",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glGetMaterialfv",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_GLfloat_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glGetMaterialfv. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glGetMaterialfv. Expected _GLfloat_p.");
         return NULL;
         }


@@ -3000,13 +3064,14 @@ static PyObject *_wrap_glGetMaterialiv(PyObject *self, PyObject *args) {
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glGetMaterialiv",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glGetMaterialiv",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_GLint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_GLint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glGetMaterialiv. Expected _GLint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glGetMaterialiv. Expected _GLint_p.");
         return NULL;
         }


@@ -3025,13 +3090,14 @@ static PyObject *_wrap_glGetPixelMapfv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLfloat * _arg1;
     PyObject * _resultobj;
     GLenum  _arg0;
     GLfloat * _arg1;

-    char * _argc1 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"is:glGetPixelMapfv",&_arg0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"iO:glGetPixelMapfv",&_arg0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_GLfloat_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glGetPixelMapfv. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glGetPixelMapfv. Expected _GLfloat_p.");
         return NULL;
         }


@@ -3050,13 +3116,14 @@ static PyObject *_wrap_glGetPixelMapuiv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLuint * _arg1;
     PyObject * _resultobj;
     GLenum  _arg0;
     GLuint * _arg1;

-    char * _argc1 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"is:glGetPixelMapuiv",&_arg0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"iO:glGetPixelMapuiv",&_arg0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_GLuint_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_GLuint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glGetPixelMapuiv. Expected _GLuint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glGetPixelMapuiv. Expected _GLuint_p.");
         return NULL;
         }


@@ -3075,13 +3142,14 @@ static PyObject *_wrap_glGetPixelMapusv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLushort * _arg1;
     PyObject * _resultobj;
     GLenum  _arg0;
     GLushort * _arg1;

-    char * _argc1 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"is:glGetPixelMapusv",&_arg0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"iO:glGetPixelMapusv",&_arg0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_GLushort_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_GLushort_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glGetPixelMapusv. Expected _GLushort_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glGetPixelMapusv. Expected _GLushort_p.");
         return NULL;
         }


@@ -3100,13 +3168,14 @@ static PyObject *_wrap_glGetPointerv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLvoid ** _arg1;
     PyObject * _resultobj;
     GLenum  _arg0;
     GLvoid ** _arg1;

-    char * _argc1 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"is:glGetPointerv",&_arg0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"iO:glGetPointerv",&_arg0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,(char *) 0 )) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,(char *) 0 )) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glGetPointerv. Expected _GLvoid_pp.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glGetPointerv. Expected _GLvoid_pp.");
         return NULL;
         }


@@ -3124,13 +3193,14 @@ static PyObject *_wrap_glGetPointerv(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glGetPolygonStipple(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLubyte * _arg0;
 static PyObject *_wrap_glGetPolygonStipple(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLubyte * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glGetPolygonStipple",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glGetPolygonStipple",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLubyte_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLubyte_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glGetPolygonStipple. Expected _GLubyte_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glGetPolygonStipple. Expected _GLubyte_p.");
         return NULL;
         }


@@ -3159,8 +3229,13 @@ static PyObject *_wrap_glGetString(PyObject *self, PyObject *args) {
         _result = (GLubyte *)glGetString(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (GLubyte *)glGetString(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_GLubyte_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_GLubyte_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3169,13 +3244,14 @@ static PyObject *_wrap_glGetTexEnvfv(PyObject *self, PyObject *args) {
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glGetTexEnvfv",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glGetTexEnvfv",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_GLfloat_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glGetTexEnvfv. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glGetTexEnvfv. Expected _GLfloat_p.");
         return NULL;
         }


@@ -3195,13 +3271,14 @@ static PyObject *_wrap_glGetTexEnviv(PyObject *self, PyObject *args) {
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glGetTexEnviv",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glGetTexEnviv",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_GLint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_GLint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glGetTexEnviv. Expected _GLint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glGetTexEnviv. Expected _GLint_p.");
         return NULL;
         }


@@ -3221,13 +3298,14 @@ static PyObject *_wrap_glGetTexGendv(PyObject *self, PyObject *args) {
     GLenum  _arg0;
     GLenum  _arg1;
     GLdouble * _arg2;
     GLenum  _arg0;
     GLenum  _arg1;
     GLdouble * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glGetTexGendv",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glGetTexGendv",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_GLdouble_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_GLdouble_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glGetTexGendv. Expected _GLdouble_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glGetTexGendv. Expected _GLdouble_p.");
         return NULL;
         }


@@ -3247,13 +3325,14 @@ static PyObject *_wrap_glGetTexGenfv(PyObject *self, PyObject *args) {
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glGetTexGenfv",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glGetTexGenfv",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_GLfloat_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glGetTexGenfv. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glGetTexGenfv. Expected _GLfloat_p.");
         return NULL;
         }


@@ -3273,13 +3352,14 @@ static PyObject *_wrap_glGetTexGeniv(PyObject *self, PyObject *args) {
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glGetTexGeniv",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glGetTexGeniv",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_GLint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_GLint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glGetTexGeniv. Expected _GLint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glGetTexGeniv. Expected _GLint_p.");
         return NULL;
         }


@@ -3301,13 +3381,14 @@ static PyObject *_wrap_glGetTexImage(PyObject *self, PyObject *args) {
     GLenum  _arg2;
     GLenum  _arg3;
     GLvoid * _arg4;
     GLenum  _arg2;
     GLenum  _arg3;
     GLvoid * _arg4;

-    char * _argc4 = 0;
+    PyObject * _argo4 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iiiis:glGetTexImage",&_arg0,&_arg1,&_arg2,&_arg3,&_argc4)) 
+    if(!PyArg_ParseTuple(args,"iiiiO:glGetTexImage",&_arg0,&_arg1,&_arg2,&_arg3,&_argo4)) 

         return NULL;
         return NULL;

-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,(char *) 0 )) {
+    if (_argo4) {
+        if (_argo4 == Py_None) { _arg4 = NULL; }
+        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,(char *) 0 )) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of glGetTexImage. Expected _GLvoid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of glGetTexImage. Expected _GLvoid_p.");
         return NULL;
         }


@@ -3328,13 +3409,14 @@ static PyObject *_wrap_glGetTexLevelParameterfv(PyObject *self, PyObject *args)
     GLint  _arg1;
     GLenum  _arg2;
     GLfloat * _arg3;
     GLint  _arg1;
     GLenum  _arg2;
     GLfloat * _arg3;

-    char * _argc3 = 0;
+    PyObject * _argo3 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iiis:glGetTexLevelParameterfv",&_arg0,&_arg1,&_arg2,&_argc3)) 
+    if(!PyArg_ParseTuple(args,"iiiO:glGetTexLevelParameterfv",&_arg0,&_arg1,&_arg2,&_argo3)) 

         return NULL;
         return NULL;

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_GLfloat_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of glGetTexLevelParameterfv. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of glGetTexLevelParameterfv. Expected _GLfloat_p.");
         return NULL;
         }


@@ -3355,13 +3437,14 @@ static PyObject *_wrap_glGetTexLevelParameteriv(PyObject *self, PyObject *args)
     GLint  _arg1;
     GLenum  _arg2;
     GLint * _arg3;
     GLint  _arg1;
     GLenum  _arg2;
     GLint * _arg3;

-    char * _argc3 = 0;
+    PyObject * _argo3 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iiis:glGetTexLevelParameteriv",&_arg0,&_arg1,&_arg2,&_argc3)) 
+    if(!PyArg_ParseTuple(args,"iiiO:glGetTexLevelParameteriv",&_arg0,&_arg1,&_arg2,&_argo3)) 

         return NULL;
         return NULL;

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_GLint_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_GLint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of glGetTexLevelParameteriv. Expected _GLint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of glGetTexLevelParameteriv. Expected _GLint_p.");
         return NULL;
         }


@@ -3381,13 +3464,14 @@ static PyObject *_wrap_glGetTexParameterfv(PyObject *self, PyObject *args) {
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glGetTexParameterfv",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glGetTexParameterfv",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_GLfloat_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glGetTexParameterfv. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glGetTexParameterfv. Expected _GLfloat_p.");
         return NULL;
         }


@@ -3407,13 +3491,14 @@ static PyObject *_wrap_glGetTexParameteriv(PyObject *self, PyObject *args) {
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glGetTexParameteriv",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glGetTexParameteriv",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_GLint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_GLint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glGetTexParameteriv. Expected _GLint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glGetTexParameteriv. Expected _GLint_p.");
         return NULL;
         }


@@ -3468,13 +3553,14 @@ static PyObject *_wrap_glIndexPointer(PyObject *self, PyObject *args) {
     GLenum  _arg0;
     GLsizei  _arg1;
     GLvoid * _arg2;
     GLenum  _arg0;
     GLsizei  _arg1;
     GLvoid * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glIndexPointer",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glIndexPointer",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,(char *) 0 )) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,(char *) 0 )) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glIndexPointer. Expected _GLvoid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glIndexPointer. Expected _GLvoid_p.");
         return NULL;
         }


@@ -3509,13 +3595,14 @@ static PyObject *_wrap_glIndexd(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glIndexdv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;
 static PyObject *_wrap_glIndexdv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glIndexdv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glIndexdv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLdouble_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLdouble_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glIndexdv. Expected _GLdouble_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glIndexdv. Expected _GLdouble_p.");
         return NULL;
         }


@@ -3550,13 +3637,14 @@ static PyObject *_wrap_glIndexf(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glIndexfv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;
 static PyObject *_wrap_glIndexfv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glIndexfv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glIndexfv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLfloat_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glIndexfv. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glIndexfv. Expected _GLfloat_p.");
         return NULL;
         }


@@ -3591,13 +3679,14 @@ static PyObject *_wrap_glIndexi(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glIndexiv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLint * _arg0;
 static PyObject *_wrap_glIndexiv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLint * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glIndexiv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glIndexiv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glIndexiv. Expected _GLint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glIndexiv. Expected _GLint_p.");
         return NULL;
         }


@@ -3632,13 +3721,14 @@ static PyObject *_wrap_glIndexs(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glIndexsv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLshort * _arg0;
 static PyObject *_wrap_glIndexsv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLshort * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glIndexsv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glIndexsv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLshort_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLshort_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glIndexsv. Expected _GLshort_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glIndexsv. Expected _GLshort_p.");
         return NULL;
         }


@@ -3673,13 +3763,14 @@ static PyObject *_wrap_glIndexub(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glIndexubv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLubyte * _arg0;
 static PyObject *_wrap_glIndexubv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLubyte * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glIndexubv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glIndexubv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLubyte_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLubyte_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glIndexubv. Expected _GLubyte_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glIndexubv. Expected _GLubyte_p.");
         return NULL;
         }


@@ -3715,13 +3806,14 @@ static PyObject *_wrap_glInterleavedArrays(PyObject *self, PyObject *args) {
     GLenum  _arg0;
     GLsizei  _arg1;
     GLvoid * _arg2;
     GLenum  _arg0;
     GLsizei  _arg1;
     GLvoid * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glInterleavedArrays",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glInterleavedArrays",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,(char *) 0 )) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,(char *) 0 )) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glInterleavedArrays. Expected _GLvoid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glInterleavedArrays. Expected _GLvoid_p.");
         return NULL;
         }


@@ -3809,13 +3901,14 @@ static PyObject *_wrap_glLightModelfv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLfloat * _arg1;
     PyObject * _resultobj;
     GLenum  _arg0;
     GLfloat * _arg1;

-    char * _argc1 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"is:glLightModelfv",&_arg0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"iO:glLightModelfv",&_arg0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_GLfloat_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glLightModelfv. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glLightModelfv. Expected _GLfloat_p.");
         return NULL;
         }


@@ -3852,13 +3945,14 @@ static PyObject *_wrap_glLightModeliv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLint * _arg1;
     PyObject * _resultobj;
     GLenum  _arg0;
     GLint * _arg1;

-    char * _argc1 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"is:glLightModeliv",&_arg0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"iO:glLightModeliv",&_arg0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_GLint_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_GLint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glLightModeliv. Expected _GLint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glLightModeliv. Expected _GLint_p.");
         return NULL;
         }


@@ -3897,13 +3991,14 @@ static PyObject *_wrap_glLightfv(PyObject *self, PyObject *args) {
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glLightfv",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glLightfv",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_GLfloat_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glLightfv. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glLightfv. Expected _GLfloat_p.");
         return NULL;
         }


@@ -3942,13 +4037,14 @@ static PyObject *_wrap_glLightiv(PyObject *self, PyObject *args) {
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glLightiv",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glLightiv",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_GLint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_GLint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glLightiv. Expected _GLint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glLightiv. Expected _GLint_p.");
         return NULL;
         }


@@ -4034,13 +4130,14 @@ static PyObject *_wrap_glLoadIdentity(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glLoadMatrixd(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;
 static PyObject *_wrap_glLoadMatrixd(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glLoadMatrixd",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glLoadMatrixd",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLdouble_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLdouble_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glLoadMatrixd. Expected _GLdouble_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glLoadMatrixd. Expected _GLdouble_p.");
         return NULL;
         }


@@ -4058,13 +4155,14 @@ static PyObject *_wrap_glLoadMatrixd(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glLoadMatrixf(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;
 static PyObject *_wrap_glLoadMatrixf(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glLoadMatrixf",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glLoadMatrixf",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLfloat_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glLoadMatrixf. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glLoadMatrixf. Expected _GLfloat_p.");
         return NULL;
         }


@@ -4121,13 +4219,14 @@ static PyObject *_wrap_glMap1d(PyObject *self, PyObject *args) {
     GLint  _arg3;
     GLint  _arg4;
     GLdouble * _arg5;
     GLint  _arg3;
     GLint  _arg4;
     GLdouble * _arg5;

-    char * _argc5 = 0;
+    PyObject * _argo5 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iddiis:glMap1d",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_argc5)) 
+    if(!PyArg_ParseTuple(args,"iddiiO:glMap1d",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_argo5)) 

         return NULL;
         return NULL;

-    if (_argc5) {
-        if (SWIG_GetPtr(_argc5,(void **) &_arg5,"_GLdouble_p")) {
+    if (_argo5) {
+        if (_argo5 == Py_None) { _arg5 = NULL; }
+        else if (SWIG_GetPtrObj(_argo5,(void **) &_arg5,"_GLdouble_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of glMap1d. Expected _GLdouble_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of glMap1d. Expected _GLdouble_p.");
         return NULL;
         }


@@ -4150,13 +4249,14 @@ static PyObject *_wrap_glMap1f(PyObject *self, PyObject *args) {
     GLint  _arg3;
     GLint  _arg4;
     GLfloat * _arg5;
     GLint  _arg3;
     GLint  _arg4;
     GLfloat * _arg5;

-    char * _argc5 = 0;
+    PyObject * _argo5 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iffiis:glMap1f",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_argc5)) 
+    if(!PyArg_ParseTuple(args,"iffiiO:glMap1f",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_argo5)) 

         return NULL;
         return NULL;

-    if (_argc5) {
-        if (SWIG_GetPtr(_argc5,(void **) &_arg5,"_GLfloat_p")) {
+    if (_argo5) {
+        if (_argo5 == Py_None) { _arg5 = NULL; }
+        else if (SWIG_GetPtrObj(_argo5,(void **) &_arg5,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of glMap1f. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of glMap1f. Expected _GLfloat_p.");
         return NULL;
         }


@@ -4183,13 +4283,14 @@ static PyObject *_wrap_glMap2d(PyObject *self, PyObject *args) {
     GLint  _arg7;
     GLint  _arg8;
     GLdouble * _arg9;
     GLint  _arg7;
     GLint  _arg8;
     GLdouble * _arg9;

-    char * _argc9 = 0;
+    PyObject * _argo9 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iddiiddiis:glMap2d",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6,&_arg7,&_arg8,&_argc9)) 
+    if(!PyArg_ParseTuple(args,"iddiiddiiO:glMap2d",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6,&_arg7,&_arg8,&_argo9)) 

         return NULL;
         return NULL;

-    if (_argc9) {
-        if (SWIG_GetPtr(_argc9,(void **) &_arg9,"_GLdouble_p")) {
+    if (_argo9) {
+        if (_argo9 == Py_None) { _arg9 = NULL; }
+        else if (SWIG_GetPtrObj(_argo9,(void **) &_arg9,"_GLdouble_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 10 of glMap2d. Expected _GLdouble_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 10 of glMap2d. Expected _GLdouble_p.");
         return NULL;
         }


@@ -4216,13 +4317,14 @@ static PyObject *_wrap_glMap2f(PyObject *self, PyObject *args) {
     GLint  _arg7;
     GLint  _arg8;
     GLfloat * _arg9;
     GLint  _arg7;
     GLint  _arg8;
     GLfloat * _arg9;

-    char * _argc9 = 0;
+    PyObject * _argo9 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iffiiffiis:glMap2f",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6,&_arg7,&_arg8,&_argc9)) 
+    if(!PyArg_ParseTuple(args,"iffiiffiiO:glMap2f",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6,&_arg7,&_arg8,&_argo9)) 

         return NULL;
         return NULL;

-    if (_argc9) {
-        if (SWIG_GetPtr(_argc9,(void **) &_arg9,"_GLfloat_p")) {
+    if (_argo9) {
+        if (_argo9 == Py_None) { _arg9 = NULL; }
+        else if (SWIG_GetPtrObj(_argo9,(void **) &_arg9,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 10 of glMap2f. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 10 of glMap2f. Expected _GLfloat_p.");
         return NULL;
         }


@@ -4343,13 +4445,14 @@ static PyObject *_wrap_glMaterialfv(PyObject *self, PyObject *args) {
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glMaterialfv",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glMaterialfv",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_GLfloat_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glMaterialfv. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glMaterialfv. Expected _GLfloat_p.");
         return NULL;
         }


@@ -4388,13 +4491,14 @@ static PyObject *_wrap_glMaterialiv(PyObject *self, PyObject *args) {
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glMaterialiv",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glMaterialiv",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_GLint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_GLint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glMaterialiv. Expected _GLint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glMaterialiv. Expected _GLint_p.");
         return NULL;
         }


@@ -4429,13 +4533,14 @@ static PyObject *_wrap_glMatrixMode(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glMultMatrixd(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;
 static PyObject *_wrap_glMultMatrixd(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glMultMatrixd",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glMultMatrixd",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLdouble_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLdouble_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glMultMatrixd. Expected _GLdouble_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glMultMatrixd. Expected _GLdouble_p.");
         return NULL;
         }


@@ -4453,13 +4558,14 @@ static PyObject *_wrap_glMultMatrixd(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glMultMatrixf(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;
 static PyObject *_wrap_glMultMatrixf(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glMultMatrixf",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glMultMatrixf",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLfloat_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glMultMatrixf. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glMultMatrixf. Expected _GLfloat_p.");
         return NULL;
         }


@@ -4514,13 +4620,14 @@ static PyObject *_wrap_glNormal3b(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glNormal3bv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLbyte * _arg0;
 static PyObject *_wrap_glNormal3bv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLbyte * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glNormal3bv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glNormal3bv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLbyte_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLbyte_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glNormal3bv. Expected _GLbyte_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glNormal3bv. Expected _GLbyte_p.");
         return NULL;
         }


@@ -4557,13 +4664,14 @@ static PyObject *_wrap_glNormal3d(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glNormal3dv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;
 static PyObject *_wrap_glNormal3dv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glNormal3dv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glNormal3dv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLdouble_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLdouble_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glNormal3dv. Expected _GLdouble_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glNormal3dv. Expected _GLdouble_p.");
         return NULL;
         }


@@ -4600,13 +4708,14 @@ static PyObject *_wrap_glNormal3f(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glNormal3fv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;
 static PyObject *_wrap_glNormal3fv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glNormal3fv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glNormal3fv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLfloat_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glNormal3fv. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glNormal3fv. Expected _GLfloat_p.");
         return NULL;
         }


@@ -4643,13 +4752,14 @@ static PyObject *_wrap_glNormal3i(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glNormal3iv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLint * _arg0;
 static PyObject *_wrap_glNormal3iv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLint * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glNormal3iv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glNormal3iv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glNormal3iv. Expected _GLint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glNormal3iv. Expected _GLint_p.");
         return NULL;
         }


@@ -4686,13 +4796,14 @@ static PyObject *_wrap_glNormal3s(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glNormal3sv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLshort * _arg0;
 static PyObject *_wrap_glNormal3sv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLshort * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glNormal3sv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glNormal3sv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLshort_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLshort_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glNormal3sv. Expected _GLshort_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glNormal3sv. Expected _GLshort_p.");
         return NULL;
         }


@@ -4712,13 +4823,14 @@ static PyObject *_wrap_glNormalPointer(PyObject *self, PyObject *args) {
     GLenum  _arg0;
     GLsizei  _arg1;
     GLvoid * _arg2;
     GLenum  _arg0;
     GLsizei  _arg1;
     GLvoid * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glNormalPointer",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glNormalPointer",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,(char *) 0 )) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,(char *) 0 )) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glNormalPointer. Expected _GLvoid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glNormalPointer. Expected _GLvoid_p.");
         return NULL;
         }


@@ -4777,13 +4889,14 @@ static PyObject *_wrap_glPixelMapfv(PyObject *self, PyObject *args) {
     GLenum  _arg0;
     GLsizei  _arg1;
     GLfloat * _arg2;
     GLenum  _arg0;
     GLsizei  _arg1;
     GLfloat * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glPixelMapfv",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glPixelMapfv",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_GLfloat_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glPixelMapfv. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glPixelMapfv. Expected _GLfloat_p.");
         return NULL;
         }


@@ -4803,13 +4916,14 @@ static PyObject *_wrap_glPixelMapuiv(PyObject *self, PyObject *args) {
     GLenum  _arg0;
     GLsizei  _arg1;
     GLuint * _arg2;
     GLenum  _arg0;
     GLsizei  _arg1;
     GLuint * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glPixelMapuiv",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glPixelMapuiv",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_GLuint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_GLuint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glPixelMapuiv. Expected _GLuint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glPixelMapuiv. Expected _GLuint_p.");
         return NULL;
         }


@@ -4829,13 +4943,14 @@ static PyObject *_wrap_glPixelMapusv(PyObject *self, PyObject *args) {
     GLenum  _arg0;
     GLsizei  _arg1;
     GLushort * _arg2;
     GLenum  _arg0;
     GLsizei  _arg1;
     GLushort * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glPixelMapusv",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glPixelMapusv",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_GLushort_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_GLushort_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glPixelMapusv. Expected _GLushort_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glPixelMapusv. Expected _GLushort_p.");
         return NULL;
         }


@@ -4996,13 +5111,14 @@ static PyObject *_wrap_glPolygonOffset(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glPolygonStipple(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLubyte * _arg0;
 static PyObject *_wrap_glPolygonStipple(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLubyte * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glPolygonStipple",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glPolygonStipple",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLubyte_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLubyte_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glPolygonStipple. Expected _GLubyte_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glPolygonStipple. Expected _GLubyte_p.");
         return NULL;
         }


@@ -5086,20 +5202,22 @@ static PyObject *_wrap_glPrioritizeTextures(PyObject *self, PyObject *args) {
     GLsizei  _arg0;
     GLuint * _arg1;
     GLclampf * _arg2;
     GLsizei  _arg0;
     GLuint * _arg1;
     GLclampf * _arg2;

-    char * _argc1 = 0;
-    char * _argc2 = 0;
+    PyObject * _argo1 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iss:glPrioritizeTextures",&_arg0,&_argc1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iOO:glPrioritizeTextures",&_arg0,&_argo1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_GLuint_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_GLuint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glPrioritizeTextures. Expected _GLuint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glPrioritizeTextures. Expected _GLuint_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_GLclampf_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_GLclampf_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glPrioritizeTextures. Expected _GLclampf_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glPrioritizeTextures. Expected _GLclampf_p.");
         return NULL;
         }


@@ -5202,13 +5320,14 @@ static PyObject *_wrap_glRasterPos2d(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glRasterPos2dv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;
 static PyObject *_wrap_glRasterPos2dv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glRasterPos2dv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glRasterPos2dv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLdouble_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLdouble_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glRasterPos2dv. Expected _GLdouble_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glRasterPos2dv. Expected _GLdouble_p.");
         return NULL;
         }


@@ -5244,13 +5363,14 @@ static PyObject *_wrap_glRasterPos2f(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glRasterPos2fv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;
 static PyObject *_wrap_glRasterPos2fv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glRasterPos2fv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glRasterPos2fv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLfloat_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glRasterPos2fv. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glRasterPos2fv. Expected _GLfloat_p.");
         return NULL;
         }


@@ -5286,13 +5406,14 @@ static PyObject *_wrap_glRasterPos2i(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glRasterPos2iv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLint * _arg0;
 static PyObject *_wrap_glRasterPos2iv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLint * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glRasterPos2iv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glRasterPos2iv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glRasterPos2iv. Expected _GLint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glRasterPos2iv. Expected _GLint_p.");
         return NULL;
         }


@@ -5328,13 +5449,14 @@ static PyObject *_wrap_glRasterPos2s(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glRasterPos2sv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLshort * _arg0;
 static PyObject *_wrap_glRasterPos2sv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLshort * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glRasterPos2sv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glRasterPos2sv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLshort_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLshort_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glRasterPos2sv. Expected _GLshort_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glRasterPos2sv. Expected _GLshort_p.");
         return NULL;
         }


@@ -5371,13 +5493,14 @@ static PyObject *_wrap_glRasterPos3d(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glRasterPos3dv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;
 static PyObject *_wrap_glRasterPos3dv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glRasterPos3dv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glRasterPos3dv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLdouble_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLdouble_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glRasterPos3dv. Expected _GLdouble_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glRasterPos3dv. Expected _GLdouble_p.");
         return NULL;
         }


@@ -5414,13 +5537,14 @@ static PyObject *_wrap_glRasterPos3f(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glRasterPos3fv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;
 static PyObject *_wrap_glRasterPos3fv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glRasterPos3fv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glRasterPos3fv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLfloat_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glRasterPos3fv. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glRasterPos3fv. Expected _GLfloat_p.");
         return NULL;
         }


@@ -5457,13 +5581,14 @@ static PyObject *_wrap_glRasterPos3i(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glRasterPos3iv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLint * _arg0;
 static PyObject *_wrap_glRasterPos3iv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLint * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glRasterPos3iv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glRasterPos3iv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glRasterPos3iv. Expected _GLint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glRasterPos3iv. Expected _GLint_p.");
         return NULL;
         }


@@ -5500,13 +5625,14 @@ static PyObject *_wrap_glRasterPos3s(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glRasterPos3sv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLshort * _arg0;
 static PyObject *_wrap_glRasterPos3sv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLshort * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glRasterPos3sv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glRasterPos3sv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLshort_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLshort_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glRasterPos3sv. Expected _GLshort_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glRasterPos3sv. Expected _GLshort_p.");
         return NULL;
         }


@@ -5544,13 +5670,14 @@ static PyObject *_wrap_glRasterPos4d(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glRasterPos4dv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;
 static PyObject *_wrap_glRasterPos4dv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glRasterPos4dv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glRasterPos4dv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLdouble_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLdouble_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glRasterPos4dv. Expected _GLdouble_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glRasterPos4dv. Expected _GLdouble_p.");
         return NULL;
         }


@@ -5588,13 +5715,14 @@ static PyObject *_wrap_glRasterPos4f(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glRasterPos4fv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;
 static PyObject *_wrap_glRasterPos4fv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glRasterPos4fv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glRasterPos4fv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLfloat_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glRasterPos4fv. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glRasterPos4fv. Expected _GLfloat_p.");
         return NULL;
         }


@@ -5632,13 +5760,14 @@ static PyObject *_wrap_glRasterPos4i(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glRasterPos4iv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLint * _arg0;
 static PyObject *_wrap_glRasterPos4iv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLint * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glRasterPos4iv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glRasterPos4iv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glRasterPos4iv. Expected _GLint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glRasterPos4iv. Expected _GLint_p.");
         return NULL;
         }


@@ -5676,13 +5805,14 @@ static PyObject *_wrap_glRasterPos4s(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glRasterPos4sv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLshort * _arg0;
 static PyObject *_wrap_glRasterPos4sv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLshort * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glRasterPos4sv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glRasterPos4sv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLshort_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLshort_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glRasterPos4sv. Expected _GLshort_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glRasterPos4sv. Expected _GLshort_p.");
         return NULL;
         }


@@ -5723,13 +5853,14 @@ static PyObject *_wrap_glReadPixels(PyObject *self, PyObject *args) {
     GLenum  _arg4;
     GLenum  _arg5;
     GLvoid * _arg6;
     GLenum  _arg4;
     GLenum  _arg5;
     GLvoid * _arg6;

-    char * _argc6 = 0;
+    PyObject * _argo6 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iiiiiis:glReadPixels",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_argc6)) 
+    if(!PyArg_ParseTuple(args,"iiiiiiO:glReadPixels",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_argo6)) 

         return NULL;
         return NULL;

-    if (_argc6) {
-        if (SWIG_GetPtr(_argc6,(void **) &_arg6,(char *) 0 )) {
+    if (_argo6) {
+        if (_argo6 == Py_None) { _arg6 = NULL; }
+        else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,(char *) 0 )) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of glReadPixels. Expected _GLvoid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of glReadPixels. Expected _GLvoid_p.");
         return NULL;
         }


@@ -5768,20 +5899,22 @@ static PyObject *_wrap_glRectdv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;
     GLdouble * _arg1;
     PyObject * _resultobj;
     GLdouble * _arg0;
     GLdouble * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:glRectdv",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:glRectdv",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLdouble_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLdouble_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glRectdv. Expected _GLdouble_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glRectdv. Expected _GLdouble_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_GLdouble_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_GLdouble_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glRectdv. Expected _GLdouble_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glRectdv. Expected _GLdouble_p.");
         return NULL;
         }


@@ -5820,20 +5953,22 @@ static PyObject *_wrap_glRectfv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;
     GLfloat * _arg1;
     PyObject * _resultobj;
     GLfloat * _arg0;
     GLfloat * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:glRectfv",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:glRectfv",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLfloat_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glRectfv. Expected _GLfloat_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glRectfv. Expected _GLfloat_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_GLfloat_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glRectfv. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glRectfv. Expected _GLfloat_p.");
         return NULL;
         }


@@ -5872,20 +6007,22 @@ static PyObject *_wrap_glRectiv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLint * _arg0;
     GLint * _arg1;
     PyObject * _resultobj;
     GLint * _arg0;
     GLint * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:glRectiv",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:glRectiv",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glRectiv. Expected _GLint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glRectiv. Expected _GLint_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_GLint_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_GLint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glRectiv. Expected _GLint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glRectiv. Expected _GLint_p.");
         return NULL;
         }


@@ -5924,20 +6061,22 @@ static PyObject *_wrap_glRectsv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLshort * _arg0;
     GLshort * _arg1;
     PyObject * _resultobj;
     GLshort * _arg0;
     GLshort * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:glRectsv",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:glRectsv",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLshort_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLshort_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glRectsv. Expected _GLshort_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glRectsv. Expected _GLshort_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_GLshort_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_GLshort_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glRectsv. Expected _GLshort_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glRectsv. Expected _GLshort_p.");
         return NULL;
         }


@@ -6071,13 +6210,14 @@ static PyObject *_wrap_glSelectBuffer(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLsizei  _arg0;
     GLuint * _arg1;
     PyObject * _resultobj;
     GLsizei  _arg0;
     GLuint * _arg1;

-    char * _argc1 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"is:glSelectBuffer",&_arg0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"iO:glSelectBuffer",&_arg0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_GLuint_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_GLuint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glSelectBuffer. Expected _GLuint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of glSelectBuffer. Expected _GLuint_p.");
         return NULL;
         }


@@ -6184,13 +6324,14 @@ static PyObject *_wrap_glTexCoord1d(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glTexCoord1dv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;
 static PyObject *_wrap_glTexCoord1dv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glTexCoord1dv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glTexCoord1dv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLdouble_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLdouble_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glTexCoord1dv. Expected _GLdouble_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glTexCoord1dv. Expected _GLdouble_p.");
         return NULL;
         }


@@ -6225,13 +6366,14 @@ static PyObject *_wrap_glTexCoord1f(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glTexCoord1fv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;
 static PyObject *_wrap_glTexCoord1fv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glTexCoord1fv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glTexCoord1fv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLfloat_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glTexCoord1fv. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glTexCoord1fv. Expected _GLfloat_p.");
         return NULL;
         }


@@ -6266,13 +6408,14 @@ static PyObject *_wrap_glTexCoord1i(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glTexCoord1iv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLint * _arg0;
 static PyObject *_wrap_glTexCoord1iv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLint * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glTexCoord1iv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glTexCoord1iv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glTexCoord1iv. Expected _GLint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glTexCoord1iv. Expected _GLint_p.");
         return NULL;
         }


@@ -6307,13 +6450,14 @@ static PyObject *_wrap_glTexCoord1s(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glTexCoord1sv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLshort * _arg0;
 static PyObject *_wrap_glTexCoord1sv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLshort * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glTexCoord1sv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glTexCoord1sv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLshort_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLshort_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glTexCoord1sv. Expected _GLshort_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glTexCoord1sv. Expected _GLshort_p.");
         return NULL;
         }


@@ -6349,13 +6493,14 @@ static PyObject *_wrap_glTexCoord2d(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glTexCoord2dv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;
 static PyObject *_wrap_glTexCoord2dv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glTexCoord2dv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glTexCoord2dv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLdouble_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLdouble_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glTexCoord2dv. Expected _GLdouble_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glTexCoord2dv. Expected _GLdouble_p.");
         return NULL;
         }


@@ -6391,13 +6536,14 @@ static PyObject *_wrap_glTexCoord2f(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glTexCoord2fv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;
 static PyObject *_wrap_glTexCoord2fv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glTexCoord2fv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glTexCoord2fv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLfloat_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glTexCoord2fv. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glTexCoord2fv. Expected _GLfloat_p.");
         return NULL;
         }


@@ -6433,13 +6579,14 @@ static PyObject *_wrap_glTexCoord2i(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glTexCoord2iv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLint * _arg0;
 static PyObject *_wrap_glTexCoord2iv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLint * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glTexCoord2iv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glTexCoord2iv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glTexCoord2iv. Expected _GLint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glTexCoord2iv. Expected _GLint_p.");
         return NULL;
         }


@@ -6475,13 +6622,14 @@ static PyObject *_wrap_glTexCoord2s(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glTexCoord2sv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLshort * _arg0;
 static PyObject *_wrap_glTexCoord2sv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLshort * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glTexCoord2sv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glTexCoord2sv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLshort_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLshort_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glTexCoord2sv. Expected _GLshort_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glTexCoord2sv. Expected _GLshort_p.");
         return NULL;
         }


@@ -6518,13 +6666,14 @@ static PyObject *_wrap_glTexCoord3d(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glTexCoord3dv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;
 static PyObject *_wrap_glTexCoord3dv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glTexCoord3dv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glTexCoord3dv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLdouble_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLdouble_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glTexCoord3dv. Expected _GLdouble_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glTexCoord3dv. Expected _GLdouble_p.");
         return NULL;
         }


@@ -6561,13 +6710,14 @@ static PyObject *_wrap_glTexCoord3f(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glTexCoord3fv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;
 static PyObject *_wrap_glTexCoord3fv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glTexCoord3fv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glTexCoord3fv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLfloat_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glTexCoord3fv. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glTexCoord3fv. Expected _GLfloat_p.");
         return NULL;
         }


@@ -6604,13 +6754,14 @@ static PyObject *_wrap_glTexCoord3i(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glTexCoord3iv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLint * _arg0;
 static PyObject *_wrap_glTexCoord3iv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLint * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glTexCoord3iv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glTexCoord3iv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glTexCoord3iv. Expected _GLint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glTexCoord3iv. Expected _GLint_p.");
         return NULL;
         }


@@ -6647,13 +6798,14 @@ static PyObject *_wrap_glTexCoord3s(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glTexCoord3sv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLshort * _arg0;
 static PyObject *_wrap_glTexCoord3sv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLshort * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glTexCoord3sv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glTexCoord3sv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLshort_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLshort_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glTexCoord3sv. Expected _GLshort_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glTexCoord3sv. Expected _GLshort_p.");
         return NULL;
         }


@@ -6691,13 +6843,14 @@ static PyObject *_wrap_glTexCoord4d(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glTexCoord4dv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;
 static PyObject *_wrap_glTexCoord4dv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glTexCoord4dv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glTexCoord4dv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLdouble_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLdouble_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glTexCoord4dv. Expected _GLdouble_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glTexCoord4dv. Expected _GLdouble_p.");
         return NULL;
         }


@@ -6735,13 +6888,14 @@ static PyObject *_wrap_glTexCoord4f(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glTexCoord4fv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;
 static PyObject *_wrap_glTexCoord4fv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glTexCoord4fv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glTexCoord4fv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLfloat_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glTexCoord4fv. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glTexCoord4fv. Expected _GLfloat_p.");
         return NULL;
         }


@@ -6779,13 +6933,14 @@ static PyObject *_wrap_glTexCoord4i(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glTexCoord4iv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLint * _arg0;
 static PyObject *_wrap_glTexCoord4iv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLint * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glTexCoord4iv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glTexCoord4iv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glTexCoord4iv. Expected _GLint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glTexCoord4iv. Expected _GLint_p.");
         return NULL;
         }


@@ -6823,13 +6978,14 @@ static PyObject *_wrap_glTexCoord4s(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glTexCoord4sv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLshort * _arg0;
 static PyObject *_wrap_glTexCoord4sv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLshort * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glTexCoord4sv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glTexCoord4sv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLshort_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLshort_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glTexCoord4sv. Expected _GLshort_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glTexCoord4sv. Expected _GLshort_p.");
         return NULL;
         }


@@ -6850,13 +7006,14 @@ static PyObject *_wrap_glTexCoordPointer(PyObject *self, PyObject *args) {
     GLenum  _arg1;
     GLsizei  _arg2;
     GLvoid * _arg3;
     GLenum  _arg1;
     GLsizei  _arg2;
     GLvoid * _arg3;

-    char * _argc3 = 0;
+    PyObject * _argo3 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iiis:glTexCoordPointer",&_arg0,&_arg1,&_arg2,&_argc3)) 
+    if(!PyArg_ParseTuple(args,"iiiO:glTexCoordPointer",&_arg0,&_arg1,&_arg2,&_argo3)) 

         return NULL;
         return NULL;

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,(char *) 0 )) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,(char *) 0 )) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of glTexCoordPointer. Expected _GLvoid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of glTexCoordPointer. Expected _GLvoid_p.");
         return NULL;
         }


@@ -6895,13 +7052,14 @@ static PyObject *_wrap_glTexEnvfv(PyObject *self, PyObject *args) {
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glTexEnvfv",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glTexEnvfv",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_GLfloat_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glTexEnvfv. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glTexEnvfv. Expected _GLfloat_p.");
         return NULL;
         }


@@ -6940,13 +7098,14 @@ static PyObject *_wrap_glTexEnviv(PyObject *self, PyObject *args) {
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glTexEnviv",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glTexEnviv",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_GLint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_GLint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glTexEnviv. Expected _GLint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glTexEnviv. Expected _GLint_p.");
         return NULL;
         }


@@ -6985,13 +7144,14 @@ static PyObject *_wrap_glTexGendv(PyObject *self, PyObject *args) {
     GLenum  _arg0;
     GLenum  _arg1;
     GLdouble * _arg2;
     GLenum  _arg0;
     GLenum  _arg1;
     GLdouble * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glTexGendv",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glTexGendv",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_GLdouble_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_GLdouble_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glTexGendv. Expected _GLdouble_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glTexGendv. Expected _GLdouble_p.");
         return NULL;
         }


@@ -7030,13 +7190,14 @@ static PyObject *_wrap_glTexGenfv(PyObject *self, PyObject *args) {
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glTexGenfv",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glTexGenfv",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_GLfloat_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glTexGenfv. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glTexGenfv. Expected _GLfloat_p.");
         return NULL;
         }


@@ -7075,13 +7236,14 @@ static PyObject *_wrap_glTexGeniv(PyObject *self, PyObject *args) {
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glTexGeniv",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glTexGeniv",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_GLint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_GLint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glTexGeniv. Expected _GLint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glTexGeniv. Expected _GLint_p.");
         return NULL;
         }


@@ -7106,13 +7268,14 @@ static PyObject *_wrap_glTexImage1D(PyObject *self, PyObject *args) {
     GLenum  _arg5;
     GLenum  _arg6;
     GLvoid * _arg7;
     GLenum  _arg5;
     GLenum  _arg6;
     GLvoid * _arg7;

-    char * _argc7 = 0;
+    PyObject * _argo7 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iiiiiiis:glTexImage1D",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6,&_argc7)) 
+    if(!PyArg_ParseTuple(args,"iiiiiiiO:glTexImage1D",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6,&_argo7)) 

         return NULL;
         return NULL;

-    if (_argc7) {
-        if (SWIG_GetPtr(_argc7,(void **) &_arg7,(char *) 0 )) {
+    if (_argo7) {
+        if (_argo7 == Py_None) { _arg7 = NULL; }
+        else if (SWIG_GetPtrObj(_argo7,(void **) &_arg7,(char *) 0 )) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 8 of glTexImage1D. Expected _GLvoid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 8 of glTexImage1D. Expected _GLvoid_p.");
         return NULL;
         }


@@ -7138,13 +7301,14 @@ static PyObject *_wrap_glTexImage2D(PyObject *self, PyObject *args) {
     GLenum  _arg6;
     GLenum  _arg7;
     GLvoid * _arg8;
     GLenum  _arg6;
     GLenum  _arg7;
     GLvoid * _arg8;

-    char * _argc8 = 0;
+    PyObject * _argo8 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iiiiiiiis:glTexImage2D",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6,&_arg7,&_argc8)) 
+    if(!PyArg_ParseTuple(args,"iiiiiiiiO:glTexImage2D",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6,&_arg7,&_argo8)) 

         return NULL;
         return NULL;

-    if (_argc8) {
-        if (SWIG_GetPtr(_argc8,(void **) &_arg8,(char *) 0 )) {
+    if (_argo8) {
+        if (_argo8 == Py_None) { _arg8 = NULL; }
+        else if (SWIG_GetPtrObj(_argo8,(void **) &_arg8,(char *) 0 )) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 9 of glTexImage2D. Expected _GLvoid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 9 of glTexImage2D. Expected _GLvoid_p.");
         return NULL;
         }


@@ -7183,13 +7347,14 @@ static PyObject *_wrap_glTexParameterfv(PyObject *self, PyObject *args) {
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glTexParameterfv",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glTexParameterfv",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_GLfloat_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glTexParameterfv. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glTexParameterfv. Expected _GLfloat_p.");
         return NULL;
         }


@@ -7228,13 +7393,14 @@ static PyObject *_wrap_glTexParameteriv(PyObject *self, PyObject *args) {
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;

-    char * _argc2 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iis:glTexParameteriv",&_arg0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iiO:glTexParameteriv",&_arg0,&_arg1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_GLint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_GLint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glTexParameteriv. Expected _GLint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of glTexParameteriv. Expected _GLint_p.");
         return NULL;
         }


@@ -7258,13 +7424,14 @@ static PyObject *_wrap_glTexSubImage1D(PyObject *self, PyObject *args) {
     GLenum  _arg4;
     GLenum  _arg5;
     GLvoid * _arg6;
     GLenum  _arg4;
     GLenum  _arg5;
     GLvoid * _arg6;

-    char * _argc6 = 0;
+    PyObject * _argo6 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iiiiiis:glTexSubImage1D",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_argc6)) 
+    if(!PyArg_ParseTuple(args,"iiiiiiO:glTexSubImage1D",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_argo6)) 

         return NULL;
         return NULL;

-    if (_argc6) {
-        if (SWIG_GetPtr(_argc6,(void **) &_arg6,(char *) 0 )) {
+    if (_argo6) {
+        if (_argo6 == Py_None) { _arg6 = NULL; }
+        else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,(char *) 0 )) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of glTexSubImage1D. Expected _GLvoid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of glTexSubImage1D. Expected _GLvoid_p.");
         return NULL;
         }


@@ -7290,13 +7457,14 @@ static PyObject *_wrap_glTexSubImage2D(PyObject *self, PyObject *args) {
     GLenum  _arg6;
     GLenum  _arg7;
     GLvoid * _arg8;
     GLenum  _arg6;
     GLenum  _arg7;
     GLvoid * _arg8;

-    char * _argc8 = 0;
+    PyObject * _argo8 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iiiiiiiis:glTexSubImage2D",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6,&_arg7,&_argc8)) 
+    if(!PyArg_ParseTuple(args,"iiiiiiiiO:glTexSubImage2D",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6,&_arg7,&_argo8)) 

         return NULL;
         return NULL;

-    if (_argc8) {
-        if (SWIG_GetPtr(_argc8,(void **) &_arg8,(char *) 0 )) {
+    if (_argo8) {
+        if (_argo8 == Py_None) { _arg8 = NULL; }
+        else if (SWIG_GetPtrObj(_argo8,(void **) &_arg8,(char *) 0 )) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 9 of glTexSubImage2D. Expected _GLvoid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 9 of glTexSubImage2D. Expected _GLvoid_p.");
         return NULL;
         }


@@ -7370,13 +7538,14 @@ static PyObject *_wrap_glVertex2d(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glVertex2dv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;
 static PyObject *_wrap_glVertex2dv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glVertex2dv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glVertex2dv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLdouble_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLdouble_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glVertex2dv. Expected _GLdouble_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glVertex2dv. Expected _GLdouble_p.");
         return NULL;
         }


@@ -7412,13 +7581,14 @@ static PyObject *_wrap_glVertex2f(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glVertex2fv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;
 static PyObject *_wrap_glVertex2fv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glVertex2fv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glVertex2fv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLfloat_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glVertex2fv. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glVertex2fv. Expected _GLfloat_p.");
         return NULL;
         }


@@ -7454,13 +7624,14 @@ static PyObject *_wrap_glVertex2i(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glVertex2iv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLint * _arg0;
 static PyObject *_wrap_glVertex2iv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLint * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glVertex2iv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glVertex2iv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glVertex2iv. Expected _GLint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glVertex2iv. Expected _GLint_p.");
         return NULL;
         }


@@ -7496,13 +7667,14 @@ static PyObject *_wrap_glVertex2s(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glVertex2sv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLshort * _arg0;
 static PyObject *_wrap_glVertex2sv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLshort * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glVertex2sv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glVertex2sv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLshort_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLshort_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glVertex2sv. Expected _GLshort_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glVertex2sv. Expected _GLshort_p.");
         return NULL;
         }


@@ -7539,13 +7711,14 @@ static PyObject *_wrap_glVertex3d(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glVertex3dv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;
 static PyObject *_wrap_glVertex3dv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glVertex3dv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glVertex3dv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLdouble_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLdouble_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glVertex3dv. Expected _GLdouble_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glVertex3dv. Expected _GLdouble_p.");
         return NULL;
         }


@@ -7582,13 +7755,14 @@ static PyObject *_wrap_glVertex3f(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glVertex3fv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;
 static PyObject *_wrap_glVertex3fv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glVertex3fv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glVertex3fv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLfloat_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glVertex3fv. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glVertex3fv. Expected _GLfloat_p.");
         return NULL;
         }


@@ -7625,13 +7799,14 @@ static PyObject *_wrap_glVertex3i(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glVertex3iv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLint * _arg0;
 static PyObject *_wrap_glVertex3iv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLint * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glVertex3iv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glVertex3iv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glVertex3iv. Expected _GLint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glVertex3iv. Expected _GLint_p.");
         return NULL;
         }


@@ -7668,13 +7843,14 @@ static PyObject *_wrap_glVertex3s(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glVertex3sv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLshort * _arg0;
 static PyObject *_wrap_glVertex3sv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLshort * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glVertex3sv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glVertex3sv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLshort_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLshort_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glVertex3sv. Expected _GLshort_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glVertex3sv. Expected _GLshort_p.");
         return NULL;
         }


@@ -7712,13 +7888,14 @@ static PyObject *_wrap_glVertex4d(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glVertex4dv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;
 static PyObject *_wrap_glVertex4dv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLdouble * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glVertex4dv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glVertex4dv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLdouble_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLdouble_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glVertex4dv. Expected _GLdouble_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glVertex4dv. Expected _GLdouble_p.");
         return NULL;
         }


@@ -7756,13 +7933,14 @@ static PyObject *_wrap_glVertex4f(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glVertex4fv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;
 static PyObject *_wrap_glVertex4fv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLfloat * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glVertex4fv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glVertex4fv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLfloat_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLfloat_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glVertex4fv. Expected _GLfloat_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glVertex4fv. Expected _GLfloat_p.");
         return NULL;
         }


@@ -7800,13 +7978,14 @@ static PyObject *_wrap_glVertex4i(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glVertex4iv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLint * _arg0;
 static PyObject *_wrap_glVertex4iv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLint * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glVertex4iv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glVertex4iv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glVertex4iv. Expected _GLint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glVertex4iv. Expected _GLint_p.");
         return NULL;
         }


@@ -7844,13 +8023,14 @@ static PyObject *_wrap_glVertex4s(PyObject *self, PyObject *args) {
 static PyObject *_wrap_glVertex4sv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLshort * _arg0;
 static PyObject *_wrap_glVertex4sv(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     GLshort * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:glVertex4sv",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:glVertex4sv",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_GLshort_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_GLshort_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glVertex4sv. Expected _GLshort_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of glVertex4sv. Expected _GLshort_p.");
         return NULL;
         }


@@ -7871,13 +8051,14 @@ static PyObject *_wrap_glVertexPointer(PyObject *self, PyObject *args) {
     GLenum  _arg1;
     GLsizei  _arg2;
     GLvoid * _arg3;
     GLenum  _arg1;
     GLsizei  _arg2;
     GLvoid * _arg3;

-    char * _argc3 = 0;
+    PyObject * _argo3 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"iiis:glVertexPointer",&_arg0,&_arg1,&_arg2,&_argc3)) 
+    if(!PyArg_ParseTuple(args,"iiiO:glVertexPointer",&_arg0,&_arg1,&_arg2,&_argo3)) 

         return NULL;
         return NULL;

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,(char *) 0 )) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,(char *) 0 )) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of glVertexPointer. Expected _GLvoid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of glVertexPointer. Expected _GLvoid_p.");
         return NULL;
         }


@@ -7918,24 +8099,26 @@ static PyObject *_wrap_new_wxGLContext(PyObject *self, PyObject *args) {
     wxGLContext * _result;
     bool  _arg0;
     wxGLCanvas * _arg1;
     wxGLContext * _result;
     bool  _arg0;
     wxGLCanvas * _arg1;

-    wxPalette * _arg2 = &wxNullPalette;
+    wxPalette * _arg2 = (wxPalette *) &wxNullPalette;

     int tempbool0;
     int tempbool0;

-    char * _argc1 = 0;
-    char * _argc2 = 0;
+    PyObject * _argo1 = 0;
+    PyObject * _argo2 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"is|s:new_wxGLContext",&tempbool0,&_argc1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"iO|O:new_wxGLContext",&tempbool0,&_argo1,&_argo2)) 

         return NULL;
     _arg0 = (bool ) tempbool0;
         return NULL;
     _arg0 = (bool ) tempbool0;

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxGLCanvas_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxGLCanvas_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of new_wxGLContext. Expected _wxGLCanvas_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of new_wxGLContext. Expected _wxGLCanvas_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPalette_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPalette_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxGLContext. Expected _wxPalette_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxGLContext. Expected _wxPalette_p.");
         return NULL;
         }


@@ -7945,8 +8128,13 @@ static PyObject *_wrap_new_wxGLContext(PyObject *self, PyObject *args) {
         _result = (wxGLContext *)new_wxGLContext(_arg0,_arg1,*_arg2);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxGLContext *)new_wxGLContext(_arg0,_arg1,*_arg2);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxGLContext_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxGLContext_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -7954,13 +8142,14 @@ static PyObject *_wrap_new_wxGLContext(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxGLContext(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGLContext * _arg0;
 static PyObject *_wrap_delete_wxGLContext(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGLContext * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:delete_wxGLContext",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxGLContext",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGLContext_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGLContext_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxGLContext. Expected _wxGLContext_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxGLContext. Expected _wxGLContext_p.");
         return NULL;
         }


@@ -7979,13 +8168,14 @@ static PyObject *_wrap_delete_wxGLContext(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxGLContext_SetCurrent(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGLContext * _arg0;
 static PyObject *_wrap_wxGLContext_SetCurrent(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGLContext * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGLContext_SetCurrent",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGLContext_SetCurrent",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGLContext_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGLContext_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGLContext_SetCurrent. Expected _wxGLContext_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGLContext_SetCurrent. Expected _wxGLContext_p.");
         return NULL;
         }


@@ -8005,13 +8195,14 @@ static PyObject *_wrap_wxGLContext_SetColour(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGLContext * _arg0;
     char * _arg1;
     PyObject * _resultobj;
     wxGLContext * _arg0;
     char * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxGLContext_SetColour",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Os:wxGLContext_SetColour",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGLContext_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGLContext_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGLContext_SetColour. Expected _wxGLContext_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGLContext_SetColour. Expected _wxGLContext_p.");
         return NULL;
         }


@@ -8030,13 +8221,14 @@ static PyObject *_wrap_wxGLContext_SetColour(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxGLContext_SwapBuffers(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGLContext * _arg0;
 static PyObject *_wrap_wxGLContext_SwapBuffers(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGLContext * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGLContext_SwapBuffers",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGLContext_SwapBuffers",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGLContext_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGLContext_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGLContext_SwapBuffers. Expected _wxGLContext_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGLContext_SwapBuffers. Expected _wxGLContext_p.");
         return NULL;
         }


@@ -8056,14 +8248,15 @@ static PyObject *_wrap_wxGLContext_GetWindow(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _result;
     wxGLContext * _arg0;
     PyObject * _resultobj;
     wxWindow * _result;
     wxGLContext * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGLContext_GetWindow",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGLContext_GetWindow",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGLContext_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGLContext_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGLContext_GetWindow. Expected _wxGLContext_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGLContext_GetWindow. Expected _wxGLContext_p.");
         return NULL;
         }


@@ -8073,8 +8266,13 @@ static PyObject *_wrap_wxGLContext_GetWindow(PyObject *self, PyObject *args) {
         _result = (wxWindow *)wxGLContext_GetWindow(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxWindow *)wxGLContext_GetWindow(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -8115,49 +8313,54 @@ static PyObject *_wrap_new_wxGLCanvas(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGLCanvas * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxGLCanvas * _result;
     wxWindow * _arg0;

-    wxWindowID  _arg1 = -1;
-    wxPoint * _arg2 = &wxPyDefaultPosition;
-    wxSize * _arg3 = &wxPyDefaultSize;
-    long  _arg4 = 0;
-    char * _arg5 = "GLCanvas";
-    int * _arg6 = 0;
-    wxPalette * _arg7 = &wxNullPalette;
-    char * _argc0 = 0;
-    char * _argc2 = 0;
-    char * _argc3 = 0;
-    char * _argc6 = 0;
-    char * _argc7 = 0;
+    wxWindowID  _arg1 = (wxWindowID ) -1;
+    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    long  _arg4 = (long ) 0;
+    char * _arg5 = (char *) "GLCanvas";
+    int * _arg6 = (int *) 0;
+    wxPalette * _arg7 = (wxPalette *) &wxNullPalette;
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;
+    PyObject * _argo3 = 0;
+    PyObject * _argo6 = 0;
+    PyObject * _argo7 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|isslsss:new_wxGLCanvas",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_arg5,&_argc6,&_argc7)) 
+    if(!PyArg_ParseTuple(args,"O|iOOlsOO:new_wxGLCanvas",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5,&_argo6,&_argo7)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxGLCanvas. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxGLCanvas. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxGLCanvas. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxGLCanvas. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxSize_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxGLCanvas. Expected _wxSize_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxGLCanvas. Expected _wxSize_p.");
         return NULL;
         }
     }

-    if (_argc6) {
-        if (SWIG_GetPtr(_argc6,(void **) &_arg6,"_int_p")) {
+    if (_argo6) {
+        if (_argo6 == Py_None) { _arg6 = NULL; }
+        else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_int_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of new_wxGLCanvas. Expected _int_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of new_wxGLCanvas. Expected _int_p.");
         return NULL;
         }
     }

-    if (_argc7) {
-        if (SWIG_GetPtr(_argc7,(void **) &_arg7,"_wxPalette_p")) {
+    if (_argo7) {
+        if (_argo7 == Py_None) { _arg7 = NULL; }
+        else if (SWIG_GetPtrObj(_argo7,(void **) &_arg7,"_wxPalette_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 8 of new_wxGLCanvas. Expected _wxPalette_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 8 of new_wxGLCanvas. Expected _wxPalette_p.");
         return NULL;
         }


@@ -8167,8 +8370,13 @@ static PyObject *_wrap_new_wxGLCanvas(PyObject *self, PyObject *args) {
         _result = (wxGLCanvas *)new_wxGLCanvas(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5,_arg6,*_arg7);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxGLCanvas *)new_wxGLCanvas(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5,_arg6,*_arg7);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxGLCanvas_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxGLCanvas_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -8176,13 +8384,14 @@ static PyObject *_wrap_new_wxGLCanvas(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxGLCanvas_SetCurrent(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGLCanvas * _arg0;
 static PyObject *_wrap_wxGLCanvas_SetCurrent(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGLCanvas * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGLCanvas_SetCurrent",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGLCanvas_SetCurrent",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGLCanvas_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGLCanvas_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGLCanvas_SetCurrent. Expected _wxGLCanvas_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGLCanvas_SetCurrent. Expected _wxGLCanvas_p.");
         return NULL;
         }


@@ -8202,13 +8411,14 @@ static PyObject *_wrap_wxGLCanvas_SetColour(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGLCanvas * _arg0;
     char * _arg1;
     PyObject * _resultobj;
     wxGLCanvas * _arg0;
     char * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxGLCanvas_SetColour",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Os:wxGLCanvas_SetColour",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGLCanvas_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGLCanvas_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGLCanvas_SetColour. Expected _wxGLCanvas_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGLCanvas_SetColour. Expected _wxGLCanvas_p.");
         return NULL;
         }


@@ -8227,13 +8437,14 @@ static PyObject *_wrap_wxGLCanvas_SetColour(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxGLCanvas_SwapBuffers(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGLCanvas * _arg0;
 static PyObject *_wrap_wxGLCanvas_SwapBuffers(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGLCanvas * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGLCanvas_SwapBuffers",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGLCanvas_SwapBuffers",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGLCanvas_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGLCanvas_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGLCanvas_SwapBuffers. Expected _wxGLCanvas_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGLCanvas_SwapBuffers. Expected _wxGLCanvas_p.");
         return NULL;
         }


@@ -8253,14 +8464,15 @@ static PyObject *_wrap_wxGLCanvas_GetContext(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGLContext * _result;
     wxGLCanvas * _arg0;
     PyObject * _resultobj;
     wxGLContext * _result;
     wxGLCanvas * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGLCanvas_GetContext",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGLCanvas_GetContext",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGLCanvas_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGLCanvas_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGLCanvas_GetContext. Expected _wxGLCanvas_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGLCanvas_GetContext. Expected _wxGLCanvas_p.");
         return NULL;
         }


@@ -8270,388 +8482,890 @@ static PyObject *_wrap_wxGLCanvas_GetContext(PyObject *self, PyObject *args) {
         _result = (wxGLContext *)wxGLCanvas_GetContext(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxGLContext *)wxGLCanvas_GetContext(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxGLContext_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxGLContext_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
 static PyMethodDef glcanvascMethods[] = {
     return _resultobj;
 }
 
 static PyMethodDef glcanvascMethods[] = {

-        { "wxGLCanvas_GetContext", _wrap_wxGLCanvas_GetContext, 1 },
-        { "wxGLCanvas_SwapBuffers", _wrap_wxGLCanvas_SwapBuffers, 1 },
-        { "wxGLCanvas_SetColour", _wrap_wxGLCanvas_SetColour, 1 },
-        { "wxGLCanvas_SetCurrent", _wrap_wxGLCanvas_SetCurrent, 1 },
-        { "new_wxGLCanvas", _wrap_new_wxGLCanvas, 1 },
-        { "wxGLContext_GetWindow", _wrap_wxGLContext_GetWindow, 1 },
-        { "wxGLContext_SwapBuffers", _wrap_wxGLContext_SwapBuffers, 1 },
-        { "wxGLContext_SetColour", _wrap_wxGLContext_SetColour, 1 },
-        { "wxGLContext_SetCurrent", _wrap_wxGLContext_SetCurrent, 1 },
-        { "delete_wxGLContext", _wrap_delete_wxGLContext, 1 },
-        { "new_wxGLContext", _wrap_new_wxGLContext, 1 },
-        { "glViewport", _wrap_glViewport, 1 },
-        { "glVertexPointer", _wrap_glVertexPointer, 1 },
-        { "glVertex4sv", _wrap_glVertex4sv, 1 },
-        { "glVertex4s", _wrap_glVertex4s, 1 },
-        { "glVertex4iv", _wrap_glVertex4iv, 1 },
-        { "glVertex4i", _wrap_glVertex4i, 1 },
-        { "glVertex4fv", _wrap_glVertex4fv, 1 },
-        { "glVertex4f", _wrap_glVertex4f, 1 },
-        { "glVertex4dv", _wrap_glVertex4dv, 1 },
-        { "glVertex4d", _wrap_glVertex4d, 1 },
-        { "glVertex3sv", _wrap_glVertex3sv, 1 },
-        { "glVertex3s", _wrap_glVertex3s, 1 },
-        { "glVertex3iv", _wrap_glVertex3iv, 1 },
-        { "glVertex3i", _wrap_glVertex3i, 1 },
-        { "glVertex3fv", _wrap_glVertex3fv, 1 },
-        { "glVertex3f", _wrap_glVertex3f, 1 },
-        { "glVertex3dv", _wrap_glVertex3dv, 1 },
-        { "glVertex3d", _wrap_glVertex3d, 1 },
-        { "glVertex2sv", _wrap_glVertex2sv, 1 },
-        { "glVertex2s", _wrap_glVertex2s, 1 },
-        { "glVertex2iv", _wrap_glVertex2iv, 1 },
-        { "glVertex2i", _wrap_glVertex2i, 1 },
-        { "glVertex2fv", _wrap_glVertex2fv, 1 },
-        { "glVertex2f", _wrap_glVertex2f, 1 },
-        { "glVertex2dv", _wrap_glVertex2dv, 1 },
-        { "glVertex2d", _wrap_glVertex2d, 1 },
-        { "glTranslatef", _wrap_glTranslatef, 1 },
-        { "glTranslated", _wrap_glTranslated, 1 },
-        { "glTexSubImage2D", _wrap_glTexSubImage2D, 1 },
-        { "glTexSubImage1D", _wrap_glTexSubImage1D, 1 },
-        { "glTexParameteriv", _wrap_glTexParameteriv, 1 },
-        { "glTexParameteri", _wrap_glTexParameteri, 1 },
-        { "glTexParameterfv", _wrap_glTexParameterfv, 1 },
-        { "glTexParameterf", _wrap_glTexParameterf, 1 },
-        { "glTexImage2D", _wrap_glTexImage2D, 1 },
-        { "glTexImage1D", _wrap_glTexImage1D, 1 },
-        { "glTexGeniv", _wrap_glTexGeniv, 1 },
-        { "glTexGeni", _wrap_glTexGeni, 1 },
-        { "glTexGenfv", _wrap_glTexGenfv, 1 },
-        { "glTexGenf", _wrap_glTexGenf, 1 },
-        { "glTexGendv", _wrap_glTexGendv, 1 },
-        { "glTexGend", _wrap_glTexGend, 1 },
-        { "glTexEnviv", _wrap_glTexEnviv, 1 },
-        { "glTexEnvi", _wrap_glTexEnvi, 1 },
-        { "glTexEnvfv", _wrap_glTexEnvfv, 1 },
-        { "glTexEnvf", _wrap_glTexEnvf, 1 },
-        { "glTexCoordPointer", _wrap_glTexCoordPointer, 1 },
-        { "glTexCoord4sv", _wrap_glTexCoord4sv, 1 },
-        { "glTexCoord4s", _wrap_glTexCoord4s, 1 },
-        { "glTexCoord4iv", _wrap_glTexCoord4iv, 1 },
-        { "glTexCoord4i", _wrap_glTexCoord4i, 1 },
-        { "glTexCoord4fv", _wrap_glTexCoord4fv, 1 },
-        { "glTexCoord4f", _wrap_glTexCoord4f, 1 },
-        { "glTexCoord4dv", _wrap_glTexCoord4dv, 1 },
-        { "glTexCoord4d", _wrap_glTexCoord4d, 1 },
-        { "glTexCoord3sv", _wrap_glTexCoord3sv, 1 },
-        { "glTexCoord3s", _wrap_glTexCoord3s, 1 },
-        { "glTexCoord3iv", _wrap_glTexCoord3iv, 1 },
-        { "glTexCoord3i", _wrap_glTexCoord3i, 1 },
-        { "glTexCoord3fv", _wrap_glTexCoord3fv, 1 },
-        { "glTexCoord3f", _wrap_glTexCoord3f, 1 },
-        { "glTexCoord3dv", _wrap_glTexCoord3dv, 1 },
-        { "glTexCoord3d", _wrap_glTexCoord3d, 1 },
-        { "glTexCoord2sv", _wrap_glTexCoord2sv, 1 },
-        { "glTexCoord2s", _wrap_glTexCoord2s, 1 },
-        { "glTexCoord2iv", _wrap_glTexCoord2iv, 1 },
-        { "glTexCoord2i", _wrap_glTexCoord2i, 1 },
-        { "glTexCoord2fv", _wrap_glTexCoord2fv, 1 },
-        { "glTexCoord2f", _wrap_glTexCoord2f, 1 },
-        { "glTexCoord2dv", _wrap_glTexCoord2dv, 1 },
-        { "glTexCoord2d", _wrap_glTexCoord2d, 1 },
-        { "glTexCoord1sv", _wrap_glTexCoord1sv, 1 },
-        { "glTexCoord1s", _wrap_glTexCoord1s, 1 },
-        { "glTexCoord1iv", _wrap_glTexCoord1iv, 1 },
-        { "glTexCoord1i", _wrap_glTexCoord1i, 1 },
-        { "glTexCoord1fv", _wrap_glTexCoord1fv, 1 },
-        { "glTexCoord1f", _wrap_glTexCoord1f, 1 },
-        { "glTexCoord1dv", _wrap_glTexCoord1dv, 1 },
-        { "glTexCoord1d", _wrap_glTexCoord1d, 1 },
-        { "glStencilOp", _wrap_glStencilOp, 1 },
-        { "glStencilMask", _wrap_glStencilMask, 1 },
-        { "glStencilFunc", _wrap_glStencilFunc, 1 },
-        { "glShadeModel", _wrap_glShadeModel, 1 },
-        { "glSelectBuffer", _wrap_glSelectBuffer, 1 },
-        { "glScissor", _wrap_glScissor, 1 },
-        { "glScalef", _wrap_glScalef, 1 },
-        { "glScaled", _wrap_glScaled, 1 },
-        { "glRotatef", _wrap_glRotatef, 1 },
-        { "glRotated", _wrap_glRotated, 1 },
-        { "glRenderMode", _wrap_glRenderMode, 1 },
-        { "glRectsv", _wrap_glRectsv, 1 },
-        { "glRects", _wrap_glRects, 1 },
-        { "glRectiv", _wrap_glRectiv, 1 },
-        { "glRecti", _wrap_glRecti, 1 },
-        { "glRectfv", _wrap_glRectfv, 1 },
-        { "glRectf", _wrap_glRectf, 1 },
-        { "glRectdv", _wrap_glRectdv, 1 },
-        { "glRectd", _wrap_glRectd, 1 },
-        { "glReadPixels", _wrap_glReadPixels, 1 },
-        { "glReadBuffer", _wrap_glReadBuffer, 1 },
-        { "glRasterPos4sv", _wrap_glRasterPos4sv, 1 },
-        { "glRasterPos4s", _wrap_glRasterPos4s, 1 },
-        { "glRasterPos4iv", _wrap_glRasterPos4iv, 1 },
-        { "glRasterPos4i", _wrap_glRasterPos4i, 1 },
-        { "glRasterPos4fv", _wrap_glRasterPos4fv, 1 },
-        { "glRasterPos4f", _wrap_glRasterPos4f, 1 },
-        { "glRasterPos4dv", _wrap_glRasterPos4dv, 1 },
-        { "glRasterPos4d", _wrap_glRasterPos4d, 1 },
-        { "glRasterPos3sv", _wrap_glRasterPos3sv, 1 },
-        { "glRasterPos3s", _wrap_glRasterPos3s, 1 },
-        { "glRasterPos3iv", _wrap_glRasterPos3iv, 1 },
-        { "glRasterPos3i", _wrap_glRasterPos3i, 1 },
-        { "glRasterPos3fv", _wrap_glRasterPos3fv, 1 },
-        { "glRasterPos3f", _wrap_glRasterPos3f, 1 },
-        { "glRasterPos3dv", _wrap_glRasterPos3dv, 1 },
-        { "glRasterPos3d", _wrap_glRasterPos3d, 1 },
-        { "glRasterPos2sv", _wrap_glRasterPos2sv, 1 },
-        { "glRasterPos2s", _wrap_glRasterPos2s, 1 },
-        { "glRasterPos2iv", _wrap_glRasterPos2iv, 1 },
-        { "glRasterPos2i", _wrap_glRasterPos2i, 1 },
-        { "glRasterPos2fv", _wrap_glRasterPos2fv, 1 },
-        { "glRasterPos2f", _wrap_glRasterPos2f, 1 },
-        { "glRasterPos2dv", _wrap_glRasterPos2dv, 1 },
-        { "glRasterPos2d", _wrap_glRasterPos2d, 1 },
-        { "glPushName", _wrap_glPushName, 1 },
-        { "glPushMatrix", _wrap_glPushMatrix, 1 },
-        { "glPushClientAttrib", _wrap_glPushClientAttrib, 1 },
-        { "glPushAttrib", _wrap_glPushAttrib, 1 },
-        { "glPrioritizeTextures", _wrap_glPrioritizeTextures, 1 },
-        { "glPopName", _wrap_glPopName, 1 },
-        { "glPopMatrix", _wrap_glPopMatrix, 1 },
-        { "glPopClientAttrib", _wrap_glPopClientAttrib, 1 },
-        { "glPopAttrib", _wrap_glPopAttrib, 1 },
-        { "glPolygonStipple", _wrap_glPolygonStipple, 1 },
-        { "glPolygonOffset", _wrap_glPolygonOffset, 1 },
-        { "glPolygonMode", _wrap_glPolygonMode, 1 },
-        { "glPointSize", _wrap_glPointSize, 1 },
-        { "glPixelZoom", _wrap_glPixelZoom, 1 },
-        { "glPixelTransferi", _wrap_glPixelTransferi, 1 },
-        { "glPixelTransferf", _wrap_glPixelTransferf, 1 },
-        { "glPixelStorei", _wrap_glPixelStorei, 1 },
-        { "glPixelStoref", _wrap_glPixelStoref, 1 },
-        { "glPixelMapusv", _wrap_glPixelMapusv, 1 },
-        { "glPixelMapuiv", _wrap_glPixelMapuiv, 1 },
-        { "glPixelMapfv", _wrap_glPixelMapfv, 1 },
-        { "glPassThrough", _wrap_glPassThrough, 1 },
-        { "glOrtho", _wrap_glOrtho, 1 },
-        { "glNormalPointer", _wrap_glNormalPointer, 1 },
-        { "glNormal3sv", _wrap_glNormal3sv, 1 },
-        { "glNormal3s", _wrap_glNormal3s, 1 },
-        { "glNormal3iv", _wrap_glNormal3iv, 1 },
-        { "glNormal3i", _wrap_glNormal3i, 1 },
-        { "glNormal3fv", _wrap_glNormal3fv, 1 },
-        { "glNormal3f", _wrap_glNormal3f, 1 },
-        { "glNormal3dv", _wrap_glNormal3dv, 1 },
-        { "glNormal3d", _wrap_glNormal3d, 1 },
-        { "glNormal3bv", _wrap_glNormal3bv, 1 },
-        { "glNormal3b", _wrap_glNormal3b, 1 },
-        { "glNewList", _wrap_glNewList, 1 },
-        { "glMultMatrixf", _wrap_glMultMatrixf, 1 },
-        { "glMultMatrixd", _wrap_glMultMatrixd, 1 },
-        { "glMatrixMode", _wrap_glMatrixMode, 1 },
-        { "glMaterialiv", _wrap_glMaterialiv, 1 },
-        { "glMateriali", _wrap_glMateriali, 1 },
-        { "glMaterialfv", _wrap_glMaterialfv, 1 },
-        { "glMaterialf", _wrap_glMaterialf, 1 },
-        { "glMapGrid2f", _wrap_glMapGrid2f, 1 },
-        { "glMapGrid2d", _wrap_glMapGrid2d, 1 },
-        { "glMapGrid1f", _wrap_glMapGrid1f, 1 },
-        { "glMapGrid1d", _wrap_glMapGrid1d, 1 },
-        { "glMap2f", _wrap_glMap2f, 1 },
-        { "glMap2d", _wrap_glMap2d, 1 },
-        { "glMap1f", _wrap_glMap1f, 1 },
-        { "glMap1d", _wrap_glMap1d, 1 },
-        { "glLogicOp", _wrap_glLogicOp, 1 },
-        { "glLoadName", _wrap_glLoadName, 1 },
-        { "glLoadMatrixf", _wrap_glLoadMatrixf, 1 },
-        { "glLoadMatrixd", _wrap_glLoadMatrixd, 1 },
-        { "glLoadIdentity", _wrap_glLoadIdentity, 1 },
-        { "glListBase", _wrap_glListBase, 1 },
-        { "glLineWidth", _wrap_glLineWidth, 1 },
-        { "glLineStipple", _wrap_glLineStipple, 1 },
-        { "glLightiv", _wrap_glLightiv, 1 },
-        { "glLighti", _wrap_glLighti, 1 },
-        { "glLightfv", _wrap_glLightfv, 1 },
-        { "glLightf", _wrap_glLightf, 1 },
-        { "glLightModeliv", _wrap_glLightModeliv, 1 },
-        { "glLightModeli", _wrap_glLightModeli, 1 },
-        { "glLightModelfv", _wrap_glLightModelfv, 1 },
-        { "glLightModelf", _wrap_glLightModelf, 1 },
-        { "glIsTexture", _wrap_glIsTexture, 1 },
-        { "glIsList", _wrap_glIsList, 1 },
-        { "glIsEnabled", _wrap_glIsEnabled, 1 },
-        { "glInterleavedArrays", _wrap_glInterleavedArrays, 1 },
-        { "glInitNames", _wrap_glInitNames, 1 },
-        { "glIndexubv", _wrap_glIndexubv, 1 },
-        { "glIndexub", _wrap_glIndexub, 1 },
-        { "glIndexsv", _wrap_glIndexsv, 1 },
-        { "glIndexs", _wrap_glIndexs, 1 },
-        { "glIndexiv", _wrap_glIndexiv, 1 },
-        { "glIndexi", _wrap_glIndexi, 1 },
-        { "glIndexfv", _wrap_glIndexfv, 1 },
-        { "glIndexf", _wrap_glIndexf, 1 },
-        { "glIndexdv", _wrap_glIndexdv, 1 },
-        { "glIndexd", _wrap_glIndexd, 1 },
-        { "glIndexPointer", _wrap_glIndexPointer, 1 },
-        { "glIndexMask", _wrap_glIndexMask, 1 },
-        { "glHint", _wrap_glHint, 1 },
-        { "glGetTexParameteriv", _wrap_glGetTexParameteriv, 1 },
-        { "glGetTexParameterfv", _wrap_glGetTexParameterfv, 1 },
-        { "glGetTexLevelParameteriv", _wrap_glGetTexLevelParameteriv, 1 },
-        { "glGetTexLevelParameterfv", _wrap_glGetTexLevelParameterfv, 1 },
-        { "glGetTexImage", _wrap_glGetTexImage, 1 },
-        { "glGetTexGeniv", _wrap_glGetTexGeniv, 1 },
-        { "glGetTexGenfv", _wrap_glGetTexGenfv, 1 },
-        { "glGetTexGendv", _wrap_glGetTexGendv, 1 },
-        { "glGetTexEnviv", _wrap_glGetTexEnviv, 1 },
-        { "glGetTexEnvfv", _wrap_glGetTexEnvfv, 1 },
-        { "glGetString", _wrap_glGetString, 1 },
-        { "glGetPolygonStipple", _wrap_glGetPolygonStipple, 1 },
-        { "glGetPointerv", _wrap_glGetPointerv, 1 },
-        { "glGetPixelMapusv", _wrap_glGetPixelMapusv, 1 },
-        { "glGetPixelMapuiv", _wrap_glGetPixelMapuiv, 1 },
-        { "glGetPixelMapfv", _wrap_glGetPixelMapfv, 1 },
-        { "glGetMaterialiv", _wrap_glGetMaterialiv, 1 },
-        { "glGetMaterialfv", _wrap_glGetMaterialfv, 1 },
-        { "glGetMapiv", _wrap_glGetMapiv, 1 },
-        { "glGetMapfv", _wrap_glGetMapfv, 1 },
-        { "glGetMapdv", _wrap_glGetMapdv, 1 },
-        { "glGetLightiv", _wrap_glGetLightiv, 1 },
-        { "glGetLightfv", _wrap_glGetLightfv, 1 },
-        { "glGetIntegerv", _wrap_glGetIntegerv, 1 },
-        { "glGetFloatv", _wrap_glGetFloatv, 1 },
-        { "glGetError", _wrap_glGetError, 1 },
-        { "glGetDoublev", _wrap_glGetDoublev, 1 },
-        { "glGetClipPlane", _wrap_glGetClipPlane, 1 },
-        { "glGetBooleanv", _wrap_glGetBooleanv, 1 },
-        { "glGenTextures", _wrap_glGenTextures, 1 },
-        { "glGenLists", _wrap_glGenLists, 1 },
-        { "glFrustum", _wrap_glFrustum, 1 },
-        { "glFrontFace", _wrap_glFrontFace, 1 },
-        { "glFogiv", _wrap_glFogiv, 1 },
-        { "glFogi", _wrap_glFogi, 1 },
-        { "glFogfv", _wrap_glFogfv, 1 },
-        { "glFogf", _wrap_glFogf, 1 },
-        { "glFlush", _wrap_glFlush, 1 },
-        { "glFinish", _wrap_glFinish, 1 },
-        { "glFeedbackBuffer", _wrap_glFeedbackBuffer, 1 },
-        { "glEvalPoint2", _wrap_glEvalPoint2, 1 },
-        { "glEvalPoint1", _wrap_glEvalPoint1, 1 },
-        { "glEvalMesh2", _wrap_glEvalMesh2, 1 },
-        { "glEvalMesh1", _wrap_glEvalMesh1, 1 },
-        { "glEvalCoord2fv", _wrap_glEvalCoord2fv, 1 },
-        { "glEvalCoord2f", _wrap_glEvalCoord2f, 1 },
-        { "glEvalCoord2dv", _wrap_glEvalCoord2dv, 1 },
-        { "glEvalCoord2d", _wrap_glEvalCoord2d, 1 },
-        { "glEvalCoord1fv", _wrap_glEvalCoord1fv, 1 },
-        { "glEvalCoord1f", _wrap_glEvalCoord1f, 1 },
-        { "glEvalCoord1dv", _wrap_glEvalCoord1dv, 1 },
-        { "glEvalCoord1d", _wrap_glEvalCoord1d, 1 },
-        { "glEndList", _wrap_glEndList, 1 },
-        { "glEnd", _wrap_glEnd, 1 },
-        { "glEnableClientState", _wrap_glEnableClientState, 1 },
-        { "glEnable", _wrap_glEnable, 1 },
-        { "glEdgeFlagv", _wrap_glEdgeFlagv, 1 },
-        { "glEdgeFlagPointer", _wrap_glEdgeFlagPointer, 1 },
-        { "glEdgeFlag", _wrap_glEdgeFlag, 1 },
-        { "glDrawPixels", _wrap_glDrawPixels, 1 },
-        { "glDrawElements", _wrap_glDrawElements, 1 },
-        { "glDrawBuffer", _wrap_glDrawBuffer, 1 },
-        { "glDrawArrays", _wrap_glDrawArrays, 1 },
-        { "glDisableClientState", _wrap_glDisableClientState, 1 },
-        { "glDisable", _wrap_glDisable, 1 },
-        { "glDepthRange", _wrap_glDepthRange, 1 },
-        { "glDepthMask", _wrap_glDepthMask, 1 },
-        { "glDepthFunc", _wrap_glDepthFunc, 1 },
-        { "glDeleteTextures", _wrap_glDeleteTextures, 1 },
-        { "glDeleteLists", _wrap_glDeleteLists, 1 },
-        { "glCullFace", _wrap_glCullFace, 1 },
-        { "glCopyTexSubImage2D", _wrap_glCopyTexSubImage2D, 1 },
-        { "glCopyTexSubImage1D", _wrap_glCopyTexSubImage1D, 1 },
-        { "glCopyTexImage2D", _wrap_glCopyTexImage2D, 1 },
-        { "glCopyTexImage1D", _wrap_glCopyTexImage1D, 1 },
-        { "glCopyPixels", _wrap_glCopyPixels, 1 },
-        { "glColorPointer", _wrap_glColorPointer, 1 },
-        { "glColorMaterial", _wrap_glColorMaterial, 1 },
-        { "glColorMask", _wrap_glColorMask, 1 },
-        { "glColor4usv", _wrap_glColor4usv, 1 },
-        { "glColor4us", _wrap_glColor4us, 1 },
-        { "glColor4uiv", _wrap_glColor4uiv, 1 },
-        { "glColor4ui", _wrap_glColor4ui, 1 },
-        { "glColor4ubv", _wrap_glColor4ubv, 1 },
-        { "glColor4ub", _wrap_glColor4ub, 1 },
-        { "glColor4sv", _wrap_glColor4sv, 1 },
-        { "glColor4s", _wrap_glColor4s, 1 },
-        { "glColor4iv", _wrap_glColor4iv, 1 },
-        { "glColor4i", _wrap_glColor4i, 1 },
-        { "glColor4fv", _wrap_glColor4fv, 1 },
-        { "glColor4f", _wrap_glColor4f, 1 },
-        { "glColor4dv", _wrap_glColor4dv, 1 },
-        { "glColor4d", _wrap_glColor4d, 1 },
-        { "glColor4bv", _wrap_glColor4bv, 1 },
-        { "glColor4b", _wrap_glColor4b, 1 },
-        { "glColor3usv", _wrap_glColor3usv, 1 },
-        { "glColor3us", _wrap_glColor3us, 1 },
-        { "glColor3uiv", _wrap_glColor3uiv, 1 },
-        { "glColor3ui", _wrap_glColor3ui, 1 },
-        { "glColor3ubv", _wrap_glColor3ubv, 1 },
-        { "glColor3ub", _wrap_glColor3ub, 1 },
-        { "glColor3sv", _wrap_glColor3sv, 1 },
-        { "glColor3s", _wrap_glColor3s, 1 },
-        { "glColor3iv", _wrap_glColor3iv, 1 },
-        { "glColor3i", _wrap_glColor3i, 1 },
-        { "glColor3fv", _wrap_glColor3fv, 1 },
-        { "glColor3f", _wrap_glColor3f, 1 },
-        { "glColor3dv", _wrap_glColor3dv, 1 },
-        { "glColor3d", _wrap_glColor3d, 1 },
-        { "glColor3bv", _wrap_glColor3bv, 1 },
-        { "glColor3b", _wrap_glColor3b, 1 },
-        { "glClipPlane", _wrap_glClipPlane, 1 },
-        { "glClearStencil", _wrap_glClearStencil, 1 },
-        { "glClearIndex", _wrap_glClearIndex, 1 },
-        { "glClearDepth", _wrap_glClearDepth, 1 },
-        { "glClearColor", _wrap_glClearColor, 1 },
-        { "glClearAccum", _wrap_glClearAccum, 1 },
-        { "glClear", _wrap_glClear, 1 },
-        { "glCallLists", _wrap_glCallLists, 1 },
-        { "glCallList", _wrap_glCallList, 1 },
-        { "glBlendFunc", _wrap_glBlendFunc, 1 },
-        { "glBitmap", _wrap_glBitmap, 1 },
-        { "glBindTexture", _wrap_glBindTexture, 1 },
-        { "glBegin", _wrap_glBegin, 1 },
-        { "glArrayElement", _wrap_glArrayElement, 1 },
-        { "glAreTexturesResident", _wrap_glAreTexturesResident, 1 },
-        { "glAlphaFunc", _wrap_glAlphaFunc, 1 },
-        { "glAccum", _wrap_glAccum, 1 },
-        { "glAddSwapHintRectWin", _wrap_glAddSwapHintRectWin, 1 },
-        { "glIndexMaterialSGI", _wrap_glIndexMaterialSGI, 1 },
-        { "glIndexFuncSGI", _wrap_glIndexFuncSGI, 1 },
-        { "glCullParameterfvSGI", _wrap_glCullParameterfvSGI, 1 },
-        { "glCullParameterdvSGI", _wrap_glCullParameterdvSGI, 1 },
-        { "glUnlockArraysSGI", _wrap_glUnlockArraysSGI, 1 },
-        { "glLockArraysSGI", _wrap_glLockArraysSGI, 1 },
-        { "glGetColorTavleParameterivEXT", _wrap_glGetColorTavleParameterivEXT, 1 },
-        { "glGetColorTableParamaterfvEXT", _wrap_glGetColorTableParamaterfvEXT, 1 },
-        { "glGetColorTableEXT", _wrap_glGetColorTableEXT, 1 },
-        { "glCopyColorTableEXT", _wrap_glCopyColorTableEXT, 1 },
-        { "glColorTableEXT", _wrap_glColorTableEXT, 1 },
-        { "glColorSubtableEXT", _wrap_glColorSubtableEXT, 1 },
-        { "glVertexPointerEXT", _wrap_glVertexPointerEXT, 1 },
-        { "glTexCoordPointerEXT", _wrap_glTexCoordPointerEXT, 1 },
-        { "glNormalPointerEXT", _wrap_glNormalPointerEXT, 1 },
-        { "glIndexPointerEXT", _wrap_glIndexPointerEXT, 1 },
-        { "glGetPointervEXT", _wrap_glGetPointervEXT, 1 },
-        { "glEdgeFlagPointerEXT", _wrap_glEdgeFlagPointerEXT, 1 },
-        { "glDrawArraysEXT", _wrap_glDrawArraysEXT, 1 },
-        { "glColorPointerEXT", _wrap_glColorPointerEXT, 1 },
-        { "glArrayElementEXT", _wrap_glArrayElementEXT, 1 },
+        { "wxGLCanvas_GetContext", _wrap_wxGLCanvas_GetContext, METH_VARARGS },
+        { "wxGLCanvas_SwapBuffers", _wrap_wxGLCanvas_SwapBuffers, METH_VARARGS },
+        { "wxGLCanvas_SetColour", _wrap_wxGLCanvas_SetColour, METH_VARARGS },
+        { "wxGLCanvas_SetCurrent", _wrap_wxGLCanvas_SetCurrent, METH_VARARGS },
+        { "new_wxGLCanvas", _wrap_new_wxGLCanvas, METH_VARARGS },
+        { "wxGLContext_GetWindow", _wrap_wxGLContext_GetWindow, METH_VARARGS },
+        { "wxGLContext_SwapBuffers", _wrap_wxGLContext_SwapBuffers, METH_VARARGS },
+        { "wxGLContext_SetColour", _wrap_wxGLContext_SetColour, METH_VARARGS },
+        { "wxGLContext_SetCurrent", _wrap_wxGLContext_SetCurrent, METH_VARARGS },
+        { "delete_wxGLContext", _wrap_delete_wxGLContext, METH_VARARGS },
+        { "new_wxGLContext", _wrap_new_wxGLContext, METH_VARARGS },
+        { "glViewport", _wrap_glViewport, METH_VARARGS },
+        { "glVertexPointer", _wrap_glVertexPointer, METH_VARARGS },
+        { "glVertex4sv", _wrap_glVertex4sv, METH_VARARGS },
+        { "glVertex4s", _wrap_glVertex4s, METH_VARARGS },
+        { "glVertex4iv", _wrap_glVertex4iv, METH_VARARGS },
+        { "glVertex4i", _wrap_glVertex4i, METH_VARARGS },
+        { "glVertex4fv", _wrap_glVertex4fv, METH_VARARGS },
+        { "glVertex4f", _wrap_glVertex4f, METH_VARARGS },
+        { "glVertex4dv", _wrap_glVertex4dv, METH_VARARGS },
+        { "glVertex4d", _wrap_glVertex4d, METH_VARARGS },
+        { "glVertex3sv", _wrap_glVertex3sv, METH_VARARGS },
+        { "glVertex3s", _wrap_glVertex3s, METH_VARARGS },
+        { "glVertex3iv", _wrap_glVertex3iv, METH_VARARGS },
+        { "glVertex3i", _wrap_glVertex3i, METH_VARARGS },
+        { "glVertex3fv", _wrap_glVertex3fv, METH_VARARGS },
+        { "glVertex3f", _wrap_glVertex3f, METH_VARARGS },
+        { "glVertex3dv", _wrap_glVertex3dv, METH_VARARGS },
+        { "glVertex3d", _wrap_glVertex3d, METH_VARARGS },
+        { "glVertex2sv", _wrap_glVertex2sv, METH_VARARGS },
+        { "glVertex2s", _wrap_glVertex2s, METH_VARARGS },
+        { "glVertex2iv", _wrap_glVertex2iv, METH_VARARGS },
+        { "glVertex2i", _wrap_glVertex2i, METH_VARARGS },
+        { "glVertex2fv", _wrap_glVertex2fv, METH_VARARGS },
+        { "glVertex2f", _wrap_glVertex2f, METH_VARARGS },
+        { "glVertex2dv", _wrap_glVertex2dv, METH_VARARGS },
+        { "glVertex2d", _wrap_glVertex2d, METH_VARARGS },
+        { "glTranslatef", _wrap_glTranslatef, METH_VARARGS },
+        { "glTranslated", _wrap_glTranslated, METH_VARARGS },
+        { "glTexSubImage2D", _wrap_glTexSubImage2D, METH_VARARGS },
+        { "glTexSubImage1D", _wrap_glTexSubImage1D, METH_VARARGS },
+        { "glTexParameteriv", _wrap_glTexParameteriv, METH_VARARGS },
+        { "glTexParameteri", _wrap_glTexParameteri, METH_VARARGS },
+        { "glTexParameterfv", _wrap_glTexParameterfv, METH_VARARGS },
+        { "glTexParameterf", _wrap_glTexParameterf, METH_VARARGS },
+        { "glTexImage2D", _wrap_glTexImage2D, METH_VARARGS },
+        { "glTexImage1D", _wrap_glTexImage1D, METH_VARARGS },
+        { "glTexGeniv", _wrap_glTexGeniv, METH_VARARGS },
+        { "glTexGeni", _wrap_glTexGeni, METH_VARARGS },
+        { "glTexGenfv", _wrap_glTexGenfv, METH_VARARGS },
+        { "glTexGenf", _wrap_glTexGenf, METH_VARARGS },
+        { "glTexGendv", _wrap_glTexGendv, METH_VARARGS },
+        { "glTexGend", _wrap_glTexGend, METH_VARARGS },
+        { "glTexEnviv", _wrap_glTexEnviv, METH_VARARGS },
+        { "glTexEnvi", _wrap_glTexEnvi, METH_VARARGS },
+        { "glTexEnvfv", _wrap_glTexEnvfv, METH_VARARGS },
+        { "glTexEnvf", _wrap_glTexEnvf, METH_VARARGS },
+        { "glTexCoordPointer", _wrap_glTexCoordPointer, METH_VARARGS },
+        { "glTexCoord4sv", _wrap_glTexCoord4sv, METH_VARARGS },
+        { "glTexCoord4s", _wrap_glTexCoord4s, METH_VARARGS },
+        { "glTexCoord4iv", _wrap_glTexCoord4iv, METH_VARARGS },
+        { "glTexCoord4i", _wrap_glTexCoord4i, METH_VARARGS },
+        { "glTexCoord4fv", _wrap_glTexCoord4fv, METH_VARARGS },
+        { "glTexCoord4f", _wrap_glTexCoord4f, METH_VARARGS },
+        { "glTexCoord4dv", _wrap_glTexCoord4dv, METH_VARARGS },
+        { "glTexCoord4d", _wrap_glTexCoord4d, METH_VARARGS },
+        { "glTexCoord3sv", _wrap_glTexCoord3sv, METH_VARARGS },
+        { "glTexCoord3s", _wrap_glTexCoord3s, METH_VARARGS },
+        { "glTexCoord3iv", _wrap_glTexCoord3iv, METH_VARARGS },
+        { "glTexCoord3i", _wrap_glTexCoord3i, METH_VARARGS },
+        { "glTexCoord3fv", _wrap_glTexCoord3fv, METH_VARARGS },
+        { "glTexCoord3f", _wrap_glTexCoord3f, METH_VARARGS },
+        { "glTexCoord3dv", _wrap_glTexCoord3dv, METH_VARARGS },
+        { "glTexCoord3d", _wrap_glTexCoord3d, METH_VARARGS },
+        { "glTexCoord2sv", _wrap_glTexCoord2sv, METH_VARARGS },
+        { "glTexCoord2s", _wrap_glTexCoord2s, METH_VARARGS },
+        { "glTexCoord2iv", _wrap_glTexCoord2iv, METH_VARARGS },
+        { "glTexCoord2i", _wrap_glTexCoord2i, METH_VARARGS },
+        { "glTexCoord2fv", _wrap_glTexCoord2fv, METH_VARARGS },
+        { "glTexCoord2f", _wrap_glTexCoord2f, METH_VARARGS },
+        { "glTexCoord2dv", _wrap_glTexCoord2dv, METH_VARARGS },
+        { "glTexCoord2d", _wrap_glTexCoord2d, METH_VARARGS },
+        { "glTexCoord1sv", _wrap_glTexCoord1sv, METH_VARARGS },
+        { "glTexCoord1s", _wrap_glTexCoord1s, METH_VARARGS },
+        { "glTexCoord1iv", _wrap_glTexCoord1iv, METH_VARARGS },
+        { "glTexCoord1i", _wrap_glTexCoord1i, METH_VARARGS },
+        { "glTexCoord1fv", _wrap_glTexCoord1fv, METH_VARARGS },
+        { "glTexCoord1f", _wrap_glTexCoord1f, METH_VARARGS },
+        { "glTexCoord1dv", _wrap_glTexCoord1dv, METH_VARARGS },
+        { "glTexCoord1d", _wrap_glTexCoord1d, METH_VARARGS },
+        { "glStencilOp", _wrap_glStencilOp, METH_VARARGS },
+        { "glStencilMask", _wrap_glStencilMask, METH_VARARGS },
+        { "glStencilFunc", _wrap_glStencilFunc, METH_VARARGS },
+        { "glShadeModel", _wrap_glShadeModel, METH_VARARGS },
+        { "glSelectBuffer", _wrap_glSelectBuffer, METH_VARARGS },
+        { "glScissor", _wrap_glScissor, METH_VARARGS },
+        { "glScalef", _wrap_glScalef, METH_VARARGS },
+        { "glScaled", _wrap_glScaled, METH_VARARGS },
+        { "glRotatef", _wrap_glRotatef, METH_VARARGS },
+        { "glRotated", _wrap_glRotated, METH_VARARGS },
+        { "glRenderMode", _wrap_glRenderMode, METH_VARARGS },
+        { "glRectsv", _wrap_glRectsv, METH_VARARGS },
+        { "glRects", _wrap_glRects, METH_VARARGS },
+        { "glRectiv", _wrap_glRectiv, METH_VARARGS },
+        { "glRecti", _wrap_glRecti, METH_VARARGS },
+        { "glRectfv", _wrap_glRectfv, METH_VARARGS },
+        { "glRectf", _wrap_glRectf, METH_VARARGS },
+        { "glRectdv", _wrap_glRectdv, METH_VARARGS },
+        { "glRectd", _wrap_glRectd, METH_VARARGS },
+        { "glReadPixels", _wrap_glReadPixels, METH_VARARGS },
+        { "glReadBuffer", _wrap_glReadBuffer, METH_VARARGS },
+        { "glRasterPos4sv", _wrap_glRasterPos4sv, METH_VARARGS },
+        { "glRasterPos4s", _wrap_glRasterPos4s, METH_VARARGS },
+        { "glRasterPos4iv", _wrap_glRasterPos4iv, METH_VARARGS },
+        { "glRasterPos4i", _wrap_glRasterPos4i, METH_VARARGS },
+        { "glRasterPos4fv", _wrap_glRasterPos4fv, METH_VARARGS },
+        { "glRasterPos4f", _wrap_glRasterPos4f, METH_VARARGS },
+        { "glRasterPos4dv", _wrap_glRasterPos4dv, METH_VARARGS },
+        { "glRasterPos4d", _wrap_glRasterPos4d, METH_VARARGS },
+        { "glRasterPos3sv", _wrap_glRasterPos3sv, METH_VARARGS },
+        { "glRasterPos3s", _wrap_glRasterPos3s, METH_VARARGS },
+        { "glRasterPos3iv", _wrap_glRasterPos3iv, METH_VARARGS },
+        { "glRasterPos3i", _wrap_glRasterPos3i, METH_VARARGS },
+        { "glRasterPos3fv", _wrap_glRasterPos3fv, METH_VARARGS },
+        { "glRasterPos3f", _wrap_glRasterPos3f, METH_VARARGS },
+        { "glRasterPos3dv", _wrap_glRasterPos3dv, METH_VARARGS },
+        { "glRasterPos3d", _wrap_glRasterPos3d, METH_VARARGS },
+        { "glRasterPos2sv", _wrap_glRasterPos2sv, METH_VARARGS },
+        { "glRasterPos2s", _wrap_glRasterPos2s, METH_VARARGS },
+        { "glRasterPos2iv", _wrap_glRasterPos2iv, METH_VARARGS },
+        { "glRasterPos2i", _wrap_glRasterPos2i, METH_VARARGS },
+        { "glRasterPos2fv", _wrap_glRasterPos2fv, METH_VARARGS },
+        { "glRasterPos2f", _wrap_glRasterPos2f, METH_VARARGS },
+        { "glRasterPos2dv", _wrap_glRasterPos2dv, METH_VARARGS },
+        { "glRasterPos2d", _wrap_glRasterPos2d, METH_VARARGS },
+        { "glPushName", _wrap_glPushName, METH_VARARGS },
+        { "glPushMatrix", _wrap_glPushMatrix, METH_VARARGS },
+        { "glPushClientAttrib", _wrap_glPushClientAttrib, METH_VARARGS },
+        { "glPushAttrib", _wrap_glPushAttrib, METH_VARARGS },
+        { "glPrioritizeTextures", _wrap_glPrioritizeTextures, METH_VARARGS },
+        { "glPopName", _wrap_glPopName, METH_VARARGS },
+        { "glPopMatrix", _wrap_glPopMatrix, METH_VARARGS },
+        { "glPopClientAttrib", _wrap_glPopClientAttrib, METH_VARARGS },
+        { "glPopAttrib", _wrap_glPopAttrib, METH_VARARGS },
+        { "glPolygonStipple", _wrap_glPolygonStipple, METH_VARARGS },
+        { "glPolygonOffset", _wrap_glPolygonOffset, METH_VARARGS },
+        { "glPolygonMode", _wrap_glPolygonMode, METH_VARARGS },
+        { "glPointSize", _wrap_glPointSize, METH_VARARGS },
+        { "glPixelZoom", _wrap_glPixelZoom, METH_VARARGS },
+        { "glPixelTransferi", _wrap_glPixelTransferi, METH_VARARGS },
+        { "glPixelTransferf", _wrap_glPixelTransferf, METH_VARARGS },
+        { "glPixelStorei", _wrap_glPixelStorei, METH_VARARGS },
+        { "glPixelStoref", _wrap_glPixelStoref, METH_VARARGS },
+        { "glPixelMapusv", _wrap_glPixelMapusv, METH_VARARGS },
+        { "glPixelMapuiv", _wrap_glPixelMapuiv, METH_VARARGS },
+        { "glPixelMapfv", _wrap_glPixelMapfv, METH_VARARGS },
+        { "glPassThrough", _wrap_glPassThrough, METH_VARARGS },
+        { "glOrtho", _wrap_glOrtho, METH_VARARGS },
+        { "glNormalPointer", _wrap_glNormalPointer, METH_VARARGS },
+        { "glNormal3sv", _wrap_glNormal3sv, METH_VARARGS },
+        { "glNormal3s", _wrap_glNormal3s, METH_VARARGS },
+        { "glNormal3iv", _wrap_glNormal3iv, METH_VARARGS },
+        { "glNormal3i", _wrap_glNormal3i, METH_VARARGS },
+        { "glNormal3fv", _wrap_glNormal3fv, METH_VARARGS },
+        { "glNormal3f", _wrap_glNormal3f, METH_VARARGS },
+        { "glNormal3dv", _wrap_glNormal3dv, METH_VARARGS },
+        { "glNormal3d", _wrap_glNormal3d, METH_VARARGS },
+        { "glNormal3bv", _wrap_glNormal3bv, METH_VARARGS },
+        { "glNormal3b", _wrap_glNormal3b, METH_VARARGS },
+        { "glNewList", _wrap_glNewList, METH_VARARGS },
+        { "glMultMatrixf", _wrap_glMultMatrixf, METH_VARARGS },
+        { "glMultMatrixd", _wrap_glMultMatrixd, METH_VARARGS },
+        { "glMatrixMode", _wrap_glMatrixMode, METH_VARARGS },
+        { "glMaterialiv", _wrap_glMaterialiv, METH_VARARGS },
+        { "glMateriali", _wrap_glMateriali, METH_VARARGS },
+        { "glMaterialfv", _wrap_glMaterialfv, METH_VARARGS },
+        { "glMaterialf", _wrap_glMaterialf, METH_VARARGS },
+        { "glMapGrid2f", _wrap_glMapGrid2f, METH_VARARGS },
+        { "glMapGrid2d", _wrap_glMapGrid2d, METH_VARARGS },
+        { "glMapGrid1f", _wrap_glMapGrid1f, METH_VARARGS },
+        { "glMapGrid1d", _wrap_glMapGrid1d, METH_VARARGS },
+        { "glMap2f", _wrap_glMap2f, METH_VARARGS },
+        { "glMap2d", _wrap_glMap2d, METH_VARARGS },
+        { "glMap1f", _wrap_glMap1f, METH_VARARGS },
+        { "glMap1d", _wrap_glMap1d, METH_VARARGS },
+        { "glLogicOp", _wrap_glLogicOp, METH_VARARGS },
+        { "glLoadName", _wrap_glLoadName, METH_VARARGS },
+        { "glLoadMatrixf", _wrap_glLoadMatrixf, METH_VARARGS },
+        { "glLoadMatrixd", _wrap_glLoadMatrixd, METH_VARARGS },
+        { "glLoadIdentity", _wrap_glLoadIdentity, METH_VARARGS },
+        { "glListBase", _wrap_glListBase, METH_VARARGS },
+        { "glLineWidth", _wrap_glLineWidth, METH_VARARGS },
+        { "glLineStipple", _wrap_glLineStipple, METH_VARARGS },
+        { "glLightiv", _wrap_glLightiv, METH_VARARGS },
+        { "glLighti", _wrap_glLighti, METH_VARARGS },
+        { "glLightfv", _wrap_glLightfv, METH_VARARGS },
+        { "glLightf", _wrap_glLightf, METH_VARARGS },
+        { "glLightModeliv", _wrap_glLightModeliv, METH_VARARGS },
+        { "glLightModeli", _wrap_glLightModeli, METH_VARARGS },
+        { "glLightModelfv", _wrap_glLightModelfv, METH_VARARGS },
+        { "glLightModelf", _wrap_glLightModelf, METH_VARARGS },
+        { "glIsTexture", _wrap_glIsTexture, METH_VARARGS },
+        { "glIsList", _wrap_glIsList, METH_VARARGS },
+        { "glIsEnabled", _wrap_glIsEnabled, METH_VARARGS },
+        { "glInterleavedArrays", _wrap_glInterleavedArrays, METH_VARARGS },
+        { "glInitNames", _wrap_glInitNames, METH_VARARGS },
+        { "glIndexubv", _wrap_glIndexubv, METH_VARARGS },
+        { "glIndexub", _wrap_glIndexub, METH_VARARGS },
+        { "glIndexsv", _wrap_glIndexsv, METH_VARARGS },
+        { "glIndexs", _wrap_glIndexs, METH_VARARGS },
+        { "glIndexiv", _wrap_glIndexiv, METH_VARARGS },
+        { "glIndexi", _wrap_glIndexi, METH_VARARGS },
+        { "glIndexfv", _wrap_glIndexfv, METH_VARARGS },
+        { "glIndexf", _wrap_glIndexf, METH_VARARGS },
+        { "glIndexdv", _wrap_glIndexdv, METH_VARARGS },
+        { "glIndexd", _wrap_glIndexd, METH_VARARGS },
+        { "glIndexPointer", _wrap_glIndexPointer, METH_VARARGS },
+        { "glIndexMask", _wrap_glIndexMask, METH_VARARGS },
+        { "glHint", _wrap_glHint, METH_VARARGS },
+        { "glGetTexParameteriv", _wrap_glGetTexParameteriv, METH_VARARGS },
+        { "glGetTexParameterfv", _wrap_glGetTexParameterfv, METH_VARARGS },
+        { "glGetTexLevelParameteriv", _wrap_glGetTexLevelParameteriv, METH_VARARGS },
+        { "glGetTexLevelParameterfv", _wrap_glGetTexLevelParameterfv, METH_VARARGS },
+        { "glGetTexImage", _wrap_glGetTexImage, METH_VARARGS },
+        { "glGetTexGeniv", _wrap_glGetTexGeniv, METH_VARARGS },
+        { "glGetTexGenfv", _wrap_glGetTexGenfv, METH_VARARGS },
+        { "glGetTexGendv", _wrap_glGetTexGendv, METH_VARARGS },
+        { "glGetTexEnviv", _wrap_glGetTexEnviv, METH_VARARGS },
+        { "glGetTexEnvfv", _wrap_glGetTexEnvfv, METH_VARARGS },
+        { "glGetString", _wrap_glGetString, METH_VARARGS },
+        { "glGetPolygonStipple", _wrap_glGetPolygonStipple, METH_VARARGS },
+        { "glGetPointerv", _wrap_glGetPointerv, METH_VARARGS },
+        { "glGetPixelMapusv", _wrap_glGetPixelMapusv, METH_VARARGS },
+        { "glGetPixelMapuiv", _wrap_glGetPixelMapuiv, METH_VARARGS },
+        { "glGetPixelMapfv", _wrap_glGetPixelMapfv, METH_VARARGS },
+        { "glGetMaterialiv", _wrap_glGetMaterialiv, METH_VARARGS },
+        { "glGetMaterialfv", _wrap_glGetMaterialfv, METH_VARARGS },
+        { "glGetMapiv", _wrap_glGetMapiv, METH_VARARGS },
+        { "glGetMapfv", _wrap_glGetMapfv, METH_VARARGS },
+        { "glGetMapdv", _wrap_glGetMapdv, METH_VARARGS },
+        { "glGetLightiv", _wrap_glGetLightiv, METH_VARARGS },
+        { "glGetLightfv", _wrap_glGetLightfv, METH_VARARGS },
+        { "glGetIntegerv", _wrap_glGetIntegerv, METH_VARARGS },
+        { "glGetFloatv", _wrap_glGetFloatv, METH_VARARGS },
+        { "glGetError", _wrap_glGetError, METH_VARARGS },
+        { "glGetDoublev", _wrap_glGetDoublev, METH_VARARGS },
+        { "glGetClipPlane", _wrap_glGetClipPlane, METH_VARARGS },
+        { "glGetBooleanv", _wrap_glGetBooleanv, METH_VARARGS },
+        { "glGenTextures", _wrap_glGenTextures, METH_VARARGS },
+        { "glGenLists", _wrap_glGenLists, METH_VARARGS },
+        { "glFrustum", _wrap_glFrustum, METH_VARARGS },
+        { "glFrontFace", _wrap_glFrontFace, METH_VARARGS },
+        { "glFogiv", _wrap_glFogiv, METH_VARARGS },
+        { "glFogi", _wrap_glFogi, METH_VARARGS },
+        { "glFogfv", _wrap_glFogfv, METH_VARARGS },
+        { "glFogf", _wrap_glFogf, METH_VARARGS },
+        { "glFlush", _wrap_glFlush, METH_VARARGS },
+        { "glFinish", _wrap_glFinish, METH_VARARGS },
+        { "glFeedbackBuffer", _wrap_glFeedbackBuffer, METH_VARARGS },
+        { "glEvalPoint2", _wrap_glEvalPoint2, METH_VARARGS },
+        { "glEvalPoint1", _wrap_glEvalPoint1, METH_VARARGS },
+        { "glEvalMesh2", _wrap_glEvalMesh2, METH_VARARGS },
+        { "glEvalMesh1", _wrap_glEvalMesh1, METH_VARARGS },
+        { "glEvalCoord2fv", _wrap_glEvalCoord2fv, METH_VARARGS },
+        { "glEvalCoord2f", _wrap_glEvalCoord2f, METH_VARARGS },
+        { "glEvalCoord2dv", _wrap_glEvalCoord2dv, METH_VARARGS },
+        { "glEvalCoord2d", _wrap_glEvalCoord2d, METH_VARARGS },
+        { "glEvalCoord1fv", _wrap_glEvalCoord1fv, METH_VARARGS },
+        { "glEvalCoord1f", _wrap_glEvalCoord1f, METH_VARARGS },
+        { "glEvalCoord1dv", _wrap_glEvalCoord1dv, METH_VARARGS },
+        { "glEvalCoord1d", _wrap_glEvalCoord1d, METH_VARARGS },
+        { "glEndList", _wrap_glEndList, METH_VARARGS },
+        { "glEnd", _wrap_glEnd, METH_VARARGS },
+        { "glEnableClientState", _wrap_glEnableClientState, METH_VARARGS },
+        { "glEnable", _wrap_glEnable, METH_VARARGS },
+        { "glEdgeFlagv", _wrap_glEdgeFlagv, METH_VARARGS },
+        { "glEdgeFlagPointer", _wrap_glEdgeFlagPointer, METH_VARARGS },
+        { "glEdgeFlag", _wrap_glEdgeFlag, METH_VARARGS },
+        { "glDrawPixels", _wrap_glDrawPixels, METH_VARARGS },
+        { "glDrawElements", _wrap_glDrawElements, METH_VARARGS },
+        { "glDrawBuffer", _wrap_glDrawBuffer, METH_VARARGS },
+        { "glDrawArrays", _wrap_glDrawArrays, METH_VARARGS },
+        { "glDisableClientState", _wrap_glDisableClientState, METH_VARARGS },
+        { "glDisable", _wrap_glDisable, METH_VARARGS },
+        { "glDepthRange", _wrap_glDepthRange, METH_VARARGS },
+        { "glDepthMask", _wrap_glDepthMask, METH_VARARGS },
+        { "glDepthFunc", _wrap_glDepthFunc, METH_VARARGS },
+        { "glDeleteTextures", _wrap_glDeleteTextures, METH_VARARGS },
+        { "glDeleteLists", _wrap_glDeleteLists, METH_VARARGS },
+        { "glCullFace", _wrap_glCullFace, METH_VARARGS },
+        { "glCopyTexSubImage2D", _wrap_glCopyTexSubImage2D, METH_VARARGS },
+        { "glCopyTexSubImage1D", _wrap_glCopyTexSubImage1D, METH_VARARGS },
+        { "glCopyTexImage2D", _wrap_glCopyTexImage2D, METH_VARARGS },
+        { "glCopyTexImage1D", _wrap_glCopyTexImage1D, METH_VARARGS },
+        { "glCopyPixels", _wrap_glCopyPixels, METH_VARARGS },
+        { "glColorPointer", _wrap_glColorPointer, METH_VARARGS },
+        { "glColorMaterial", _wrap_glColorMaterial, METH_VARARGS },
+        { "glColorMask", _wrap_glColorMask, METH_VARARGS },
+        { "glColor4usv", _wrap_glColor4usv, METH_VARARGS },
+        { "glColor4us", _wrap_glColor4us, METH_VARARGS },
+        { "glColor4uiv", _wrap_glColor4uiv, METH_VARARGS },
+        { "glColor4ui", _wrap_glColor4ui, METH_VARARGS },
+        { "glColor4ubv", _wrap_glColor4ubv, METH_VARARGS },
+        { "glColor4ub", _wrap_glColor4ub, METH_VARARGS },
+        { "glColor4sv", _wrap_glColor4sv, METH_VARARGS },
+        { "glColor4s", _wrap_glColor4s, METH_VARARGS },
+        { "glColor4iv", _wrap_glColor4iv, METH_VARARGS },
+        { "glColor4i", _wrap_glColor4i, METH_VARARGS },
+        { "glColor4fv", _wrap_glColor4fv, METH_VARARGS },
+        { "glColor4f", _wrap_glColor4f, METH_VARARGS },
+        { "glColor4dv", _wrap_glColor4dv, METH_VARARGS },
+        { "glColor4d", _wrap_glColor4d, METH_VARARGS },
+        { "glColor4bv", _wrap_glColor4bv, METH_VARARGS },
+        { "glColor4b", _wrap_glColor4b, METH_VARARGS },
+        { "glColor3usv", _wrap_glColor3usv, METH_VARARGS },
+        { "glColor3us", _wrap_glColor3us, METH_VARARGS },
+        { "glColor3uiv", _wrap_glColor3uiv, METH_VARARGS },
+        { "glColor3ui", _wrap_glColor3ui, METH_VARARGS },
+        { "glColor3ubv", _wrap_glColor3ubv, METH_VARARGS },
+        { "glColor3ub", _wrap_glColor3ub, METH_VARARGS },
+        { "glColor3sv", _wrap_glColor3sv, METH_VARARGS },
+        { "glColor3s", _wrap_glColor3s, METH_VARARGS },
+        { "glColor3iv", _wrap_glColor3iv, METH_VARARGS },
+        { "glColor3i", _wrap_glColor3i, METH_VARARGS },
+        { "glColor3fv", _wrap_glColor3fv, METH_VARARGS },
+        { "glColor3f", _wrap_glColor3f, METH_VARARGS },
+        { "glColor3dv", _wrap_glColor3dv, METH_VARARGS },
+        { "glColor3d", _wrap_glColor3d, METH_VARARGS },
+        { "glColor3bv", _wrap_glColor3bv, METH_VARARGS },
+        { "glColor3b", _wrap_glColor3b, METH_VARARGS },
+        { "glClipPlane", _wrap_glClipPlane, METH_VARARGS },
+        { "glClearStencil", _wrap_glClearStencil, METH_VARARGS },
+        { "glClearIndex", _wrap_glClearIndex, METH_VARARGS },
+        { "glClearDepth", _wrap_glClearDepth, METH_VARARGS },
+        { "glClearColor", _wrap_glClearColor, METH_VARARGS },
+        { "glClearAccum", _wrap_glClearAccum, METH_VARARGS },
+        { "glClear", _wrap_glClear, METH_VARARGS },
+        { "glCallLists", _wrap_glCallLists, METH_VARARGS },
+        { "glCallList", _wrap_glCallList, METH_VARARGS },
+        { "glBlendFunc", _wrap_glBlendFunc, METH_VARARGS },
+        { "glBitmap", _wrap_glBitmap, METH_VARARGS },
+        { "glBindTexture", _wrap_glBindTexture, METH_VARARGS },
+        { "glBegin", _wrap_glBegin, METH_VARARGS },
+        { "glArrayElement", _wrap_glArrayElement, METH_VARARGS },
+        { "glAreTexturesResident", _wrap_glAreTexturesResident, METH_VARARGS },
+        { "glAlphaFunc", _wrap_glAlphaFunc, METH_VARARGS },
+        { "glAccum", _wrap_glAccum, METH_VARARGS },
+        { "glAddSwapHintRectWin", _wrap_glAddSwapHintRectWin, METH_VARARGS },
+        { "glIndexMaterialSGI", _wrap_glIndexMaterialSGI, METH_VARARGS },
+        { "glIndexFuncSGI", _wrap_glIndexFuncSGI, METH_VARARGS },
+        { "glCullParameterfvSGI", _wrap_glCullParameterfvSGI, METH_VARARGS },
+        { "glCullParameterdvSGI", _wrap_glCullParameterdvSGI, METH_VARARGS },
+        { "glUnlockArraysSGI", _wrap_glUnlockArraysSGI, METH_VARARGS },
+        { "glLockArraysSGI", _wrap_glLockArraysSGI, METH_VARARGS },
+        { "glGetColorTavleParameterivEXT", _wrap_glGetColorTavleParameterivEXT, METH_VARARGS },
+        { "glGetColorTableParamaterfvEXT", _wrap_glGetColorTableParamaterfvEXT, METH_VARARGS },
+        { "glGetColorTableEXT", _wrap_glGetColorTableEXT, METH_VARARGS },
+        { "glCopyColorTableEXT", _wrap_glCopyColorTableEXT, METH_VARARGS },
+        { "glColorTableEXT", _wrap_glColorTableEXT, METH_VARARGS },
+        { "glColorSubtableEXT", _wrap_glColorSubtableEXT, METH_VARARGS },
+        { "glVertexPointerEXT", _wrap_glVertexPointerEXT, METH_VARARGS },
+        { "glTexCoordPointerEXT", _wrap_glTexCoordPointerEXT, METH_VARARGS },
+        { "glNormalPointerEXT", _wrap_glNormalPointerEXT, METH_VARARGS },
+        { "glIndexPointerEXT", _wrap_glIndexPointerEXT, METH_VARARGS },
+        { "glGetPointervEXT", _wrap_glGetPointervEXT, METH_VARARGS },
+        { "glEdgeFlagPointerEXT", _wrap_glEdgeFlagPointerEXT, METH_VARARGS },
+        { "glDrawArraysEXT", _wrap_glDrawArraysEXT, METH_VARARGS },
+        { "glColorPointerEXT", _wrap_glColorPointerEXT, METH_VARARGS },
+        { "glArrayElementEXT", _wrap_glArrayElementEXT, METH_VARARGS },

         { NULL, NULL }
 };
         { NULL, NULL }
 };

+#ifdef __cplusplus
+}
+#endif
+/*
+ * This table is used by the pointer type-checker
+ */
+static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
+    { "_wxAcceleratorTable","_class_wxAcceleratorTable",0},
+    { "_wxEvent","_class_wxEvent",0},
+    { "_class_wxActivateEvent","_wxActivateEvent",0},
+    { "_GLfloat","_GLclampf",0},
+    { "_GLfloat","_float",0},
+    { "_signed_long","_long",0},
+    { "_wxMenuEvent","_class_wxMenuEvent",0},
+    { "_class_wxJPEGHandler","_wxJPEGHandler",0},
+    { "_wxBMPHandler","_class_wxBMPHandler",0},
+    { "_wxImage","_class_wxImage",0},
+    { "_double","_GLclampd",0},
+    { "_double","_GLdouble",0},
+    { "_wxPrintQuality","_GLuint",0},
+    { "_wxPrintQuality","_GLsizei",0},
+    { "_wxPrintQuality","_GLint",0},
+    { "_wxPrintQuality","_GLbitfield",0},
+    { "_wxPrintQuality","_GLenum",0},
+    { "_wxPrintQuality","_int",0},
+    { "_wxPrintQuality","_signed_int",0},
+    { "_wxPrintQuality","_unsigned_int",0},
+    { "_wxPrintQuality","_wxWindowID",0},
+    { "_wxPrintQuality","_uint",0},
+    { "_wxPrintQuality","_EBool",0},
+    { "_wxPrintQuality","_size_t",0},
+    { "_wxFontData","_class_wxFontData",0},
+    { "___wxPyCleanup","_class___wxPyCleanup",0},
+    { "_class_wxRegionIterator","_wxRegionIterator",0},
+    { "_class_wxMenuBar","_wxMenuBar",0},
+    { "_class_wxPyTreeItemData","_wxPyTreeItemData",0},
+    { "_class_wxEvtHandler","_class_wxGLCanvas",SwigwxGLCanvasTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxGLCanvas",SwigwxGLCanvasTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxEvtHandler",0},
+    { "_wxPaintEvent","_class_wxPaintEvent",0},
+    { "_wxGIFHandler","_class_wxGIFHandler",0},
+    { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
+    { "_wxCursor","_class_wxCursor",0},
+    { "_wxNotifyEvent","_class_wxNotifyEvent",0},
+    { "_wxImageHandler","_class_wxImageHandler",0},
+    { "_GLsizei","_GLuint",0},
+    { "_GLsizei","_int",0},
+    { "_GLsizei","_signed_int",0},
+    { "_GLsizei","_unsigned_int",0},
+    { "_GLsizei","_wxWindowID",0},
+    { "_GLsizei","_uint",0},
+    { "_GLsizei","_EBool",0},
+    { "_GLsizei","_size_t",0},
+    { "_GLsizei","_wxPrintQuality",0},
+    { "_GLsizei","_GLenum",0},
+    { "_GLsizei","_GLbitfield",0},
+    { "_GLsizei","_GLint",0},
+    { "_class_wxTreeCtrl","_wxTreeCtrl",0},
+    { "_wxMask","_class_wxMask",0},
+    { "_wxToolTip","_class_wxToolTip",0},
+    { "_wxGrid","_class_wxGrid",0},
+    { "_wxPNGHandler","_class_wxPNGHandler",0},
+    { "_class_wxColourData","_wxColourData",0},
+    { "_class_wxPageSetupDialogData","_wxPageSetupDialogData",0},
+    { "_wxPrinter","_class_wxPrinter",0},
+    { "_GLbyte","_signed_char",0},
+    { "_wxPen","_class_wxPen",0},
+    { "_wxUpdateUIEvent","_class_wxUpdateUIEvent",0},
+    { "_byte","_GLubyte",0},
+    { "_byte","_GLboolean",0},
+    { "_byte","_unsigned_char",0},
+    { "_wxStaticBox","_class_wxStaticBox",0},
+    { "_wxChoice","_class_wxChoice",0},
+    { "_wxSlider","_class_wxSlider",0},
+    { "_wxNotebookEvent","_class_wxNotebookEvent",0},
+    { "_wxPyPrintout","_class_wxPyPrintout",0},
+    { "_long","_wxDash",0},
+    { "_long","_unsigned_long",0},
+    { "_long","_signed_long",0},
+    { "_wxImageList","_class_wxImageList",0},
+    { "_wxDropFilesEvent","_class_wxDropFilesEvent",0},
+    { "_wxBitmapButton","_class_wxBitmapButton",0},
+    { "_wxSashWindow","_class_wxSashWindow",0},
+    { "_GLenum","_GLuint",0},
+    { "_GLenum","_GLsizei",0},
+    { "_GLenum","_GLint",0},
+    { "_GLenum","_GLbitfield",0},
+    { "_GLenum","_unsigned_int",0},
+    { "_GLenum","_int",0},
+    { "_GLenum","_wxWindowID",0},
+    { "_GLenum","_uint",0},
+    { "_GLenum","_size_t",0},
+    { "_GLenum","_wxPrintQuality",0},
+    { "_class_wxPrintDialogData","_wxPrintDialogData",0},
+    { "_wxGLContext","_class_wxGLContext",0},
+    { "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
+    { "_class_wxGauge","_wxGauge",0},
+    { "_class_wxSashEvent","_wxSashEvent",0},
+    { "_float","_GLclampf",0},
+    { "_float","_GLfloat",0},
+    { "_wxDC","_class_wxDC",0},
+    { "_wxListEvent","_class_wxListEvent",0},
+    { "_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0},
+    { "_wxProgressDialog","_class_wxProgressDialog",0},
+    { "_class_wxBMPHandler","_wxBMPHandler",0},
+    { "_wxPrintPreview","_class_wxPrintPreview",0},
+    { "_wxSpinEvent","_class_wxSpinEvent",0},
+    { "_wxSashLayoutWindow","_class_wxSashLayoutWindow",0},
+    { "_size_t","_GLuint",0},
+    { "_size_t","_GLsizei",0},
+    { "_size_t","_GLint",0},
+    { "_size_t","_GLbitfield",0},
+    { "_size_t","_GLenum",0},
+    { "_size_t","_wxPrintQuality",0},
+    { "_size_t","_unsigned_int",0},
+    { "_size_t","_int",0},
+    { "_size_t","_wxWindowID",0},
+    { "_size_t","_uint",0},
+    { "_class_wxRealPoint","_wxRealPoint",0},
+    { "_wxPrinterDC","_class_wxPrinterDC",0},
+    { "_class_wxMenuItem","_wxMenuItem",0},
+    { "_class_wxPaintEvent","_wxPaintEvent",0},
+    { "_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0},
+    { "_class_wxStatusBar","_wxStatusBar",0},
+    { "_class_wxGIFHandler","_wxGIFHandler",0},
+    { "_wxPanel","_class_wxGLCanvas",SwigwxGLCanvasTowxPanel},
+    { "_wxPanel","_wxGLCanvas",SwigwxGLCanvasTowxPanel},
+    { "_wxPanel","_class_wxPanel",0},
+    { "_wxInitDialogEvent","_class_wxInitDialogEvent",0},
+    { "_wxCheckBox","_class_wxCheckBox",0},
+    { "_wxPyEvent","_class_wxPyEvent",0},
+    { "_wxTextCtrl","_class_wxTextCtrl",0},
+    { "_signed_char","_GLbyte",0},
+    { "_class_wxMask","_wxMask",0},
+    { "_class_wxToolTip","_wxToolTip",0},
+    { "_class_wxKeyEvent","_wxKeyEvent",0},
+    { "_class_wxGrid","_wxGrid",0},
+    { "_class_wxPNGHandler","_wxPNGHandler",0},
+    { "_wxColour","_class_wxColour",0},
+    { "_class_wxDialog","_wxDialog",0},
+    { "_wxPageSetupDialog","_class_wxPageSetupDialog",0},
+    { "_class_wxPrinter","_wxPrinter",0},
+    { "_wxIdleEvent","_class_wxIdleEvent",0},
+    { "_class_wxUpdateUIEvent","_wxUpdateUIEvent",0},
+    { "_wxToolBar","_class_wxToolBar",0},
+    { "_wxStaticLine","_class_wxStaticLine",0},
+    { "_class_wxLayoutAlgorithm","_wxLayoutAlgorithm",0},
+    { "_wxBrush","_class_wxBrush",0},
+    { "_wxMiniFrame","_class_wxMiniFrame",0},
+    { "_class_wxNotebookEvent","_wxNotebookEvent",0},
+    { "_class_wxPyPrintout","_wxPyPrintout",0},
+    { "_class_wxSashWindow","_wxSashWindow",0},
+    { "_GLuint","_unsigned_int",0},
+    { "_GLuint","_int",0},
+    { "_GLuint","_wxWindowID",0},
+    { "_GLuint","_uint",0},
+    { "_GLuint","_size_t",0},
+    { "_GLuint","_wxPrintQuality",0},
+    { "_GLuint","_GLenum",0},
+    { "_GLuint","_GLbitfield",0},
+    { "_GLuint","_GLint",0},
+    { "_GLuint","_GLsizei",0},
+    { "_wxShowEvent","_class_wxShowEvent",0},
+    { "_uint","_GLuint",0},
+    { "_uint","_GLsizei",0},
+    { "_uint","_GLint",0},
+    { "_uint","_GLbitfield",0},
+    { "_uint","_GLenum",0},
+    { "_uint","_wxPrintQuality",0},
+    { "_uint","_size_t",0},
+    { "_uint","_unsigned_int",0},
+    { "_uint","_int",0},
+    { "_uint","_wxWindowID",0},
+    { "_class_wxEvent","_wxEvent",0},
+    { "_wxCheckListBox","_class_wxCheckListBox",0},
+    { "_wxSplitterEvent","_class_wxSplitterEvent",0},
+    { "_wxGridEvent","_class_wxGridEvent",0},
+    { "_wxRect","_class_wxRect",0},
+    { "_wxCommandEvent","_class_wxCommandEvent",0},
+    { "_wxSizeEvent","_class_wxSizeEvent",0},
+    { "_class_wxImage","_wxImage",0},
+    { "_GLclampd","_double",0},
+    { "_GLclampd","_GLdouble",0},
+    { "_wxPoint","_class_wxPoint",0},
+    { "_class_wxSashLayoutWindow","_wxSashLayoutWindow",0},
+    { "_class_wxButton","_wxButton",0},
+    { "_wxRadioBox","_class_wxRadioBox",0},
+    { "_class_wxFontData","_wxFontData",0},
+    { "_class___wxPyCleanup","___wxPyCleanup",0},
+    { "_GLclampf","_float",0},
+    { "_GLclampf","_GLfloat",0},
+    { "_wxBitmap","_class_wxBitmap",0},
+    { "_wxTaskBarIcon","_class_wxTaskBarIcon",0},
+    { "_wxPrintDialog","_class_wxPrintDialog",0},
+    { "_wxPyTimer","_class_wxPyTimer",0},
+    { "_wxWindowDC","_class_wxWindowDC",0},
+    { "_wxScrollBar","_class_wxScrollBar",0},
+    { "_wxSpinButton","_class_wxSpinButton",0},
+    { "_wxToolBarTool","_class_wxToolBarTool",0},
+    { "_wxColourDialog","_class_wxColourDialog",0},
+    { "_wxPrintData","_class_wxPrintData",0},
+    { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
+    { "_class_wxNotifyEvent","_wxNotifyEvent",0},
+    { "_wxMessageDialog","_class_wxMessageDialog",0},
+    { "_GLbitfield","_GLuint",0},
+    { "_GLbitfield","_GLsizei",0},
+    { "_GLbitfield","_GLint",0},
+    { "_GLbitfield","_unsigned_int",0},
+    { "_GLbitfield","_int",0},
+    { "_GLbitfield","_wxWindowID",0},
+    { "_GLbitfield","_uint",0},
+    { "_GLbitfield","_size_t",0},
+    { "_GLbitfield","_wxPrintQuality",0},
+    { "_GLbitfield","_GLenum",0},
+    { "_class_wxPyEvent","_wxPyEvent",0},
+    { "_wxTextEntryDialog","_class_wxTextEntryDialog",0},
+    { "_class_wxIconizeEvent","_wxIconizeEvent",0},
+    { "_class_wxStaticBitmap","_wxStaticBitmap",0},
+    { "_wxMDIChildFrame","_class_wxMDIChildFrame",0},
+    { "_wxListItem","_class_wxListItem",0},
+    { "_class_wxToolBar","_wxToolBar",0},
+    { "_class_wxStaticLine","_wxStaticLine",0},
+    { "_wxScrollEvent","_class_wxScrollEvent",0},
+    { "_wxCalculateLayoutEvent","_class_wxCalculateLayoutEvent",0},
+    { "_EBool","_GLsizei",0},
+    { "_EBool","_GLint",0},
+    { "_EBool","_wxPrintQuality",0},
+    { "_EBool","_signed_int",0},
+    { "_EBool","_int",0},
+    { "_EBool","_wxWindowID",0},
+    { "_class_wxRegion","_wxRegion",0},
+    { "_class_wxDropFilesEvent","_wxDropFilesEvent",0},
+    { "_class_wxPreviewFrame","_wxPreviewFrame",0},
+    { "_wxStaticText","_class_wxStaticText",0},
+    { "_wxFont","_class_wxFont",0},
+    { "_wxCloseEvent","_class_wxCloseEvent",0},
+    { "_class_wxSplitterEvent","_wxSplitterEvent",0},
+    { "_wxNotebook","_class_wxNotebook",0},
+    { "_unsigned_long","_wxDash",0},
+    { "_unsigned_long","_long",0},
+    { "_class_wxRect","_wxRect",0},
+    { "_class_wxDC","_wxDC",0},
+    { "_class_wxProgressDialog","_wxProgressDialog",0},
+    { "_wxPyApp","_class_wxPyApp",0},
+    { "_wxMDIParentFrame","_class_wxMDIParentFrame",0},
+    { "_class_wxTreeEvent","_wxTreeEvent",0},
+    { "_class_wxDirDialog","_wxDirDialog",0},
+    { "_class_wxPyTimer","_wxPyTimer",0},
+    { "_wxFocusEvent","_class_wxFocusEvent",0},
+    { "_wxMaximizeEvent","_class_wxMaximizeEvent",0},
+    { "_class_wxSpinButton","_wxSpinButton",0},
+    { "_wxAcceleratorEntry","_class_wxAcceleratorEntry",0},
+    { "_class_wxPanel","_class_wxGLCanvas",SwigwxGLCanvasTowxPanel},
+    { "_class_wxPanel","_wxGLCanvas",SwigwxGLCanvasTowxPanel},
+    { "_class_wxPanel","_wxPanel",0},
+    { "_class_wxCheckBox","_wxCheckBox",0},
+    { "_wxComboBox","_class_wxComboBox",0},
+    { "_wxRadioButton","_class_wxRadioButton",0},
+    { "_class_wxMessageDialog","_wxMessageDialog",0},
+    { "_signed_int","_GLsizei",0},
+    { "_signed_int","_GLint",0},
+    { "_signed_int","_wxPrintQuality",0},
+    { "_signed_int","_EBool",0},
+    { "_signed_int","_wxWindowID",0},
+    { "_signed_int","_int",0},
+    { "_class_wxTextCtrl","_wxTextCtrl",0},
+    { "_GLboolean","_GLubyte",0},
+    { "_GLboolean","_unsigned_char",0},
+    { "_GLboolean","_byte",0},
+    { "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
+    { "_wxMetaFileDC","_class_wxMetaFileDC",0},
+    { "_wxMenu","_class_wxMenu",0},
+    { "_class_wxMoveEvent","_wxMoveEvent",0},
+    { "_wxListBox","_class_wxListBox",0},
+    { "_wxScreenDC","_class_wxScreenDC",0},
+    { "_class_wxMDIChildFrame","_wxMDIChildFrame",0},
+    { "_WXTYPE","_GLushort",0},
+    { "_WXTYPE","_GLshort",0},
+    { "_WXTYPE","_short",0},
+    { "_WXTYPE","_signed_short",0},
+    { "_WXTYPE","_unsigned_short",0},
+    { "_wxFileDialog","_class_wxFileDialog",0},
+    { "_GLshort","_GLushort",0},
+    { "_GLshort","_short",0},
+    { "_GLshort","_signed_short",0},
+    { "_GLshort","_unsigned_short",0},
+    { "_GLshort","_WXTYPE",0},
+    { "_class_wxMDIClientWindow","_wxMDIClientWindow",0},
+    { "_class_wxBrush","_wxBrush",0},
+    { "_unsigned_short","_GLushort",0},
+    { "_unsigned_short","_GLshort",0},
+    { "_unsigned_short","_WXTYPE",0},
+    { "_unsigned_short","_short",0},
+    { "_class_wxWindow","_class_wxGLCanvas",SwigwxGLCanvasTowxWindow},
+    { "_class_wxWindow","_wxGLCanvas",SwigwxGLCanvasTowxWindow},
+    { "_class_wxWindow","_wxWindow",0},
+    { "_wxSplitterWindow","_class_wxSplitterWindow",0},
+    { "_class_wxStaticText","_wxStaticText",0},
+    { "_wxPrintDialogData","_class_wxPrintDialogData",0},
+    { "_GLushort","_unsigned_short",0},
+    { "_GLushort","_short",0},
+    { "_GLushort","_WXTYPE",0},
+    { "_GLushort","_GLshort",0},
+    { "_class_wxFont","_wxFont",0},
+    { "_class_wxCloseEvent","_wxCloseEvent",0},
+    { "_wxSashEvent","_class_wxSashEvent",0},
+    { "_class_wxMenuEvent","_wxMenuEvent",0},
+    { "_wxClientDC","_class_wxClientDC",0},
+    { "_wxMouseEvent","_class_wxMouseEvent",0},
+    { "_wxListCtrl","_class_wxListCtrl",0},
+    { "_wxSingleChoiceDialog","_class_wxSingleChoiceDialog",0},
+    { "_wxGLCanvas","_class_wxGLCanvas",0},
+    { "_class_wxPoint","_wxPoint",0},
+    { "_wxRealPoint","_class_wxRealPoint",0},
+    { "_class_wxRadioBox","_wxRadioBox",0},
+    { "_wxGridCell","_class_wxGridCell",0},
+    { "_signed_short","_GLshort",0},
+    { "_signed_short","_WXTYPE",0},
+    { "_signed_short","_short",0},
+    { "_wxMemoryDC","_class_wxMemoryDC",0},
+    { "_class_wxTaskBarIcon","_wxTaskBarIcon",0},
+    { "_class_wxPrintDialog","_wxPrintDialog",0},
+    { "_wxPaintDC","_class_wxPaintDC",0},
+    { "_class_wxWindowDC","_wxWindowDC",0},
+    { "_class_wxFocusEvent","_wxFocusEvent",0},
+    { "_class_wxMaximizeEvent","_wxMaximizeEvent",0},
+    { "_wxStatusBar","_class_wxStatusBar",0},
+    { "_class_wxToolBarTool","_wxToolBarTool",0},
+    { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
+    { "_class_wxCursor","_wxCursor",0},
+    { "_class_wxImageHandler","_wxImageHandler",0},
+    { "_wxScrolledWindow","_class_wxGLCanvas",SwigwxGLCanvasTowxScrolledWindow},
+    { "_wxScrolledWindow","_wxGLCanvas",SwigwxGLCanvasTowxScrolledWindow},
+    { "_wxScrolledWindow","_class_wxScrolledWindow",0},
+    { "_wxTreeItemId","_class_wxTreeItemId",0},
+    { "_unsigned_char","_GLubyte",0},
+    { "_unsigned_char","_GLboolean",0},
+    { "_unsigned_char","_byte",0},
+    { "_class_wxMetaFileDC","_wxMetaFileDC",0},
+    { "_class_wxMenu","_wxMenu",0},
+    { "_wxControl","_class_wxControl",0},
+    { "_class_wxListBox","_wxListBox",0},
+    { "_unsigned_int","_GLuint",0},
+    { "_unsigned_int","_GLsizei",0},
+    { "_unsigned_int","_GLint",0},
+    { "_unsigned_int","_GLbitfield",0},
+    { "_unsigned_int","_GLenum",0},
+    { "_unsigned_int","_wxPrintQuality",0},
+    { "_unsigned_int","_size_t",0},
+    { "_unsigned_int","_uint",0},
+    { "_unsigned_int","_wxWindowID",0},
+    { "_unsigned_int","_int",0},
+    { "_wxIcon","_class_wxIcon",0},
+    { "_wxDialog","_class_wxDialog",0},
+    { "_class_wxListItem","_wxListItem",0},
+    { "_GLdouble","_GLclampd",0},
+    { "_GLdouble","_double",0},
+    { "_class_wxPen","_wxPen",0},
+    { "_class_wxFileDialog","_wxFileDialog",0},
+    { "_wxQueryLayoutInfoEvent","_class_wxQueryLayoutInfoEvent",0},
+    { "_short","_GLushort",0},
+    { "_short","_GLshort",0},
+    { "_short","_WXTYPE",0},
+    { "_short","_unsigned_short",0},
+    { "_short","_signed_short",0},
+    { "_class_wxStaticBox","_wxStaticBox",0},
+    { "_wxLayoutAlgorithm","_class_wxLayoutAlgorithm",0},
+    { "_class_wxScrollEvent","_wxScrollEvent",0},
+    { "_wxJoystickEvent","_class_wxJoystickEvent",0},
+    { "_class_wxChoice","_wxChoice",0},
+    { "_class_wxSlider","_wxSlider",0},
+    { "_class_wxCalculateLayoutEvent","_wxCalculateLayoutEvent",0},
+    { "_class_wxImageList","_wxImageList",0},
+    { "_class_wxBitmapButton","_wxBitmapButton",0},
+    { "_wxFrame","_class_wxFrame",0},
+    { "_class_wxGLContext","_wxGLContext",0},
+    { "_class_wxNotebook","_wxNotebook",0},
+    { "_wxJPEGHandler","_class_wxJPEGHandler",0},
+    { "_wxWindowID","_GLuint",0},
+    { "_wxWindowID","_GLsizei",0},
+    { "_wxWindowID","_GLint",0},
+    { "_wxWindowID","_GLbitfield",0},
+    { "_wxWindowID","_GLenum",0},
+    { "_wxWindowID","_wxPrintQuality",0},
+    { "_wxWindowID","_size_t",0},
+    { "_wxWindowID","_EBool",0},
+    { "_wxWindowID","_uint",0},
+    { "_wxWindowID","_int",0},
+    { "_wxWindowID","_signed_int",0},
+    { "_wxWindowID","_unsigned_int",0},
+    { "_int","_GLuint",0},
+    { "_int","_GLsizei",0},
+    { "_int","_GLint",0},
+    { "_int","_GLbitfield",0},
+    { "_int","_GLenum",0},
+    { "_int","_wxPrintQuality",0},
+    { "_int","_size_t",0},
+    { "_int","_EBool",0},
+    { "_int","_uint",0},
+    { "_int","_wxWindowID",0},
+    { "_int","_unsigned_int",0},
+    { "_int","_signed_int",0},
+    { "_class_wxMouseEvent","_wxMouseEvent",0},
+    { "_class_wxListEvent","_wxListEvent",0},
+    { "_class_wxPrintPreview","_wxPrintPreview",0},
+    { "_class_wxSpinEvent","_wxSpinEvent",0},
+    { "_wxButton","_class_wxButton",0},
+    { "_class_wxPyApp","_wxPyApp",0},
+    { "_wxSize","_class_wxSize",0},
+    { "_wxRegionIterator","_class_wxRegionIterator",0},
+    { "_class_wxPrinterDC","_wxPrinterDC",0},
+    { "_class_wxMDIParentFrame","_wxMDIParentFrame",0},
+    { "_wxPyTreeItemData","_class_wxPyTreeItemData",0},
+    { "_class_wxPaintDC","_wxPaintDC",0},
+    { "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0},
+    { "_class_wxInitDialogEvent","_wxInitDialogEvent",0},
+    { "_class_wxComboBox","_wxComboBox",0},
+    { "_class_wxRadioButton","_wxRadioButton",0},
+    { "_class_wxTreeItemId","_wxTreeItemId",0},
+    { "_wxTreeCtrl","_class_wxTreeCtrl",0},
+    { "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
+    { "_wxIconizeEvent","_class_wxIconizeEvent",0},
+    { "_class_wxControl","_wxControl",0},
+    { "_wxStaticBitmap","_class_wxStaticBitmap",0},
+    { "_class_wxIcon","_wxIcon",0},
+    { "_class_wxColour","_wxColour",0},
+    { "_class_wxScreenDC","_wxScreenDC",0},
+    { "_class_wxPageSetupDialog","_wxPageSetupDialog",0},
+    { "_wxPalette","_class_wxPalette",0},
+    { "_class_wxIdleEvent","_wxIdleEvent",0},
+    { "_wxEraseEvent","_class_wxEraseEvent",0},
+    { "_class_wxJoystickEvent","_wxJoystickEvent",0},
+    { "_class_wxMiniFrame","_wxMiniFrame",0},
+    { "_wxFontDialog","_class_wxFontDialog",0},
+    { "_wxRegion","_class_wxRegion",0},
+    { "_class_wxSplitterWindow","_wxSplitterWindow",0},
+    { "_wxPreviewFrame","_class_wxPreviewFrame",0},
+    { "_class_wxShowEvent","_wxShowEvent",0},
+    { "_GLint","_GLuint",0},
+    { "_GLint","_GLsizei",0},
+    { "_GLint","_int",0},
+    { "_GLint","_signed_int",0},
+    { "_GLint","_unsigned_int",0},
+    { "_GLint","_wxWindowID",0},
+    { "_GLint","_uint",0},
+    { "_GLint","_EBool",0},
+    { "_GLint","_size_t",0},
+    { "_GLint","_wxPrintQuality",0},
+    { "_GLint","_GLenum",0},
+    { "_GLint","_GLbitfield",0},
+    { "_wxActivateEvent","_class_wxActivateEvent",0},
+    { "_wxGauge","_class_wxGauge",0},
+    { "_class_wxCheckListBox","_wxCheckListBox",0},
+    { "_class_wxGridEvent","_wxGridEvent",0},
+    { "_class_wxCommandEvent","_wxCommandEvent",0},
+    { "_GLubyte","_unsigned_char",0},
+    { "_GLubyte","_byte",0},
+    { "_GLubyte","_GLboolean",0},
+    { "_class_wxClientDC","_wxClientDC",0},
+    { "_class_wxSizeEvent","_wxSizeEvent",0},
+    { "_class_wxListCtrl","_wxListCtrl",0},
+    { "_class_wxGLCanvas","_wxGLCanvas",0},
+    { "_class_wxGridCell","_wxGridCell",0},
+    { "_class_wxSize","_wxSize",0},
+    { "_class_wxBitmap","_wxBitmap",0},
+    { "_class_wxMemoryDC","_wxMemoryDC",0},
+    { "_wxMenuBar","_class_wxMenuBar",0},
+    { "_wxTreeEvent","_class_wxTreeEvent",0},
+    { "_wxDirDialog","_class_wxDirDialog",0},
+    { "_wxEvtHandler","_class_wxGLCanvas",SwigwxGLCanvasTowxEvtHandler},
+    { "_wxEvtHandler","_wxGLCanvas",SwigwxGLCanvasTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxEvtHandler",0},
+    { "_wxMenuItem","_class_wxMenuItem",0},
+    { "_class_wxScrollBar","_wxScrollBar",0},
+    { "_class_wxColourDialog","_wxColourDialog",0},
+    { "_class_wxPrintData","_wxPrintData",0},
+    { "_wxDash","_unsigned_long",0},
+    { "_wxDash","_long",0},
+    { "_class_wxScrolledWindow","_class_wxGLCanvas",SwigwxGLCanvasTowxScrolledWindow},
+    { "_class_wxScrolledWindow","_wxGLCanvas",SwigwxGLCanvasTowxScrolledWindow},
+    { "_class_wxScrolledWindow","_wxScrolledWindow",0},
+    { "_class_wxTextEntryDialog","_wxTextEntryDialog",0},
+    { "_wxKeyEvent","_class_wxKeyEvent",0},
+    { "_wxMoveEvent","_class_wxMoveEvent",0},
+    { "_wxColourData","_class_wxColourData",0},
+    { "_wxPageSetupDialogData","_class_wxPageSetupDialogData",0},
+    { "_class_wxPalette","_wxPalette",0},
+    { "_class_wxQueryLayoutInfoEvent","_wxQueryLayoutInfoEvent",0},
+    { "_class_wxEraseEvent","_wxEraseEvent",0},
+    { "_wxMDIClientWindow","_class_wxMDIClientWindow",0},
+    { "_class_wxFontDialog","_wxFontDialog",0},
+    { "_wxWindow","_class_wxGLCanvas",SwigwxGLCanvasTowxWindow},
+    { "_wxWindow","_wxGLCanvas",SwigwxGLCanvasTowxWindow},
+    { "_wxWindow","_class_wxWindow",0},
+    { "_class_wxFrame","_wxFrame",0},
+{0,0,0}};
+

 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif
 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif

-SWIGEXPORT(void,initglcanvasc)() {
+SWIGEXPORT(void) initglcanvasc() {

         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("glcanvasc", glcanvascMethods);
         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("glcanvasc", glcanvascMethods);


@@ -9241,496 +9955,9 @@ SWIGEXPORT(void,initglcanvasc)() {
     wxClassInfo::CleanUpClasses();
     wxClassInfo::InitializeClasses();
 
     wxClassInfo::CleanUpClasses();
     wxClassInfo::InitializeClasses();
 

-/*
- * These are the pointer type-equivalency mappings. 
- * (Used by the SWIG pointer type-checker).
- */
-        SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_wxEvent","_class_wxEvent",0);
-        SWIG_RegisterMapping("_class_wxActivateEvent","_wxActivateEvent",0);
-        SWIG_RegisterMapping("_GLfloat","_GLclampf",0);
-        SWIG_RegisterMapping("_GLfloat","_float",0);
-        SWIG_RegisterMapping("_signed_long","_long",0);
-        SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0);
-        SWIG_RegisterMapping("_class_wxJPEGHandler","_wxJPEGHandler",0);
-        SWIG_RegisterMapping("_wxBMPHandler","_class_wxBMPHandler",0);
-        SWIG_RegisterMapping("_wxImage","_class_wxImage",0);
-        SWIG_RegisterMapping("_double","_GLclampd",0);
-        SWIG_RegisterMapping("_double","_GLdouble",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_GLuint",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_GLsizei",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_GLint",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_GLbitfield",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_GLenum",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_signed_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_unsigned_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_wxWindowID",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_uint",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_EBool",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_size_t",0);
-        SWIG_RegisterMapping("_wxFontData","_class_wxFontData",0);
-        SWIG_RegisterMapping("___wxPyCleanup","_class___wxPyCleanup",0);
-        SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
-        SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
-        SWIG_RegisterMapping("_class_wxPyTreeItemData","_wxPyTreeItemData",0);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxGLCanvas",SwigwxGLCanvasTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxGLCanvas",SwigwxGLCanvasTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxEvtHandler",0);
-        SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
-        SWIG_RegisterMapping("_wxGIFHandler","_class_wxGIFHandler",0);
-        SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
-        SWIG_RegisterMapping("_wxNotifyEvent","_class_wxNotifyEvent",0);
-        SWIG_RegisterMapping("_wxImageHandler","_class_wxImageHandler",0);
-        SWIG_RegisterMapping("_GLsizei","_GLuint",0);
-        SWIG_RegisterMapping("_GLsizei","_int",0);
-        SWIG_RegisterMapping("_GLsizei","_signed_int",0);
-        SWIG_RegisterMapping("_GLsizei","_unsigned_int",0);
-        SWIG_RegisterMapping("_GLsizei","_wxWindowID",0);
-        SWIG_RegisterMapping("_GLsizei","_uint",0);
-        SWIG_RegisterMapping("_GLsizei","_EBool",0);
-        SWIG_RegisterMapping("_GLsizei","_size_t",0);
-        SWIG_RegisterMapping("_GLsizei","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_GLsizei","_GLenum",0);
-        SWIG_RegisterMapping("_GLsizei","_GLbitfield",0);
-        SWIG_RegisterMapping("_GLsizei","_GLint",0);
-        SWIG_RegisterMapping("_class_wxTreeCtrl","_wxTreeCtrl",0);
-        SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
-        SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0);
-        SWIG_RegisterMapping("_wxGrid","_class_wxGrid",0);
-        SWIG_RegisterMapping("_wxPNGHandler","_class_wxPNGHandler",0);
-        SWIG_RegisterMapping("_class_wxColourData","_wxColourData",0);
-        SWIG_RegisterMapping("_class_wxPageSetupDialogData","_wxPageSetupDialogData",0);
-        SWIG_RegisterMapping("_wxPrinter","_class_wxPrinter",0);
-        SWIG_RegisterMapping("_GLbyte","_signed_char",0);
-        SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
-        SWIG_RegisterMapping("_wxUpdateUIEvent","_class_wxUpdateUIEvent",0);
-        SWIG_RegisterMapping("_byte","_GLubyte",0);
-        SWIG_RegisterMapping("_byte","_GLboolean",0);
-        SWIG_RegisterMapping("_byte","_unsigned_char",0);
-        SWIG_RegisterMapping("_wxStaticBox","_class_wxStaticBox",0);
-        SWIG_RegisterMapping("_wxChoice","_class_wxChoice",0);
-        SWIG_RegisterMapping("_wxSlider","_class_wxSlider",0);
-        SWIG_RegisterMapping("_wxNotebookEvent","_class_wxNotebookEvent",0);
-        SWIG_RegisterMapping("_wxPyPrintout","_class_wxPyPrintout",0);
-        SWIG_RegisterMapping("_long","_wxDash",0);
-        SWIG_RegisterMapping("_long","_unsigned_long",0);
-        SWIG_RegisterMapping("_long","_signed_long",0);
-        SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0);
-        SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0);
-        SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0);
-        SWIG_RegisterMapping("_wxSashWindow","_class_wxSashWindow",0);
-        SWIG_RegisterMapping("_GLenum","_GLuint",0);
-        SWIG_RegisterMapping("_GLenum","_GLsizei",0);
-        SWIG_RegisterMapping("_GLenum","_GLint",0);
-        SWIG_RegisterMapping("_GLenum","_GLbitfield",0);
-        SWIG_RegisterMapping("_GLenum","_unsigned_int",0);
-        SWIG_RegisterMapping("_GLenum","_int",0);
-        SWIG_RegisterMapping("_GLenum","_wxWindowID",0);
-        SWIG_RegisterMapping("_GLenum","_uint",0);
-        SWIG_RegisterMapping("_GLenum","_size_t",0);
-        SWIG_RegisterMapping("_GLenum","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_class_wxPrintDialogData","_wxPrintDialogData",0);
-        SWIG_RegisterMapping("_wxGLContext","_class_wxGLContext",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_class_wxGauge","_wxGauge",0);
-        SWIG_RegisterMapping("_class_wxSashEvent","_wxSashEvent",0);
-        SWIG_RegisterMapping("_float","_GLclampf",0);
-        SWIG_RegisterMapping("_float","_GLfloat",0);
-        SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
-        SWIG_RegisterMapping("_wxListEvent","_class_wxListEvent",0);
-        SWIG_RegisterMapping("_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0);
-        SWIG_RegisterMapping("_wxProgressDialog","_class_wxProgressDialog",0);
-        SWIG_RegisterMapping("_class_wxBMPHandler","_wxBMPHandler",0);
-        SWIG_RegisterMapping("_wxPrintPreview","_class_wxPrintPreview",0);
-        SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0);
-        SWIG_RegisterMapping("_wxSashLayoutWindow","_class_wxSashLayoutWindow",0);
-        SWIG_RegisterMapping("_size_t","_GLuint",0);
-        SWIG_RegisterMapping("_size_t","_GLsizei",0);
-        SWIG_RegisterMapping("_size_t","_GLint",0);
-        SWIG_RegisterMapping("_size_t","_GLbitfield",0);
-        SWIG_RegisterMapping("_size_t","_GLenum",0);
-        SWIG_RegisterMapping("_size_t","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_size_t","_unsigned_int",0);
-        SWIG_RegisterMapping("_size_t","_int",0);
-        SWIG_RegisterMapping("_size_t","_wxWindowID",0);
-        SWIG_RegisterMapping("_size_t","_uint",0);
-        SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
-        SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0);
-        SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0);
-        SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0);
-        SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0);
-        SWIG_RegisterMapping("_class_wxStatusBar","_wxStatusBar",0);
-        SWIG_RegisterMapping("_class_wxGIFHandler","_wxGIFHandler",0);
-        SWIG_RegisterMapping("_wxPanel","_class_wxGLCanvas",SwigwxGLCanvasTowxPanel);
-        SWIG_RegisterMapping("_wxPanel","_wxGLCanvas",SwigwxGLCanvasTowxPanel);
-        SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);
-        SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
-        SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
-        SWIG_RegisterMapping("_wxPyEvent","_class_wxPyEvent",0);
-        SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);
-        SWIG_RegisterMapping("_signed_char","_GLbyte",0);
-        SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
-        SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0);
-        SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0);
-        SWIG_RegisterMapping("_class_wxGrid","_wxGrid",0);
-        SWIG_RegisterMapping("_class_wxPNGHandler","_wxPNGHandler",0);
-        SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
-        SWIG_RegisterMapping("_class_wxDialog","_wxDialog",0);
-        SWIG_RegisterMapping("_wxPageSetupDialog","_class_wxPageSetupDialog",0);
-        SWIG_RegisterMapping("_class_wxPrinter","_wxPrinter",0);
-        SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0);
-        SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0);
-        SWIG_RegisterMapping("_wxToolBar","_class_wxToolBar",0);
-        SWIG_RegisterMapping("_wxStaticLine","_class_wxStaticLine",0);
-        SWIG_RegisterMapping("_class_wxLayoutAlgorithm","_wxLayoutAlgorithm",0);
-        SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
-        SWIG_RegisterMapping("_wxMiniFrame","_class_wxMiniFrame",0);
-        SWIG_RegisterMapping("_class_wxNotebookEvent","_wxNotebookEvent",0);
-        SWIG_RegisterMapping("_class_wxPyPrintout","_wxPyPrintout",0);
-        SWIG_RegisterMapping("_class_wxSashWindow","_wxSashWindow",0);
-        SWIG_RegisterMapping("_GLuint","_unsigned_int",0);
-        SWIG_RegisterMapping("_GLuint","_int",0);
-        SWIG_RegisterMapping("_GLuint","_wxWindowID",0);
-        SWIG_RegisterMapping("_GLuint","_uint",0);
-        SWIG_RegisterMapping("_GLuint","_size_t",0);
-        SWIG_RegisterMapping("_GLuint","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_GLuint","_GLenum",0);
-        SWIG_RegisterMapping("_GLuint","_GLbitfield",0);
-        SWIG_RegisterMapping("_GLuint","_GLint",0);
-        SWIG_RegisterMapping("_GLuint","_GLsizei",0);
-        SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0);
-        SWIG_RegisterMapping("_uint","_GLuint",0);
-        SWIG_RegisterMapping("_uint","_GLsizei",0);
-        SWIG_RegisterMapping("_uint","_GLint",0);
-        SWIG_RegisterMapping("_uint","_GLbitfield",0);
-        SWIG_RegisterMapping("_uint","_GLenum",0);
-        SWIG_RegisterMapping("_uint","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_uint","_size_t",0);
-        SWIG_RegisterMapping("_uint","_unsigned_int",0);
-        SWIG_RegisterMapping("_uint","_int",0);
-        SWIG_RegisterMapping("_uint","_wxWindowID",0);
-        SWIG_RegisterMapping("_class_wxEvent","_wxEvent",0);
-        SWIG_RegisterMapping("_wxCheckListBox","_class_wxCheckListBox",0);
-        SWIG_RegisterMapping("_wxSplitterEvent","_class_wxSplitterEvent",0);
-        SWIG_RegisterMapping("_wxGridEvent","_class_wxGridEvent",0);
-        SWIG_RegisterMapping("_wxRect","_class_wxRect",0);
-        SWIG_RegisterMapping("_wxCommandEvent","_class_wxCommandEvent",0);
-        SWIG_RegisterMapping("_wxSizeEvent","_class_wxSizeEvent",0);
-        SWIG_RegisterMapping("_class_wxImage","_wxImage",0);
-        SWIG_RegisterMapping("_GLclampd","_double",0);
-        SWIG_RegisterMapping("_GLclampd","_GLdouble",0);
-        SWIG_RegisterMapping("_wxPoint","_class_wxPoint",0);
-        SWIG_RegisterMapping("_class_wxSashLayoutWindow","_wxSashLayoutWindow",0);
-        SWIG_RegisterMapping("_class_wxButton","_wxButton",0);
-        SWIG_RegisterMapping("_wxRadioBox","_class_wxRadioBox",0);
-        SWIG_RegisterMapping("_class_wxFontData","_wxFontData",0);
-        SWIG_RegisterMapping("_class___wxPyCleanup","___wxPyCleanup",0);
-        SWIG_RegisterMapping("_GLclampf","_float",0);
-        SWIG_RegisterMapping("_GLclampf","_GLfloat",0);
-        SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
-        SWIG_RegisterMapping("_wxTaskBarIcon","_class_wxTaskBarIcon",0);
-        SWIG_RegisterMapping("_wxPrintDialog","_class_wxPrintDialog",0);
-        SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0);
-        SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0);
-        SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0);
-        SWIG_RegisterMapping("_wxToolBarTool","_class_wxToolBarTool",0);
-        SWIG_RegisterMapping("_wxColourDialog","_class_wxColourDialog",0);
-        SWIG_RegisterMapping("_wxPrintData","_class_wxPrintData",0);
-        SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_class_wxNotifyEvent","_wxNotifyEvent",0);
-        SWIG_RegisterMapping("_wxMessageDialog","_class_wxMessageDialog",0);
-        SWIG_RegisterMapping("_GLbitfield","_GLuint",0);
-        SWIG_RegisterMapping("_GLbitfield","_GLsizei",0);
-        SWIG_RegisterMapping("_GLbitfield","_GLint",0);
-        SWIG_RegisterMapping("_GLbitfield","_unsigned_int",0);
-        SWIG_RegisterMapping("_GLbitfield","_int",0);
-        SWIG_RegisterMapping("_GLbitfield","_wxWindowID",0);
-        SWIG_RegisterMapping("_GLbitfield","_uint",0);
-        SWIG_RegisterMapping("_GLbitfield","_size_t",0);
-        SWIG_RegisterMapping("_GLbitfield","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_GLbitfield","_GLenum",0);
-        SWIG_RegisterMapping("_class_wxPyEvent","_wxPyEvent",0);
-        SWIG_RegisterMapping("_wxTextEntryDialog","_class_wxTextEntryDialog",0);
-        SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
-        SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
-        SWIG_RegisterMapping("_wxMDIChildFrame","_class_wxMDIChildFrame",0);
-        SWIG_RegisterMapping("_wxListItem","_class_wxListItem",0);
-        SWIG_RegisterMapping("_class_wxToolBar","_wxToolBar",0);
-        SWIG_RegisterMapping("_class_wxStaticLine","_wxStaticLine",0);
-        SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0);
-        SWIG_RegisterMapping("_wxCalculateLayoutEvent","_class_wxCalculateLayoutEvent",0);
-        SWIG_RegisterMapping("_EBool","_GLsizei",0);
-        SWIG_RegisterMapping("_EBool","_GLint",0);
-        SWIG_RegisterMapping("_EBool","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_EBool","_signed_int",0);
-        SWIG_RegisterMapping("_EBool","_int",0);
-        SWIG_RegisterMapping("_EBool","_wxWindowID",0);
-        SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
-        SWIG_RegisterMapping("_class_wxDropFilesEvent","_wxDropFilesEvent",0);
-        SWIG_RegisterMapping("_class_wxPreviewFrame","_wxPreviewFrame",0);
-        SWIG_RegisterMapping("_wxStaticText","_class_wxStaticText",0);
-        SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
-        SWIG_RegisterMapping("_wxCloseEvent","_class_wxCloseEvent",0);
-        SWIG_RegisterMapping("_class_wxSplitterEvent","_wxSplitterEvent",0);
-        SWIG_RegisterMapping("_wxNotebook","_class_wxNotebook",0);
-        SWIG_RegisterMapping("_unsigned_long","_wxDash",0);
-        SWIG_RegisterMapping("_unsigned_long","_long",0);
-        SWIG_RegisterMapping("_class_wxRect","_wxRect",0);
-        SWIG_RegisterMapping("_class_wxDC","_wxDC",0);
-        SWIG_RegisterMapping("_class_wxProgressDialog","_wxProgressDialog",0);
-        SWIG_RegisterMapping("_wxPyApp","_class_wxPyApp",0);
-        SWIG_RegisterMapping("_wxMDIParentFrame","_class_wxMDIParentFrame",0);
-        SWIG_RegisterMapping("_class_wxTreeEvent","_wxTreeEvent",0);
-        SWIG_RegisterMapping("_class_wxDirDialog","_wxDirDialog",0);
-        SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxFocusEvent","_class_wxFocusEvent",0);
-        SWIG_RegisterMapping("_wxMaximizeEvent","_class_wxMaximizeEvent",0);
-        SWIG_RegisterMapping("_class_wxSpinButton","_wxSpinButton",0);
-        SWIG_RegisterMapping("_wxAcceleratorEntry","_class_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_class_wxPanel","_class_wxGLCanvas",SwigwxGLCanvasTowxPanel);
-        SWIG_RegisterMapping("_class_wxPanel","_wxGLCanvas",SwigwxGLCanvasTowxPanel);
-        SWIG_RegisterMapping("_class_wxPanel","_wxPanel",0);
-        SWIG_RegisterMapping("_class_wxCheckBox","_wxCheckBox",0);
-        SWIG_RegisterMapping("_wxComboBox","_class_wxComboBox",0);
-        SWIG_RegisterMapping("_wxRadioButton","_class_wxRadioButton",0);
-        SWIG_RegisterMapping("_class_wxMessageDialog","_wxMessageDialog",0);
-        SWIG_RegisterMapping("_signed_int","_GLsizei",0);
-        SWIG_RegisterMapping("_signed_int","_GLint",0);
-        SWIG_RegisterMapping("_signed_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_signed_int","_EBool",0);
-        SWIG_RegisterMapping("_signed_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_signed_int","_int",0);
-        SWIG_RegisterMapping("_class_wxTextCtrl","_wxTextCtrl",0);
-        SWIG_RegisterMapping("_GLboolean","_GLubyte",0);
-        SWIG_RegisterMapping("_GLboolean","_unsigned_char",0);
-        SWIG_RegisterMapping("_GLboolean","_byte",0);
-        SWIG_RegisterMapping("_wxLayoutConstraints","_class_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_wxMetaFileDC","_class_wxMetaFileDC",0);
-        SWIG_RegisterMapping("_wxMenu","_class_wxMenu",0);
-        SWIG_RegisterMapping("_class_wxMoveEvent","_wxMoveEvent",0);
-        SWIG_RegisterMapping("_wxListBox","_class_wxListBox",0);
-        SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0);
-        SWIG_RegisterMapping("_class_wxMDIChildFrame","_wxMDIChildFrame",0);
-        SWIG_RegisterMapping("_WXTYPE","_GLushort",0);
-        SWIG_RegisterMapping("_WXTYPE","_GLshort",0);
-        SWIG_RegisterMapping("_WXTYPE","_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_signed_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_unsigned_short",0);
-        SWIG_RegisterMapping("_wxFileDialog","_class_wxFileDialog",0);
-        SWIG_RegisterMapping("_GLshort","_GLushort",0);
-        SWIG_RegisterMapping("_GLshort","_short",0);
-        SWIG_RegisterMapping("_GLshort","_signed_short",0);
-        SWIG_RegisterMapping("_GLshort","_unsigned_short",0);
-        SWIG_RegisterMapping("_GLshort","_WXTYPE",0);
-        SWIG_RegisterMapping("_class_wxMDIClientWindow","_wxMDIClientWindow",0);
-        SWIG_RegisterMapping("_class_wxBrush","_wxBrush",0);
-        SWIG_RegisterMapping("_unsigned_short","_GLushort",0);
-        SWIG_RegisterMapping("_unsigned_short","_GLshort",0);
-        SWIG_RegisterMapping("_unsigned_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_unsigned_short","_short",0);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxGLCanvas",SwigwxGLCanvasTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxGLCanvas",SwigwxGLCanvasTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxWindow",0);
-        SWIG_RegisterMapping("_wxSplitterWindow","_class_wxSplitterWindow",0);
-        SWIG_RegisterMapping("_class_wxStaticText","_wxStaticText",0);
-        SWIG_RegisterMapping("_wxPrintDialogData","_class_wxPrintDialogData",0);
-        SWIG_RegisterMapping("_GLushort","_unsigned_short",0);
-        SWIG_RegisterMapping("_GLushort","_short",0);
-        SWIG_RegisterMapping("_GLushort","_WXTYPE",0);
-        SWIG_RegisterMapping("_GLushort","_GLshort",0);
-        SWIG_RegisterMapping("_class_wxFont","_wxFont",0);
-        SWIG_RegisterMapping("_class_wxCloseEvent","_wxCloseEvent",0);
-        SWIG_RegisterMapping("_wxSashEvent","_class_wxSashEvent",0);
-        SWIG_RegisterMapping("_class_wxMenuEvent","_wxMenuEvent",0);
-        SWIG_RegisterMapping("_wxClientDC","_class_wxClientDC",0);
-        SWIG_RegisterMapping("_wxMouseEvent","_class_wxMouseEvent",0);
-        SWIG_RegisterMapping("_wxListCtrl","_class_wxListCtrl",0);
-        SWIG_RegisterMapping("_wxSingleChoiceDialog","_class_wxSingleChoiceDialog",0);
-        SWIG_RegisterMapping("_wxGLCanvas","_class_wxGLCanvas",0);
-        SWIG_RegisterMapping("_class_wxPoint","_wxPoint",0);
-        SWIG_RegisterMapping("_wxRealPoint","_class_wxRealPoint",0);
-        SWIG_RegisterMapping("_class_wxRadioBox","_wxRadioBox",0);
-        SWIG_RegisterMapping("_wxGridCell","_class_wxGridCell",0);
-        SWIG_RegisterMapping("_signed_short","_GLshort",0);
-        SWIG_RegisterMapping("_signed_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_signed_short","_short",0);
-        SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0);
-        SWIG_RegisterMapping("_class_wxTaskBarIcon","_wxTaskBarIcon",0);
-        SWIG_RegisterMapping("_class_wxPrintDialog","_wxPrintDialog",0);
-        SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
-        SWIG_RegisterMapping("_class_wxWindowDC","_wxWindowDC",0);
-        SWIG_RegisterMapping("_class_wxFocusEvent","_wxFocusEvent",0);
-        SWIG_RegisterMapping("_class_wxMaximizeEvent","_wxMaximizeEvent",0);
-        SWIG_RegisterMapping("_wxStatusBar","_class_wxStatusBar",0);
-        SWIG_RegisterMapping("_class_wxToolBarTool","_wxToolBarTool",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
-        SWIG_RegisterMapping("_class_wxImageHandler","_wxImageHandler",0);
-        SWIG_RegisterMapping("_wxScrolledWindow","_class_wxGLCanvas",SwigwxGLCanvasTowxScrolledWindow);
-        SWIG_RegisterMapping("_wxScrolledWindow","_wxGLCanvas",SwigwxGLCanvasTowxScrolledWindow);
-        SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0);
-        SWIG_RegisterMapping("_wxTreeItemId","_class_wxTreeItemId",0);
-        SWIG_RegisterMapping("_unsigned_char","_GLubyte",0);
-        SWIG_RegisterMapping("_unsigned_char","_GLboolean",0);
-        SWIG_RegisterMapping("_unsigned_char","_byte",0);
-        SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0);
-        SWIG_RegisterMapping("_class_wxMenu","_wxMenu",0);
-        SWIG_RegisterMapping("_wxControl","_class_wxControl",0);
-        SWIG_RegisterMapping("_class_wxListBox","_wxListBox",0);
-        SWIG_RegisterMapping("_unsigned_int","_GLuint",0);
-        SWIG_RegisterMapping("_unsigned_int","_GLsizei",0);
-        SWIG_RegisterMapping("_unsigned_int","_GLint",0);
-        SWIG_RegisterMapping("_unsigned_int","_GLbitfield",0);
-        SWIG_RegisterMapping("_unsigned_int","_GLenum",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_unsigned_int","_size_t",0);
-        SWIG_RegisterMapping("_unsigned_int","_uint",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_unsigned_int","_int",0);
-        SWIG_RegisterMapping("_wxIcon","_class_wxIcon",0);
-        SWIG_RegisterMapping("_wxDialog","_class_wxDialog",0);
-        SWIG_RegisterMapping("_class_wxListItem","_wxListItem",0);
-        SWIG_RegisterMapping("_GLdouble","_GLclampd",0);
-        SWIG_RegisterMapping("_GLdouble","_double",0);
-        SWIG_RegisterMapping("_class_wxPen","_wxPen",0);
-        SWIG_RegisterMapping("_class_wxFileDialog","_wxFileDialog",0);
-        SWIG_RegisterMapping("_wxQueryLayoutInfoEvent","_class_wxQueryLayoutInfoEvent",0);
-        SWIG_RegisterMapping("_short","_GLushort",0);
-        SWIG_RegisterMapping("_short","_GLshort",0);
-        SWIG_RegisterMapping("_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_short","_unsigned_short",0);
-        SWIG_RegisterMapping("_short","_signed_short",0);
-        SWIG_RegisterMapping("_class_wxStaticBox","_wxStaticBox",0);
-        SWIG_RegisterMapping("_wxLayoutAlgorithm","_class_wxLayoutAlgorithm",0);
-        SWIG_RegisterMapping("_class_wxScrollEvent","_wxScrollEvent",0);
-        SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0);
-        SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
-        SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);
-        SWIG_RegisterMapping("_class_wxCalculateLayoutEvent","_wxCalculateLayoutEvent",0);
-        SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0);
-        SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
-        SWIG_RegisterMapping("_wxFrame","_class_wxFrame",0);
-        SWIG_RegisterMapping("_class_wxGLContext","_wxGLContext",0);
-        SWIG_RegisterMapping("_class_wxNotebook","_wxNotebook",0);
-        SWIG_RegisterMapping("_wxJPEGHandler","_class_wxJPEGHandler",0);
-        SWIG_RegisterMapping("_wxWindowID","_GLuint",0);
-        SWIG_RegisterMapping("_wxWindowID","_GLsizei",0);
-        SWIG_RegisterMapping("_wxWindowID","_GLint",0);
-        SWIG_RegisterMapping("_wxWindowID","_GLbitfield",0);
-        SWIG_RegisterMapping("_wxWindowID","_GLenum",0);
-        SWIG_RegisterMapping("_wxWindowID","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_wxWindowID","_size_t",0);
-        SWIG_RegisterMapping("_wxWindowID","_EBool",0);
-        SWIG_RegisterMapping("_wxWindowID","_uint",0);
-        SWIG_RegisterMapping("_wxWindowID","_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_signed_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_GLuint",0);
-        SWIG_RegisterMapping("_int","_GLsizei",0);
-        SWIG_RegisterMapping("_int","_GLint",0);
-        SWIG_RegisterMapping("_int","_GLbitfield",0);
-        SWIG_RegisterMapping("_int","_GLenum",0);
-        SWIG_RegisterMapping("_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_int","_size_t",0);
-        SWIG_RegisterMapping("_int","_EBool",0);
-        SWIG_RegisterMapping("_int","_uint",0);
-        SWIG_RegisterMapping("_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_int","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_signed_int",0);
-        SWIG_RegisterMapping("_class_wxMouseEvent","_wxMouseEvent",0);
-        SWIG_RegisterMapping("_class_wxListEvent","_wxListEvent",0);
-        SWIG_RegisterMapping("_class_wxPrintPreview","_wxPrintPreview",0);
-        SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0);
-        SWIG_RegisterMapping("_wxButton","_class_wxButton",0);
-        SWIG_RegisterMapping("_class_wxPyApp","_wxPyApp",0);
-        SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
-        SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
-        SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
-        SWIG_RegisterMapping("_class_wxMDIParentFrame","_wxMDIParentFrame",0);
-        SWIG_RegisterMapping("_wxPyTreeItemData","_class_wxPyTreeItemData",0);
-        SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
-        SWIG_RegisterMapping("_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0);
-        SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0);
-        SWIG_RegisterMapping("_class_wxComboBox","_wxComboBox",0);
-        SWIG_RegisterMapping("_class_wxRadioButton","_wxRadioButton",0);
-        SWIG_RegisterMapping("_class_wxTreeItemId","_wxTreeItemId",0);
-        SWIG_RegisterMapping("_wxTreeCtrl","_class_wxTreeCtrl",0);
-        SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_wxIconizeEvent","_class_wxIconizeEvent",0);
-        SWIG_RegisterMapping("_class_wxControl","_wxControl",0);
-        SWIG_RegisterMapping("_wxStaticBitmap","_class_wxStaticBitmap",0);
-        SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
-        SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
-        SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
-        SWIG_RegisterMapping("_class_wxPageSetupDialog","_wxPageSetupDialog",0);
-        SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
-        SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0);
-        SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
-        SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
-        SWIG_RegisterMapping("_class_wxMiniFrame","_wxMiniFrame",0);
-        SWIG_RegisterMapping("_wxFontDialog","_class_wxFontDialog",0);
-        SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
-        SWIG_RegisterMapping("_class_wxSplitterWindow","_wxSplitterWindow",0);
-        SWIG_RegisterMapping("_wxPreviewFrame","_class_wxPreviewFrame",0);
-        SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
-        SWIG_RegisterMapping("_GLint","_GLuint",0);
-        SWIG_RegisterMapping("_GLint","_GLsizei",0);
-        SWIG_RegisterMapping("_GLint","_int",0);
-        SWIG_RegisterMapping("_GLint","_signed_int",0);
-        SWIG_RegisterMapping("_GLint","_unsigned_int",0);
-        SWIG_RegisterMapping("_GLint","_wxWindowID",0);
-        SWIG_RegisterMapping("_GLint","_uint",0);
-        SWIG_RegisterMapping("_GLint","_EBool",0);
-        SWIG_RegisterMapping("_GLint","_size_t",0);
-        SWIG_RegisterMapping("_GLint","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_GLint","_GLenum",0);
-        SWIG_RegisterMapping("_GLint","_GLbitfield",0);
-        SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
-        SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0);
-        SWIG_RegisterMapping("_class_wxCheckListBox","_wxCheckListBox",0);
-        SWIG_RegisterMapping("_class_wxGridEvent","_wxGridEvent",0);
-        SWIG_RegisterMapping("_class_wxCommandEvent","_wxCommandEvent",0);
-        SWIG_RegisterMapping("_GLubyte","_unsigned_char",0);
-        SWIG_RegisterMapping("_GLubyte","_byte",0);
-        SWIG_RegisterMapping("_GLubyte","_GLboolean",0);
-        SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
-        SWIG_RegisterMapping("_class_wxSizeEvent","_wxSizeEvent",0);
-        SWIG_RegisterMapping("_class_wxListCtrl","_wxListCtrl",0);
-        SWIG_RegisterMapping("_class_wxGLCanvas","_wxGLCanvas",0);
-        SWIG_RegisterMapping("_class_wxGridCell","_wxGridCell",0);
-        SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
-        SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0);
-        SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0);
-        SWIG_RegisterMapping("_wxMenuBar","_class_wxMenuBar",0);
-        SWIG_RegisterMapping("_wxTreeEvent","_class_wxTreeEvent",0);
-        SWIG_RegisterMapping("_wxDirDialog","_class_wxDirDialog",0);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxGLCanvas",SwigwxGLCanvasTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxGLCanvas",SwigwxGLCanvasTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxEvtHandler",0);
-        SWIG_RegisterMapping("_wxMenuItem","_class_wxMenuItem",0);
-        SWIG_RegisterMapping("_class_wxScrollBar","_wxScrollBar",0);
-        SWIG_RegisterMapping("_class_wxColourDialog","_wxColourDialog",0);
-        SWIG_RegisterMapping("_class_wxPrintData","_wxPrintData",0);
-        SWIG_RegisterMapping("_wxDash","_unsigned_long",0);
-        SWIG_RegisterMapping("_wxDash","_long",0);
-        SWIG_RegisterMapping("_class_wxScrolledWindow","_class_wxGLCanvas",SwigwxGLCanvasTowxScrolledWindow);
-        SWIG_RegisterMapping("_class_wxScrolledWindow","_wxGLCanvas",SwigwxGLCanvasTowxScrolledWindow);
-        SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
-        SWIG_RegisterMapping("_class_wxTextEntryDialog","_wxTextEntryDialog",0);
-        SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0);
-        SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0);
-        SWIG_RegisterMapping("_wxColourData","_class_wxColourData",0);
-        SWIG_RegisterMapping("_wxPageSetupDialogData","_class_wxPageSetupDialogData",0);
-        SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
-        SWIG_RegisterMapping("_class_wxQueryLayoutInfoEvent","_wxQueryLayoutInfoEvent",0);
-        SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0);
-        SWIG_RegisterMapping("_wxMDIClientWindow","_class_wxMDIClientWindow",0);
-        SWIG_RegisterMapping("_class_wxFontDialog","_wxFontDialog",0);
-        SWIG_RegisterMapping("_wxWindow","_class_wxGLCanvas",SwigwxGLCanvasTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxGLCanvas",SwigwxGLCanvasTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxWindow",0);
-        SWIG_RegisterMapping("_class_wxFrame","_wxFrame",0);
+{
+   int i;
+   for (i = 0; _swig_mapping[i].n1; i++)
+        SWIG_RegisterMapping(_swig_mapping[i].n1,_swig_mapping[i].n2,_swig_mapping[i].pcnv);
+}

 }
 }

diff --git a/utils/wxPython/src/msw/glcanvas.py b/utils/wxPython/src/msw/glcanvas.py
index cc895557f90bb2286817ca0b51fb7c045a1669d9..3486f97bf6048ba2f708e816d32cfa4062368afd 100644 (file)
--- a/utils/wxPython/src/msw/glcanvas.py
+++ b/utils/wxPython/src/msw/glcanvas.py
@@ -35,31 +35,27 @@ class wxGLContextPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self, glcanvasc=glcanvasc):
+    def __del__(self,glcanvasc=glcanvasc):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            glcanvasc.delete_wxGLContext(self.this)
-    def SetCurrent(self):
-        val = glcanvasc.wxGLContext_SetCurrent(self.this)
+            glcanvasc.delete_wxGLContext(self)
+    def SetCurrent(self, *_args, **_kwargs):
+        val = apply(glcanvasc.wxGLContext_SetCurrent,(self,) + _args, _kwargs)

         return val
         return val

-    def SetColour(self,arg0):
-        val = glcanvasc.wxGLContext_SetColour(self.this,arg0)
+    def SetColour(self, *_args, **_kwargs):
+        val = apply(glcanvasc.wxGLContext_SetColour,(self,) + _args, _kwargs)

         return val
         return val

-    def SwapBuffers(self):
-        val = glcanvasc.wxGLContext_SwapBuffers(self.this)
+    def SwapBuffers(self, *_args, **_kwargs):
+        val = apply(glcanvasc.wxGLContext_SwapBuffers,(self,) + _args, _kwargs)

         return val
         return val

-    def GetWindow(self):
-        val = glcanvasc.wxGLContext_GetWindow(self.this)
-        val = wxWindowPtr(val)
+    def GetWindow(self, *_args, **_kwargs):
+        val = apply(glcanvasc.wxGLContext_GetWindow,(self,) + _args, _kwargs)
+        if val: val = wxWindowPtr(val) 

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxGLContext instance>"
+        return "<C wxGLContext instance at %s>" % (self.this,)

 class wxGLContext(wxGLContextPtr):
 class wxGLContext(wxGLContextPtr):

-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(glcanvasc.new_wxGLContext,(arg0,arg1.this,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(glcanvasc.new_wxGLContext,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -69,32 +65,24 @@ class wxGLCanvasPtr(wxScrolledWindowPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def SetCurrent(self):
-        val = glcanvasc.wxGLCanvas_SetCurrent(self.this)
+    def SetCurrent(self, *_args, **_kwargs):
+        val = apply(glcanvasc.wxGLCanvas_SetCurrent,(self,) + _args, _kwargs)

         return val
         return val

-    def SetColour(self,arg0):
-        val = glcanvasc.wxGLCanvas_SetColour(self.this,arg0)
+    def SetColour(self, *_args, **_kwargs):
+        val = apply(glcanvasc.wxGLCanvas_SetColour,(self,) + _args, _kwargs)

         return val
         return val

-    def SwapBuffers(self):
-        val = glcanvasc.wxGLCanvas_SwapBuffers(self.this)
+    def SwapBuffers(self, *_args, **_kwargs):
+        val = apply(glcanvasc.wxGLCanvas_SwapBuffers,(self,) + _args, _kwargs)

         return val
         return val

-    def GetContext(self):
-        val = glcanvasc.wxGLCanvas_GetContext(self.this)
-        val = wxGLContextPtr(val)
+    def GetContext(self, *_args, **_kwargs):
+        val = apply(glcanvasc.wxGLCanvas_GetContext,(self,) + _args, _kwargs)
+        if val: val = wxGLContextPtr(val) 

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxGLCanvas instance>"
+        return "<C wxGLCanvas instance at %s>" % (self.this,)

 class wxGLCanvas(wxGLCanvasPtr):
 class wxGLCanvas(wxGLCanvasPtr):

-    def __init__(self,arg0,*args) :
-        argl = map(None,args)
-        try: argl[1] = argl[1].this
-        except: pass
-        try: argl[2] = argl[2].this
-        except: pass
-        try: argl[6] = argl[6].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(glcanvasc.new_wxGLCanvas,(arg0.this,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(glcanvasc.new_wxGLCanvas,_args,_kwargs)

         self.thisown = 1
         wx._StdWindowCallbacks(self)
 
         self.thisown = 1
         wx._StdWindowCallbacks(self)
 

diff --git a/utils/wxPython/src/msw/image.cpp b/utils/wxPython/src/msw/image.cpp
index 1a44b5ee883441cbc642ab1df40f34d9701cbff8..cf5d867ca03310ea6e8d0206a3b1f8e4b66566bb 100644 (file)
--- a/utils/wxPython/src/msw/image.cpp
+++ b/utils/wxPython/src/msw/image.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)

- * Version 1.1 (Patch 5)
+ * Version 1.1 (Patch 6)

  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.


@@ -24,16 +24,16 @@
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)

-#      define SWIGEXPORT(a,b) __declspec(dllexport) a b
+#      define SWIGEXPORT(a) __declspec(dllexport) a

 #   else
 #      if defined(__BORLANDC__)
 #   else
 #      if defined(__BORLANDC__)

-#          define SWIGEXPORT(a,b) a _export b
+#          define SWIGEXPORT(a) a _export 

 #      else
 #      else

-#          define SWIGEXPORT(a,b) a b
+#          define SWIGEXPORT(a) a 

 #      endif
 #   endif
 #else
 #      endif
 #   endif
 #else

-#   define SWIGEXPORT(a,b) a b
+#   define SWIGEXPORT(a) a 

 #endif
 
 #ifdef __cplusplus
 #endif
 
 #ifdef __cplusplus


@@ -43,12 +43,12 @@ extern "C" {
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);

+extern char *SWIG_GetPtrObj(PyObject *, void **, char *);

 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif
 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif

-

 #define SWIG_init    initimagec
 
 #define SWIG_name    "imagec"
 #define SWIG_init    initimagec
 
 #define SWIG_name    "imagec"


@@ -58,12 +58,13 @@ extern PyObject *SWIG_newvarlink(void);
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;

-    if (!target) {
+    PyObject*   o3;
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);
         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);


@@ -80,23 +81,23 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
     PyObject*   o3;
 
     PyObject*   o2;
     PyObject*   o3;
 

-    if (!target) {
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }
         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }

-        o3 = PyTuple_New(1);
-        PyTuple_SetItem(o3, 0, o);
+        o3 = PyTuple_New(1);            
+        PyTuple_SetItem(o3, 0, o);      

 
         o2 = target;
 
         o2 = target;

-        target = PySequence_Concat(o2, o3);
-        Py_DECREF(o2);
+        target = PySequence_Concat(o2, o3); 
+        Py_DECREF(o2);                      

         Py_DECREF(o3);
     }
     return target;
         Py_DECREF(o3);
     }
     return target;


@@ -134,6 +135,9 @@ static char* wxStringErrorMsg = "string type is required for parameter";
     void wxImage_AddHandler(wxImageHandler *handler) {
         wxImage::AddHandler(handler);
     }
     void wxImage_AddHandler(wxImageHandler *handler) {
         wxImage::AddHandler(handler);
     }

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

 static PyObject *_wrap_wxNullImage(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxImage * _result;
 static PyObject *_wrap_wxNullImage(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxImage * _result;


@@ -147,8 +151,13 @@ static PyObject *_wrap_wxNullImage(PyObject *self, PyObject *args) {
         _result = (wxImage *)wxNullImage();
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxImage *)wxNullImage();
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxImage_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxImage_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -167,8 +176,13 @@ static PyObject *_wrap_wxEmptyImage(PyObject *self, PyObject *args) {
         _result = (wxImage *)wxEmptyImage(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxImage *)wxEmptyImage(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxImage_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxImage_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -203,8 +217,13 @@ static PyObject *_wrap_wxImageFromMime(PyObject *self, PyObject *args) {
         _result = (wxImage *)wxImageFromMime(*_arg0,*_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxImage *)wxImageFromMime(*_arg0,*_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxImage_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxImage_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     if (_obj0)
         delete _arg0;
 {
     if (_obj0)
         delete _arg0;


@@ -220,14 +239,15 @@ static PyObject *_wrap_wxImageFromBitmap(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxImage * _result;
     wxBitmap * _arg0;
     PyObject * _resultobj;
     wxImage * _result;
     wxBitmap * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxImageFromBitmap",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxImageFromBitmap",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageFromBitmap. Expected _wxBitmap_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageFromBitmap. Expected _wxBitmap_p.");
         return NULL;
         }


@@ -237,21 +257,27 @@ static PyObject *_wrap_wxImageFromBitmap(PyObject *self, PyObject *args) {
         _result = (wxImage *)wxImageFromBitmap(*_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxImage *)wxImageFromBitmap(*_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxImage_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxImage_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
 static PyObject *_wrap_wxImage_AddHandler(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxImageHandler * _arg0;
     return _resultobj;
 }
 
 static PyObject *_wrap_wxImage_AddHandler(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxImageHandler * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxImage_AddHandler",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxImage_AddHandler",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageHandler_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImageHandler_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_AddHandler. Expected _wxImageHandler_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_AddHandler. Expected _wxImageHandler_p.");
         return NULL;
         }


@@ -280,8 +306,13 @@ static PyObject *_wrap_new_wxImageHandler(PyObject *self, PyObject *args) {
         _result = (wxImageHandler *)new_wxImageHandler();
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxImageHandler *)new_wxImageHandler();
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxImageHandler_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxImageHandler_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -290,13 +321,14 @@ static PyObject *_wrap_wxImageHandler_GetName(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxImageHandler * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxImageHandler * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxImageHandler_GetName",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxImageHandler_GetName",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageHandler_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImageHandler_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageHandler_GetName. Expected _wxImageHandler_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageHandler_GetName. Expected _wxImageHandler_p.");
         return NULL;
         }


@@ -320,13 +352,14 @@ static PyObject *_wrap_wxImageHandler_GetExtension(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     wxString * _result;
     wxImageHandler * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxImageHandler * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxImageHandler_GetExtension",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxImageHandler_GetExtension",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageHandler_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImageHandler_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageHandler_GetExtension. Expected _wxImageHandler_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageHandler_GetExtension. Expected _wxImageHandler_p.");
         return NULL;
         }


@@ -350,13 +383,14 @@ static PyObject *_wrap_wxImageHandler_GetType(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxImageHandler * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxImageHandler * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxImageHandler_GetType",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxImageHandler_GetType",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageHandler_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImageHandler_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageHandler_GetType. Expected _wxImageHandler_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageHandler_GetType. Expected _wxImageHandler_p.");
         return NULL;
         }


@@ -375,13 +409,14 @@ static PyObject *_wrap_wxImageHandler_GetMimeType(PyObject *self, PyObject *args
     PyObject * _resultobj;
     wxString * _result;
     wxImageHandler * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxImageHandler * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxImageHandler_GetMimeType",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxImageHandler_GetMimeType",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageHandler_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImageHandler_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageHandler_GetMimeType. Expected _wxImageHandler_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageHandler_GetMimeType. Expected _wxImageHandler_p.");
         return NULL;
         }


@@ -405,14 +440,15 @@ static PyObject *_wrap_wxImageHandler_SetName(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxImageHandler * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxImageHandler * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxImageHandler_SetName",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxImageHandler_SetName",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageHandler_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImageHandler_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageHandler_SetName. Expected _wxImageHandler_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageHandler_SetName. Expected _wxImageHandler_p.");
         return NULL;
         }


@@ -443,14 +479,15 @@ static PyObject *_wrap_wxImageHandler_SetExtension(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     wxImageHandler * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxImageHandler * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxImageHandler_SetExtension",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxImageHandler_SetExtension",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageHandler_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImageHandler_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageHandler_SetExtension. Expected _wxImageHandler_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageHandler_SetExtension. Expected _wxImageHandler_p.");
         return NULL;
         }


@@ -481,13 +518,14 @@ static PyObject *_wrap_wxImageHandler_SetType(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxImageHandler * _arg0;
     long  _arg1;
     PyObject * _resultobj;
     wxImageHandler * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxImageHandler_SetType",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxImageHandler_SetType",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageHandler_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImageHandler_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageHandler_SetType. Expected _wxImageHandler_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageHandler_SetType. Expected _wxImageHandler_p.");
         return NULL;
         }


@@ -507,14 +545,15 @@ static PyObject *_wrap_wxImageHandler_SetMimeType(PyObject *self, PyObject *args
     PyObject * _resultobj;
     wxImageHandler * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxImageHandler * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxImageHandler_SetMimeType",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxImageHandler_SetMimeType",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageHandler_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImageHandler_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageHandler_SetMimeType. Expected _wxImageHandler_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageHandler_SetMimeType. Expected _wxImageHandler_p.");
         return NULL;
         }


@@ -562,8 +601,13 @@ static PyObject *_wrap_new_wxPNGHandler(PyObject *self, PyObject *args) {
         _result = (wxPNGHandler *)new_wxPNGHandler();
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxPNGHandler *)new_wxPNGHandler();
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPNGHandler_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPNGHandler_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -589,8 +633,13 @@ static PyObject *_wrap_new_wxJPEGHandler(PyObject *self, PyObject *args) {
         _result = (wxJPEGHandler *)new_wxJPEGHandler();
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxJPEGHandler *)new_wxJPEGHandler();
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxJPEGHandler_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxJPEGHandler_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -616,8 +665,13 @@ static PyObject *_wrap_new_wxBMPHandler(PyObject *self, PyObject *args) {
         _result = (wxBMPHandler *)new_wxBMPHandler();
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxBMPHandler *)new_wxBMPHandler();
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBMPHandler_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxBMPHandler_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -643,8 +697,13 @@ static PyObject *_wrap_new_wxGIFHandler(PyObject *self, PyObject *args) {
         _result = (wxGIFHandler *)new_wxGIFHandler();
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxGIFHandler *)new_wxGIFHandler();
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxGIFHandler_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxGIFHandler_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -653,7 +712,7 @@ static PyObject *_wrap_new_wxImage(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxImage * _result;
     wxString * _arg0;
     PyObject * _resultobj;
     wxImage * _result;
     wxString * _arg0;

-    long  _arg1 = (wxBITMAP_TYPE_PNG);
+    long  _arg1 = (long ) wxBITMAP_TYPE_PNG;

     PyObject * _obj0 = 0;
     char _ptemp[128];
 
     PyObject * _obj0 = 0;
     char _ptemp[128];
 


@@ -672,8 +731,13 @@ static PyObject *_wrap_new_wxImage(PyObject *self, PyObject *args) {
         _result = (wxImage *)new_wxImage(*_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxImage *)new_wxImage(*_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxImage_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxImage_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     if (_obj0)
         delete _arg0;
 {
     if (_obj0)
         delete _arg0;


@@ -685,13 +749,14 @@ static PyObject *_wrap_new_wxImage(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxImage(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxImage * _arg0;
 static PyObject *_wrap_delete_wxImage(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxImage * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:delete_wxImage",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxImage",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImage_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImage_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxImage. Expected _wxImage_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxImage. Expected _wxImage_p.");
         return NULL;
         }


@@ -711,14 +776,15 @@ static PyObject *_wrap_wxImage_ConvertToBitmap(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxBitmap * _result;
     wxImage * _arg0;
     PyObject * _resultobj;
     wxBitmap * _result;
     wxImage * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxImage_ConvertToBitmap",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxImage_ConvertToBitmap",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImage_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImage_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_ConvertToBitmap. Expected _wxImage_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_ConvertToBitmap. Expected _wxImage_p.");
         return NULL;
         }


@@ -739,13 +805,14 @@ static PyObject *_wrap_wxImage_Create(PyObject *self, PyObject *args) {
     wxImage * _arg0;
     int  _arg1;
     int  _arg2;
     wxImage * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxImage_Create",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxImage_Create",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImage_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImage_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_Create. Expected _wxImage_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_Create. Expected _wxImage_p.");
         return NULL;
         }


@@ -764,13 +831,14 @@ static PyObject *_wrap_wxImage_Create(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxImage_Destroy(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxImage * _arg0;
 static PyObject *_wrap_wxImage_Destroy(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxImage * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxImage_Destroy",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxImage_Destroy",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImage_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImage_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_Destroy. Expected _wxImage_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_Destroy. Expected _wxImage_p.");
         return NULL;
         }


@@ -792,14 +860,15 @@ static PyObject *_wrap_wxImage_Scale(PyObject *self, PyObject *args) {
     wxImage * _arg0;
     int  _arg1;
     int  _arg2;
     wxImage * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxImage_Scale",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxImage_Scale",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImage_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImage_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_Scale. Expected _wxImage_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_Scale. Expected _wxImage_p.");
         return NULL;
         }


@@ -820,13 +889,14 @@ static PyObject *_wrap_wxImage_Rescale(PyObject *self, PyObject *args) {
     wxImage * _arg0;
     int  _arg1;
     int  _arg2;
     wxImage * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxImage_Rescale",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxImage_Rescale",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImage_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImage_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_Rescale. Expected _wxImage_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_Rescale. Expected _wxImage_p.");
         return NULL;
         }


@@ -850,13 +920,14 @@ static PyObject *_wrap_wxImage_SetRGB(PyObject *self, PyObject *args) {
     unsigned char  _arg3;
     unsigned char  _arg4;
     unsigned char  _arg5;
     unsigned char  _arg3;
     unsigned char  _arg4;
     unsigned char  _arg5;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siibbb:wxImage_SetRGB",&_argc0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTuple(args,"Oiibbb:wxImage_SetRGB",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImage_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImage_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_SetRGB. Expected _wxImage_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_SetRGB. Expected _wxImage_p.");
         return NULL;
         }


@@ -878,13 +949,14 @@ static PyObject *_wrap_wxImage_GetRed(PyObject *self, PyObject *args) {
     wxImage * _arg0;
     int  _arg1;
     int  _arg2;
     wxImage * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxImage_GetRed",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxImage_GetRed",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImage_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImage_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_GetRed. Expected _wxImage_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_GetRed. Expected _wxImage_p.");
         return NULL;
         }


@@ -905,13 +977,14 @@ static PyObject *_wrap_wxImage_GetGreen(PyObject *self, PyObject *args) {
     wxImage * _arg0;
     int  _arg1;
     int  _arg2;
     wxImage * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxImage_GetGreen",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxImage_GetGreen",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImage_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImage_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_GetGreen. Expected _wxImage_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_GetGreen. Expected _wxImage_p.");
         return NULL;
         }


@@ -932,13 +1005,14 @@ static PyObject *_wrap_wxImage_GetBlue(PyObject *self, PyObject *args) {
     wxImage * _arg0;
     int  _arg1;
     int  _arg2;
     wxImage * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxImage_GetBlue",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxImage_GetBlue",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImage_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImage_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_GetBlue. Expected _wxImage_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_GetBlue. Expected _wxImage_p.");
         return NULL;
         }


@@ -958,15 +1032,16 @@ static PyObject *_wrap_wxImage_LoadFile(PyObject *self, PyObject *args) {
     bool  _result;
     wxImage * _arg0;
     wxString * _arg1;
     bool  _result;
     wxImage * _arg0;
     wxString * _arg1;

-    long  _arg2 = (wxBITMAP_TYPE_PNG);
-    char * _argc0 = 0;
+    long  _arg2 = (long ) wxBITMAP_TYPE_PNG;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO|l:wxImage_LoadFile",&_argc0,&_obj1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"OO|l:wxImage_LoadFile",&_argo0,&_obj1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImage_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImage_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_LoadFile. Expected _wxImage_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_LoadFile. Expected _wxImage_p.");
         return NULL;
         }


@@ -998,15 +1073,16 @@ static PyObject *_wrap_wxImage_LoadMimeFile(PyObject *self, PyObject *args) {
     wxImage * _arg0;
     wxString * _arg1;
     wxString * _arg2;
     wxImage * _arg0;
     wxString * _arg1;
     wxString * _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sOO:wxImage_LoadMimeFile",&_argc0,&_obj1,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"OOO:wxImage_LoadMimeFile",&_argo0,&_obj1,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImage_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImage_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_LoadMimeFile. Expected _wxImage_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_LoadMimeFile. Expected _wxImage_p.");
         return NULL;
         }


@@ -1049,14 +1125,15 @@ static PyObject *_wrap_wxImage_SaveFile(PyObject *self, PyObject *args) {
     wxImage * _arg0;
     wxString * _arg1;
     int  _arg2;
     wxImage * _arg0;
     wxString * _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sOi:wxImage_SaveFile",&_argc0,&_obj1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"OOi:wxImage_SaveFile",&_argo0,&_obj1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImage_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImage_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_SaveFile. Expected _wxImage_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_SaveFile. Expected _wxImage_p.");
         return NULL;
         }


@@ -1088,15 +1165,16 @@ static PyObject *_wrap_wxImage_SaveMimeFile(PyObject *self, PyObject *args) {
     wxImage * _arg0;
     wxString * _arg1;
     wxString * _arg2;
     wxImage * _arg0;
     wxString * _arg1;
     wxString * _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sOO:wxImage_SaveMimeFile",&_argc0,&_obj1,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"OOO:wxImage_SaveMimeFile",&_argo0,&_obj1,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImage_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImage_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_SaveMimeFile. Expected _wxImage_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_SaveMimeFile. Expected _wxImage_p.");
         return NULL;
         }


@@ -1137,13 +1215,14 @@ static PyObject *_wrap_wxImage_Ok(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxImage * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxImage * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxImage_Ok",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxImage_Ok",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImage_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImage_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_Ok. Expected _wxImage_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_Ok. Expected _wxImage_p.");
         return NULL;
         }


@@ -1162,13 +1241,14 @@ static PyObject *_wrap_wxImage_GetWidth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxImage * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxImage * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxImage_GetWidth",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxImage_GetWidth",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImage_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImage_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_GetWidth. Expected _wxImage_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_GetWidth. Expected _wxImage_p.");
         return NULL;
         }


@@ -1187,13 +1267,14 @@ static PyObject *_wrap_wxImage_GetHeight(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxImage * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxImage * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxImage_GetHeight",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxImage_GetHeight",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImage_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImage_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_GetHeight. Expected _wxImage_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_GetHeight. Expected _wxImage_p.");
         return NULL;
         }


@@ -1216,13 +1297,14 @@ static PyObject *_wrap_wxImage_GetData(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     PyObject * _result;
     wxImage * _arg0;
     PyObject * _resultobj;
     PyObject * _result;
     wxImage * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxImage_GetData",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxImage_GetData",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImage_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImage_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_GetData. Expected _wxImage_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_GetData. Expected _wxImage_p.");
         return NULL;
         }


@@ -1252,14 +1334,15 @@ static PyObject *_wrap_wxImage_SetData(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxImage * _arg0;
     PyObject * _arg1;
     PyObject * _resultobj;
     wxImage * _arg0;
     PyObject * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxImage_SetData",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxImage_SetData",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImage_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImage_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_SetData. Expected _wxImage_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_SetData. Expected _wxImage_p.");
         return NULL;
         }


@@ -1284,13 +1367,14 @@ static PyObject *_wrap_wxImage_SetMaskColour(PyObject *self, PyObject *args) {
     unsigned char  _arg1;
     unsigned char  _arg2;
     unsigned char  _arg3;
     unsigned char  _arg1;
     unsigned char  _arg2;
     unsigned char  _arg3;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sbbb:wxImage_SetMaskColour",&_argc0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"Obbb:wxImage_SetMaskColour",&_argo0,&_arg1,&_arg2,&_arg3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImage_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImage_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_SetMaskColour. Expected _wxImage_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_SetMaskColour. Expected _wxImage_p.");
         return NULL;
         }


@@ -1310,13 +1394,14 @@ static PyObject *_wrap_wxImage_GetMaskRed(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     unsigned char  _result;
     wxImage * _arg0;
     PyObject * _resultobj;
     unsigned char  _result;
     wxImage * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxImage_GetMaskRed",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxImage_GetMaskRed",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImage_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImage_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_GetMaskRed. Expected _wxImage_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_GetMaskRed. Expected _wxImage_p.");
         return NULL;
         }


@@ -1335,13 +1420,14 @@ static PyObject *_wrap_wxImage_GetMaskGreen(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     unsigned char  _result;
     wxImage * _arg0;
     PyObject * _resultobj;
     unsigned char  _result;
     wxImage * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxImage_GetMaskGreen",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxImage_GetMaskGreen",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImage_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImage_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_GetMaskGreen. Expected _wxImage_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_GetMaskGreen. Expected _wxImage_p.");
         return NULL;
         }


@@ -1360,13 +1446,14 @@ static PyObject *_wrap_wxImage_GetMaskBlue(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     unsigned char  _result;
     wxImage * _arg0;
     PyObject * _resultobj;
     unsigned char  _result;
     wxImage * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxImage_GetMaskBlue",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxImage_GetMaskBlue",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImage_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImage_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_GetMaskBlue. Expected _wxImage_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_GetMaskBlue. Expected _wxImage_p.");
         return NULL;
         }


@@ -1384,15 +1471,16 @@ static PyObject *_wrap_wxImage_GetMaskBlue(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxImage_SetMask(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxImage * _arg0;
 static PyObject *_wrap_wxImage_SetMask(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxImage * _arg0;

-    bool  _arg1 = (1);
-    char * _argc0 = 0;
-    int tempbool1;
+    bool  _arg1 = (bool ) TRUE;
+    PyObject * _argo0 = 0;
+    int tempbool1 = (int) TRUE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxImage_SetMask",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"O|i:wxImage_SetMask",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImage_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImage_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_SetMask. Expected _wxImage_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_SetMask. Expected _wxImage_p.");
         return NULL;
         }


@@ -1413,13 +1501,14 @@ static PyObject *_wrap_wxImage_HasMask(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxImage * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxImage * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxImage_HasMask",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxImage_HasMask",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImage_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImage_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_HasMask. Expected _wxImage_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_HasMask. Expected _wxImage_p.");
         return NULL;
         }


@@ -1434,213 +1523,223 @@ static PyObject *_wrap_wxImage_HasMask(PyObject *self, PyObject *args) {
 }
 
 static PyMethodDef imagecMethods[] = {
 }
 
 static PyMethodDef imagecMethods[] = {

-        { "wxImage_HasMask", _wrap_wxImage_HasMask, 1 },
-        { "wxImage_SetMask", _wrap_wxImage_SetMask, 1 },
-        { "wxImage_GetMaskBlue", _wrap_wxImage_GetMaskBlue, 1 },
-        { "wxImage_GetMaskGreen", _wrap_wxImage_GetMaskGreen, 1 },
-        { "wxImage_GetMaskRed", _wrap_wxImage_GetMaskRed, 1 },
-        { "wxImage_SetMaskColour", _wrap_wxImage_SetMaskColour, 1 },
-        { "wxImage_SetData", _wrap_wxImage_SetData, 1 },
-        { "wxImage_GetData", _wrap_wxImage_GetData, 1 },
-        { "wxImage_GetHeight", _wrap_wxImage_GetHeight, 1 },
-        { "wxImage_GetWidth", _wrap_wxImage_GetWidth, 1 },
-        { "wxImage_Ok", _wrap_wxImage_Ok, 1 },
-        { "wxImage_SaveMimeFile", _wrap_wxImage_SaveMimeFile, 1 },
-        { "wxImage_SaveFile", _wrap_wxImage_SaveFile, 1 },
-        { "wxImage_LoadMimeFile", _wrap_wxImage_LoadMimeFile, 1 },
-        { "wxImage_LoadFile", _wrap_wxImage_LoadFile, 1 },
-        { "wxImage_GetBlue", _wrap_wxImage_GetBlue, 1 },
-        { "wxImage_GetGreen", _wrap_wxImage_GetGreen, 1 },
-        { "wxImage_GetRed", _wrap_wxImage_GetRed, 1 },
-        { "wxImage_SetRGB", _wrap_wxImage_SetRGB, 1 },
-        { "wxImage_Rescale", _wrap_wxImage_Rescale, 1 },
-        { "wxImage_Scale", _wrap_wxImage_Scale, 1 },
-        { "wxImage_Destroy", _wrap_wxImage_Destroy, 1 },
-        { "wxImage_Create", _wrap_wxImage_Create, 1 },
-        { "wxImage_ConvertToBitmap", _wrap_wxImage_ConvertToBitmap, 1 },
-        { "delete_wxImage", _wrap_delete_wxImage, 1 },
-        { "new_wxImage", _wrap_new_wxImage, 1 },
-        { "new_wxGIFHandler", _wrap_new_wxGIFHandler, 1 },
-        { "new_wxBMPHandler", _wrap_new_wxBMPHandler, 1 },
-        { "new_wxJPEGHandler", _wrap_new_wxJPEGHandler, 1 },
-        { "new_wxPNGHandler", _wrap_new_wxPNGHandler, 1 },
-        { "wxImageHandler_SetMimeType", _wrap_wxImageHandler_SetMimeType, 1 },
-        { "wxImageHandler_SetType", _wrap_wxImageHandler_SetType, 1 },
-        { "wxImageHandler_SetExtension", _wrap_wxImageHandler_SetExtension, 1 },
-        { "wxImageHandler_SetName", _wrap_wxImageHandler_SetName, 1 },
-        { "wxImageHandler_GetMimeType", _wrap_wxImageHandler_GetMimeType, 1 },
-        { "wxImageHandler_GetType", _wrap_wxImageHandler_GetType, 1 },
-        { "wxImageHandler_GetExtension", _wrap_wxImageHandler_GetExtension, 1 },
-        { "wxImageHandler_GetName", _wrap_wxImageHandler_GetName, 1 },
-        { "new_wxImageHandler", _wrap_new_wxImageHandler, 1 },
-        { "wxImage_AddHandler", _wrap_wxImage_AddHandler, 1 },
-        { "wxImageFromBitmap", _wrap_wxImageFromBitmap, 1 },
-        { "wxImageFromMime", _wrap_wxImageFromMime, 1 },
-        { "wxEmptyImage", _wrap_wxEmptyImage, 1 },
-        { "wxNullImage", _wrap_wxNullImage, 1 },
+        { "wxImage_HasMask", _wrap_wxImage_HasMask, METH_VARARGS },
+        { "wxImage_SetMask", _wrap_wxImage_SetMask, METH_VARARGS },
+        { "wxImage_GetMaskBlue", _wrap_wxImage_GetMaskBlue, METH_VARARGS },
+        { "wxImage_GetMaskGreen", _wrap_wxImage_GetMaskGreen, METH_VARARGS },
+        { "wxImage_GetMaskRed", _wrap_wxImage_GetMaskRed, METH_VARARGS },
+        { "wxImage_SetMaskColour", _wrap_wxImage_SetMaskColour, METH_VARARGS },
+        { "wxImage_SetData", _wrap_wxImage_SetData, METH_VARARGS },
+        { "wxImage_GetData", _wrap_wxImage_GetData, METH_VARARGS },
+        { "wxImage_GetHeight", _wrap_wxImage_GetHeight, METH_VARARGS },
+        { "wxImage_GetWidth", _wrap_wxImage_GetWidth, METH_VARARGS },
+        { "wxImage_Ok", _wrap_wxImage_Ok, METH_VARARGS },
+        { "wxImage_SaveMimeFile", _wrap_wxImage_SaveMimeFile, METH_VARARGS },
+        { "wxImage_SaveFile", _wrap_wxImage_SaveFile, METH_VARARGS },
+        { "wxImage_LoadMimeFile", _wrap_wxImage_LoadMimeFile, METH_VARARGS },
+        { "wxImage_LoadFile", _wrap_wxImage_LoadFile, METH_VARARGS },
+        { "wxImage_GetBlue", _wrap_wxImage_GetBlue, METH_VARARGS },
+        { "wxImage_GetGreen", _wrap_wxImage_GetGreen, METH_VARARGS },
+        { "wxImage_GetRed", _wrap_wxImage_GetRed, METH_VARARGS },
+        { "wxImage_SetRGB", _wrap_wxImage_SetRGB, METH_VARARGS },
+        { "wxImage_Rescale", _wrap_wxImage_Rescale, METH_VARARGS },
+        { "wxImage_Scale", _wrap_wxImage_Scale, METH_VARARGS },
+        { "wxImage_Destroy", _wrap_wxImage_Destroy, METH_VARARGS },
+        { "wxImage_Create", _wrap_wxImage_Create, METH_VARARGS },
+        { "wxImage_ConvertToBitmap", _wrap_wxImage_ConvertToBitmap, METH_VARARGS },
+        { "delete_wxImage", _wrap_delete_wxImage, METH_VARARGS },
+        { "new_wxImage", _wrap_new_wxImage, METH_VARARGS },
+        { "new_wxGIFHandler", _wrap_new_wxGIFHandler, METH_VARARGS },
+        { "new_wxBMPHandler", _wrap_new_wxBMPHandler, METH_VARARGS },
+        { "new_wxJPEGHandler", _wrap_new_wxJPEGHandler, METH_VARARGS },
+        { "new_wxPNGHandler", _wrap_new_wxPNGHandler, METH_VARARGS },
+        { "wxImageHandler_SetMimeType", _wrap_wxImageHandler_SetMimeType, METH_VARARGS },
+        { "wxImageHandler_SetType", _wrap_wxImageHandler_SetType, METH_VARARGS },
+        { "wxImageHandler_SetExtension", _wrap_wxImageHandler_SetExtension, METH_VARARGS },
+        { "wxImageHandler_SetName", _wrap_wxImageHandler_SetName, METH_VARARGS },
+        { "wxImageHandler_GetMimeType", _wrap_wxImageHandler_GetMimeType, METH_VARARGS },
+        { "wxImageHandler_GetType", _wrap_wxImageHandler_GetType, METH_VARARGS },
+        { "wxImageHandler_GetExtension", _wrap_wxImageHandler_GetExtension, METH_VARARGS },
+        { "wxImageHandler_GetName", _wrap_wxImageHandler_GetName, METH_VARARGS },
+        { "new_wxImageHandler", _wrap_new_wxImageHandler, METH_VARARGS },
+        { "wxImage_AddHandler", _wrap_wxImage_AddHandler, METH_VARARGS },
+        { "wxImageFromBitmap", _wrap_wxImageFromBitmap, METH_VARARGS },
+        { "wxImageFromMime", _wrap_wxImageFromMime, METH_VARARGS },
+        { "wxEmptyImage", _wrap_wxEmptyImage, METH_VARARGS },
+        { "wxNullImage", _wrap_wxNullImage, METH_VARARGS },

         { NULL, NULL }
 };
         { NULL, NULL }
 };

+#ifdef __cplusplus
+}
+#endif
+/*
+ * This table is used by the pointer type-checker
+ */
+static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
+    { "_wxAcceleratorTable","_class_wxAcceleratorTable",0},
+    { "_signed_long","_long",0},
+    { "_class_wxJPEGHandler","_wxJPEGHandler",0},
+    { "_wxBMPHandler","_class_wxBMPHandler",0},
+    { "_wxImage","_class_wxImage",0},
+    { "_wxPrintQuality","_int",0},
+    { "_wxPrintQuality","_signed_int",0},
+    { "_wxPrintQuality","_unsigned_int",0},
+    { "_wxPrintQuality","_wxWindowID",0},
+    { "_wxPrintQuality","_uint",0},
+    { "_wxPrintQuality","_EBool",0},
+    { "_wxPrintQuality","_size_t",0},
+    { "_class_wxRegionIterator","_wxRegionIterator",0},
+    { "_wxGIFHandler","_class_wxGIFHandler",0},
+    { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
+    { "_wxCursor","_class_wxCursor",0},
+    { "_wxImageHandler","_class_wxGIFHandler",SwigwxGIFHandlerTowxImageHandler},
+    { "_wxImageHandler","_wxGIFHandler",SwigwxGIFHandlerTowxImageHandler},
+    { "_wxImageHandler","_class_wxBMPHandler",SwigwxBMPHandlerTowxImageHandler},
+    { "_wxImageHandler","_wxBMPHandler",SwigwxBMPHandlerTowxImageHandler},
+    { "_wxImageHandler","_class_wxJPEGHandler",SwigwxJPEGHandlerTowxImageHandler},
+    { "_wxImageHandler","_wxJPEGHandler",SwigwxJPEGHandlerTowxImageHandler},
+    { "_wxImageHandler","_class_wxPNGHandler",SwigwxPNGHandlerTowxImageHandler},
+    { "_wxImageHandler","_wxPNGHandler",SwigwxPNGHandlerTowxImageHandler},
+    { "_wxImageHandler","_class_wxImageHandler",0},
+    { "_wxMask","_class_wxMask",0},
+    { "_wxPNGHandler","_class_wxPNGHandler",0},
+    { "_wxPen","_class_wxPen",0},
+    { "_byte","_unsigned_char",0},
+    { "_long","_wxDash",0},
+    { "_long","_unsigned_long",0},
+    { "_long","_signed_long",0},
+    { "_wxImageList","_class_wxImageList",0},
+    { "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
+    { "_wxDC","_class_wxDC",0},
+    { "_class_wxBMPHandler","_wxBMPHandler",0},
+    { "_size_t","_wxPrintQuality",0},
+    { "_size_t","_unsigned_int",0},
+    { "_size_t","_int",0},
+    { "_size_t","_wxWindowID",0},
+    { "_size_t","_uint",0},
+    { "_class_wxRealPoint","_wxRealPoint",0},
+    { "_wxPrinterDC","_class_wxPrinterDC",0},
+    { "_class_wxGIFHandler","_wxGIFHandler",0},
+    { "_class_wxMask","_wxMask",0},
+    { "_class_wxPNGHandler","_wxPNGHandler",0},
+    { "_wxColour","_class_wxColour",0},
+    { "_wxBrush","_class_wxBrush",0},
+    { "_uint","_wxPrintQuality",0},
+    { "_uint","_size_t",0},
+    { "_uint","_unsigned_int",0},
+    { "_uint","_int",0},
+    { "_uint","_wxWindowID",0},
+    { "_wxRect","_class_wxRect",0},
+    { "_class_wxImage","_wxImage",0},
+    { "_wxPoint","_class_wxPoint",0},
+    { "_wxBitmap","_class_wxBitmap",0},
+    { "_wxPyTimer","_class_wxPyTimer",0},
+    { "_wxWindowDC","_class_wxWindowDC",0},
+    { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
+    { "_EBool","_wxPrintQuality",0},
+    { "_EBool","_signed_int",0},
+    { "_EBool","_int",0},
+    { "_EBool","_wxWindowID",0},
+    { "_class_wxRegion","_wxRegion",0},
+    { "_wxFont","_class_wxFont",0},
+    { "_unsigned_long","_wxDash",0},
+    { "_unsigned_long","_long",0},
+    { "_class_wxRect","_wxRect",0},
+    { "_class_wxDC","_wxDC",0},
+    { "_class_wxPyTimer","_wxPyTimer",0},
+    { "_wxAcceleratorEntry","_class_wxAcceleratorEntry",0},
+    { "_signed_int","_wxPrintQuality",0},
+    { "_signed_int","_EBool",0},
+    { "_signed_int","_wxWindowID",0},
+    { "_signed_int","_int",0},
+    { "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
+    { "_wxMetaFileDC","_class_wxMetaFileDC",0},
+    { "_wxScreenDC","_class_wxScreenDC",0},
+    { "_WXTYPE","_short",0},
+    { "_WXTYPE","_signed_short",0},
+    { "_WXTYPE","_unsigned_short",0},
+    { "_class_wxBrush","_wxBrush",0},
+    { "_unsigned_short","_WXTYPE",0},
+    { "_unsigned_short","_short",0},
+    { "_class_wxFont","_wxFont",0},
+    { "_wxClientDC","_class_wxClientDC",0},
+    { "_class_wxPoint","_wxPoint",0},
+    { "_wxRealPoint","_class_wxRealPoint",0},
+    { "_signed_short","_WXTYPE",0},
+    { "_signed_short","_short",0},
+    { "_wxMemoryDC","_class_wxMemoryDC",0},
+    { "_wxPaintDC","_class_wxPaintDC",0},
+    { "_class_wxWindowDC","_wxWindowDC",0},
+    { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
+    { "_class_wxCursor","_wxCursor",0},
+    { "_class_wxImageHandler","_class_wxGIFHandler",SwigwxGIFHandlerTowxImageHandler},
+    { "_class_wxImageHandler","_wxGIFHandler",SwigwxGIFHandlerTowxImageHandler},
+    { "_class_wxImageHandler","_class_wxBMPHandler",SwigwxBMPHandlerTowxImageHandler},
+    { "_class_wxImageHandler","_wxBMPHandler",SwigwxBMPHandlerTowxImageHandler},
+    { "_class_wxImageHandler","_class_wxJPEGHandler",SwigwxJPEGHandlerTowxImageHandler},
+    { "_class_wxImageHandler","_wxJPEGHandler",SwigwxJPEGHandlerTowxImageHandler},
+    { "_class_wxImageHandler","_class_wxPNGHandler",SwigwxPNGHandlerTowxImageHandler},
+    { "_class_wxImageHandler","_wxPNGHandler",SwigwxPNGHandlerTowxImageHandler},
+    { "_class_wxImageHandler","_wxImageHandler",0},
+    { "_unsigned_char","_byte",0},
+    { "_class_wxMetaFileDC","_wxMetaFileDC",0},
+    { "_unsigned_int","_wxPrintQuality",0},
+    { "_unsigned_int","_size_t",0},
+    { "_unsigned_int","_uint",0},
+    { "_unsigned_int","_wxWindowID",0},
+    { "_unsigned_int","_int",0},
+    { "_wxIcon","_class_wxIcon",0},
+    { "_class_wxPen","_wxPen",0},
+    { "_short","_WXTYPE",0},
+    { "_short","_unsigned_short",0},
+    { "_short","_signed_short",0},
+    { "_class_wxImageList","_wxImageList",0},
+    { "_wxJPEGHandler","_class_wxJPEGHandler",0},
+    { "_wxWindowID","_wxPrintQuality",0},
+    { "_wxWindowID","_size_t",0},
+    { "_wxWindowID","_EBool",0},
+    { "_wxWindowID","_uint",0},
+    { "_wxWindowID","_int",0},
+    { "_wxWindowID","_signed_int",0},
+    { "_wxWindowID","_unsigned_int",0},
+    { "_int","_wxPrintQuality",0},
+    { "_int","_size_t",0},
+    { "_int","_EBool",0},
+    { "_int","_uint",0},
+    { "_int","_wxWindowID",0},
+    { "_int","_unsigned_int",0},
+    { "_int","_signed_int",0},
+    { "_wxSize","_class_wxSize",0},
+    { "_wxRegionIterator","_class_wxRegionIterator",0},
+    { "_class_wxPrinterDC","_wxPrinterDC",0},
+    { "_class_wxPaintDC","_wxPaintDC",0},
+    { "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
+    { "_class_wxIcon","_wxIcon",0},
+    { "_class_wxColour","_wxColour",0},
+    { "_class_wxScreenDC","_wxScreenDC",0},
+    { "_wxPalette","_class_wxPalette",0},
+    { "_wxRegion","_class_wxRegion",0},
+    { "_class_wxClientDC","_wxClientDC",0},
+    { "_class_wxSize","_wxSize",0},
+    { "_class_wxBitmap","_wxBitmap",0},
+    { "_class_wxMemoryDC","_wxMemoryDC",0},
+    { "_wxDash","_unsigned_long",0},
+    { "_wxDash","_long",0},
+    { "_class_wxPalette","_wxPalette",0},
+{0,0,0}};
+

 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif
 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif

-SWIGEXPORT(void,initimagec)() {
+SWIGEXPORT(void) initimagec() {

         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("imagec", imagecMethods);
         d = PyModule_GetDict(m);
         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("imagec", imagecMethods);
         d = PyModule_GetDict(m);

-/*
- * These are the pointer type-equivalency mappings. 
- * (Used by the SWIG pointer type-checker).
- */
-        SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_signed_long","_long",0);
-        SWIG_RegisterMapping("_class_wxJPEGHandler","_wxJPEGHandler",0);
-        SWIG_RegisterMapping("_wxBMPHandler","_class_wxBMPHandler",0);
-        SWIG_RegisterMapping("_wxImage","_class_wxImage",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_signed_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_unsigned_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_wxWindowID",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_uint",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_EBool",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_size_t",0);
-        SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
-        SWIG_RegisterMapping("_wxGIFHandler","_class_wxGIFHandler",0);
-        SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
-        SWIG_RegisterMapping("_wxImageHandler","_class_wxGIFHandler",SwigwxGIFHandlerTowxImageHandler);
-        SWIG_RegisterMapping("_wxImageHandler","_wxGIFHandler",SwigwxGIFHandlerTowxImageHandler);
-        SWIG_RegisterMapping("_wxImageHandler","_class_wxBMPHandler",SwigwxBMPHandlerTowxImageHandler);
-        SWIG_RegisterMapping("_wxImageHandler","_wxBMPHandler",SwigwxBMPHandlerTowxImageHandler);
-        SWIG_RegisterMapping("_wxImageHandler","_class_wxJPEGHandler",SwigwxJPEGHandlerTowxImageHandler);
-        SWIG_RegisterMapping("_wxImageHandler","_wxJPEGHandler",SwigwxJPEGHandlerTowxImageHandler);
-        SWIG_RegisterMapping("_wxImageHandler","_class_wxPNGHandler",SwigwxPNGHandlerTowxImageHandler);
-        SWIG_RegisterMapping("_wxImageHandler","_wxPNGHandler",SwigwxPNGHandlerTowxImageHandler);
-        SWIG_RegisterMapping("_wxImageHandler","_class_wxImageHandler",0);
-        SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
-        SWIG_RegisterMapping("_wxPNGHandler","_class_wxPNGHandler",0);
-        SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
-        SWIG_RegisterMapping("_byte","_unsigned_char",0);
-        SWIG_RegisterMapping("_long","_wxDash",0);
-        SWIG_RegisterMapping("_long","_unsigned_long",0);
-        SWIG_RegisterMapping("_long","_signed_long",0);
-        SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
-        SWIG_RegisterMapping("_class_wxBMPHandler","_wxBMPHandler",0);
-        SWIG_RegisterMapping("_size_t","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_size_t","_unsigned_int",0);
-        SWIG_RegisterMapping("_size_t","_int",0);
-        SWIG_RegisterMapping("_size_t","_wxWindowID",0);
-        SWIG_RegisterMapping("_size_t","_uint",0);
-        SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
-        SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0);
-        SWIG_RegisterMapping("_class_wxGIFHandler","_wxGIFHandler",0);
-        SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
-        SWIG_RegisterMapping("_class_wxPNGHandler","_wxPNGHandler",0);
-        SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
-        SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
-        SWIG_RegisterMapping("_uint","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_uint","_size_t",0);
-        SWIG_RegisterMapping("_uint","_unsigned_int",0);
-        SWIG_RegisterMapping("_uint","_int",0);
-        SWIG_RegisterMapping("_uint","_wxWindowID",0);
-        SWIG_RegisterMapping("_wxRect","_class_wxRect",0);
-        SWIG_RegisterMapping("_class_wxImage","_wxImage",0);
-        SWIG_RegisterMapping("_wxPoint","_class_wxPoint",0);
-        SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
-        SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0);
-        SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_EBool","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_EBool","_signed_int",0);
-        SWIG_RegisterMapping("_EBool","_int",0);
-        SWIG_RegisterMapping("_EBool","_wxWindowID",0);
-        SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
-        SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
-        SWIG_RegisterMapping("_unsigned_long","_wxDash",0);
-        SWIG_RegisterMapping("_unsigned_long","_long",0);
-        SWIG_RegisterMapping("_class_wxRect","_wxRect",0);
-        SWIG_RegisterMapping("_class_wxDC","_wxDC",0);
-        SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxAcceleratorEntry","_class_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_signed_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_signed_int","_EBool",0);
-        SWIG_RegisterMapping("_signed_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_signed_int","_int",0);
-        SWIG_RegisterMapping("_wxLayoutConstraints","_class_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_wxMetaFileDC","_class_wxMetaFileDC",0);
-        SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0);
-        SWIG_RegisterMapping("_WXTYPE","_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_signed_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_unsigned_short",0);
-        SWIG_RegisterMapping("_class_wxBrush","_wxBrush",0);
-        SWIG_RegisterMapping("_unsigned_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_unsigned_short","_short",0);
-        SWIG_RegisterMapping("_class_wxFont","_wxFont",0);
-        SWIG_RegisterMapping("_wxClientDC","_class_wxClientDC",0);
-        SWIG_RegisterMapping("_class_wxPoint","_wxPoint",0);
-        SWIG_RegisterMapping("_wxRealPoint","_class_wxRealPoint",0);
-        SWIG_RegisterMapping("_signed_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_signed_short","_short",0);
-        SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0);
-        SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
-        SWIG_RegisterMapping("_class_wxWindowDC","_wxWindowDC",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
-        SWIG_RegisterMapping("_class_wxImageHandler","_class_wxGIFHandler",SwigwxGIFHandlerTowxImageHandler);
-        SWIG_RegisterMapping("_class_wxImageHandler","_wxGIFHandler",SwigwxGIFHandlerTowxImageHandler);
-        SWIG_RegisterMapping("_class_wxImageHandler","_class_wxBMPHandler",SwigwxBMPHandlerTowxImageHandler);
-        SWIG_RegisterMapping("_class_wxImageHandler","_wxBMPHandler",SwigwxBMPHandlerTowxImageHandler);
-        SWIG_RegisterMapping("_class_wxImageHandler","_class_wxJPEGHandler",SwigwxJPEGHandlerTowxImageHandler);
-        SWIG_RegisterMapping("_class_wxImageHandler","_wxJPEGHandler",SwigwxJPEGHandlerTowxImageHandler);
-        SWIG_RegisterMapping("_class_wxImageHandler","_class_wxPNGHandler",SwigwxPNGHandlerTowxImageHandler);
-        SWIG_RegisterMapping("_class_wxImageHandler","_wxPNGHandler",SwigwxPNGHandlerTowxImageHandler);
-        SWIG_RegisterMapping("_class_wxImageHandler","_wxImageHandler",0);
-        SWIG_RegisterMapping("_unsigned_char","_byte",0);
-        SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_unsigned_int","_size_t",0);
-        SWIG_RegisterMapping("_unsigned_int","_uint",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_unsigned_int","_int",0);
-        SWIG_RegisterMapping("_wxIcon","_class_wxIcon",0);
-        SWIG_RegisterMapping("_class_wxPen","_wxPen",0);
-        SWIG_RegisterMapping("_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_short","_unsigned_short",0);
-        SWIG_RegisterMapping("_short","_signed_short",0);
-        SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0);
-        SWIG_RegisterMapping("_wxJPEGHandler","_class_wxJPEGHandler",0);
-        SWIG_RegisterMapping("_wxWindowID","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_wxWindowID","_size_t",0);
-        SWIG_RegisterMapping("_wxWindowID","_EBool",0);
-        SWIG_RegisterMapping("_wxWindowID","_uint",0);
-        SWIG_RegisterMapping("_wxWindowID","_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_signed_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_int","_size_t",0);
-        SWIG_RegisterMapping("_int","_EBool",0);
-        SWIG_RegisterMapping("_int","_uint",0);
-        SWIG_RegisterMapping("_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_int","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_signed_int",0);
-        SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
-        SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
-        SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
-        SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
-        SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
-        SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
-        SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
-        SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
-        SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
-        SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
-        SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
-        SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0);
-        SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0);
-        SWIG_RegisterMapping("_wxDash","_unsigned_long",0);
-        SWIG_RegisterMapping("_wxDash","_long",0);
-        SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
+{
+   int i;
+   for (i = 0; _swig_mapping[i].n1; i++)
+        SWIG_RegisterMapping(_swig_mapping[i].n1,_swig_mapping[i].n2,_swig_mapping[i].pcnv);
+}

 }
 }

diff --git a/utils/wxPython/src/msw/image.py b/utils/wxPython/src/msw/image.py
index 103d98f488dad9c9d9a00343b0eb206f510c8b13..d2b4c895993c6d03c1d90768474d2f587b40361e 100644 (file)
--- a/utils/wxPython/src/msw/image.py
+++ b/utils/wxPython/src/msw/image.py
@@ -8,35 +8,35 @@ class wxImageHandlerPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetName(self):
-        val = imagec.wxImageHandler_GetName(self.this)
+    def GetName(self, *_args, **_kwargs):
+        val = apply(imagec.wxImageHandler_GetName,(self,) + _args, _kwargs)

         return val
         return val

-    def GetExtension(self):
-        val = imagec.wxImageHandler_GetExtension(self.this)
+    def GetExtension(self, *_args, **_kwargs):
+        val = apply(imagec.wxImageHandler_GetExtension,(self,) + _args, _kwargs)

         return val
         return val

-    def GetType(self):
-        val = imagec.wxImageHandler_GetType(self.this)
+    def GetType(self, *_args, **_kwargs):
+        val = apply(imagec.wxImageHandler_GetType,(self,) + _args, _kwargs)

         return val
         return val

-    def GetMimeType(self):
-        val = imagec.wxImageHandler_GetMimeType(self.this)
+    def GetMimeType(self, *_args, **_kwargs):
+        val = apply(imagec.wxImageHandler_GetMimeType,(self,) + _args, _kwargs)

         return val
         return val

-    def SetName(self,arg0):
-        val = imagec.wxImageHandler_SetName(self.this,arg0)
+    def SetName(self, *_args, **_kwargs):
+        val = apply(imagec.wxImageHandler_SetName,(self,) + _args, _kwargs)

         return val
         return val

-    def SetExtension(self,arg0):
-        val = imagec.wxImageHandler_SetExtension(self.this,arg0)
+    def SetExtension(self, *_args, **_kwargs):
+        val = apply(imagec.wxImageHandler_SetExtension,(self,) + _args, _kwargs)

         return val
         return val

-    def SetType(self,arg0):
-        val = imagec.wxImageHandler_SetType(self.this,arg0)
+    def SetType(self, *_args, **_kwargs):
+        val = apply(imagec.wxImageHandler_SetType,(self,) + _args, _kwargs)

         return val
         return val

-    def SetMimeType(self,arg0):
-        val = imagec.wxImageHandler_SetMimeType(self.this,arg0)
+    def SetMimeType(self, *_args, **_kwargs):
+        val = apply(imagec.wxImageHandler_SetMimeType,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxImageHandler instance>"
+        return "<C wxImageHandler instance at %s>" % (self.this,)

 class wxImageHandler(wxImageHandlerPtr):
 class wxImageHandler(wxImageHandlerPtr):

-    def __init__(self) :
-        self.this = imagec.new_wxImageHandler()
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(imagec.new_wxImageHandler,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -47,10 +47,10 @@ class wxPNGHandlerPtr(wxImageHandlerPtr):
         self.this = this
         self.thisown = 0
     def __repr__(self):
         self.this = this
         self.thisown = 0
     def __repr__(self):

-        return "<C wxPNGHandler instance>"
+        return "<C wxPNGHandler instance at %s>" % (self.this,)

 class wxPNGHandler(wxPNGHandlerPtr):
 class wxPNGHandler(wxPNGHandlerPtr):

-    def __init__(self) :
-        self.this = imagec.new_wxPNGHandler()
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(imagec.new_wxPNGHandler,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -61,10 +61,10 @@ class wxJPEGHandlerPtr(wxImageHandlerPtr):
         self.this = this
         self.thisown = 0
     def __repr__(self):
         self.this = this
         self.thisown = 0
     def __repr__(self):

-        return "<C wxJPEGHandler instance>"
+        return "<C wxJPEGHandler instance at %s>" % (self.this,)

 class wxJPEGHandler(wxJPEGHandlerPtr):
 class wxJPEGHandler(wxJPEGHandlerPtr):

-    def __init__(self) :
-        self.this = imagec.new_wxJPEGHandler()
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(imagec.new_wxJPEGHandler,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -75,10 +75,10 @@ class wxBMPHandlerPtr(wxImageHandlerPtr):
         self.this = this
         self.thisown = 0
     def __repr__(self):
         self.this = this
         self.thisown = 0
     def __repr__(self):

-        return "<C wxBMPHandler instance>"
+        return "<C wxBMPHandler instance at %s>" % (self.this,)

 class wxBMPHandler(wxBMPHandlerPtr):
 class wxBMPHandler(wxBMPHandlerPtr):

-    def __init__(self) :
-        self.this = imagec.new_wxBMPHandler()
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(imagec.new_wxBMPHandler,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -89,10 +89,10 @@ class wxGIFHandlerPtr(wxImageHandlerPtr):
         self.this = this
         self.thisown = 0
     def __repr__(self):
         self.this = this
         self.thisown = 0
     def __repr__(self):

-        return "<C wxGIFHandler instance>"
+        return "<C wxGIFHandler instance at %s>" % (self.this,)

 class wxGIFHandler(wxGIFHandlerPtr):
 class wxGIFHandler(wxGIFHandlerPtr):

-    def __init__(self) :
-        self.this = imagec.new_wxGIFHandler()
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(imagec.new_wxGIFHandler,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -102,90 +102,88 @@ class wxImagePtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self, imagec=imagec):
+    def __del__(self,imagec=imagec):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            imagec.delete_wxImage(self.this)
-    def ConvertToBitmap(self):
-        val = imagec.wxImage_ConvertToBitmap(self.this)
-        val = wxBitmapPtr(val)
-        val.thisown = 1
+            imagec.delete_wxImage(self)
+    def ConvertToBitmap(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_ConvertToBitmap,(self,) + _args, _kwargs)
+        if val: val = wxBitmapPtr(val) ; val.thisown = 1

         return val
         return val

-    def Create(self,arg0,arg1):
-        val = imagec.wxImage_Create(self.this,arg0,arg1)
+    def Create(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_Create,(self,) + _args, _kwargs)

         return val
         return val

-    def Destroy(self):
-        val = imagec.wxImage_Destroy(self.this)
+    def Destroy(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_Destroy,(self,) + _args, _kwargs)

         return val
         return val

-    def Scale(self,arg0,arg1):
-        val = imagec.wxImage_Scale(self.this,arg0,arg1)
-        val = wxImagePtr(val)
-        val.thisown = 1
+    def Scale(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_Scale,(self,) + _args, _kwargs)
+        if val: val = wxImagePtr(val) ; val.thisown = 1

         return val
         return val

-    def Rescale(self,arg0,arg1):
-        val = imagec.wxImage_Rescale(self.this,arg0,arg1)
+    def Rescale(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_Rescale,(self,) + _args, _kwargs)

         return val
         return val

-    def SetRGB(self,arg0,arg1,arg2,arg3,arg4):
-        val = imagec.wxImage_SetRGB(self.this,arg0,arg1,arg2,arg3,arg4)
+    def SetRGB(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_SetRGB,(self,) + _args, _kwargs)

         return val
         return val

-    def GetRed(self,arg0,arg1):
-        val = imagec.wxImage_GetRed(self.this,arg0,arg1)
+    def GetRed(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_GetRed,(self,) + _args, _kwargs)

         return val
         return val

-    def GetGreen(self,arg0,arg1):
-        val = imagec.wxImage_GetGreen(self.this,arg0,arg1)
+    def GetGreen(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_GetGreen,(self,) + _args, _kwargs)

         return val
         return val

-    def GetBlue(self,arg0,arg1):
-        val = imagec.wxImage_GetBlue(self.this,arg0,arg1)
+    def GetBlue(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_GetBlue,(self,) + _args, _kwargs)

         return val
         return val

-    def LoadFile(self,arg0,*args):
-        val = apply(imagec.wxImage_LoadFile,(self.this,arg0,)+args)
+    def LoadFile(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_LoadFile,(self,) + _args, _kwargs)

         return val
         return val

-    def LoadMimeFile(self,arg0,arg1):
-        val = imagec.wxImage_LoadMimeFile(self.this,arg0,arg1)
+    def LoadMimeFile(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_LoadMimeFile,(self,) + _args, _kwargs)

         return val
         return val

-    def SaveFile(self,arg0,arg1):
-        val = imagec.wxImage_SaveFile(self.this,arg0,arg1)
+    def SaveFile(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_SaveFile,(self,) + _args, _kwargs)

         return val
         return val

-    def SaveMimeFile(self,arg0,arg1):
-        val = imagec.wxImage_SaveMimeFile(self.this,arg0,arg1)
+    def SaveMimeFile(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_SaveMimeFile,(self,) + _args, _kwargs)

         return val
         return val

-    def Ok(self):
-        val = imagec.wxImage_Ok(self.this)
+    def Ok(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_Ok,(self,) + _args, _kwargs)

         return val
         return val

-    def GetWidth(self):
-        val = imagec.wxImage_GetWidth(self.this)
+    def GetWidth(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_GetWidth,(self,) + _args, _kwargs)

         return val
         return val

-    def GetHeight(self):
-        val = imagec.wxImage_GetHeight(self.this)
+    def GetHeight(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_GetHeight,(self,) + _args, _kwargs)

         return val
         return val

-    def GetData(self):
-        val = imagec.wxImage_GetData(self.this)
+    def GetData(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_GetData,(self,) + _args, _kwargs)

         return val
         return val

-    def SetData(self,arg0):
-        val = imagec.wxImage_SetData(self.this,arg0)
+    def SetData(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_SetData,(self,) + _args, _kwargs)

         return val
         return val

-    def SetMaskColour(self,arg0,arg1,arg2):
-        val = imagec.wxImage_SetMaskColour(self.this,arg0,arg1,arg2)
+    def SetMaskColour(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_SetMaskColour,(self,) + _args, _kwargs)

         return val
         return val

-    def GetMaskRed(self):
-        val = imagec.wxImage_GetMaskRed(self.this)
+    def GetMaskRed(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_GetMaskRed,(self,) + _args, _kwargs)

         return val
         return val

-    def GetMaskGreen(self):
-        val = imagec.wxImage_GetMaskGreen(self.this)
+    def GetMaskGreen(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_GetMaskGreen,(self,) + _args, _kwargs)

         return val
         return val

-    def GetMaskBlue(self):
-        val = imagec.wxImage_GetMaskBlue(self.this)
+    def GetMaskBlue(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_GetMaskBlue,(self,) + _args, _kwargs)

         return val
         return val

-    def SetMask(self,*args):
-        val = apply(imagec.wxImage_SetMask,(self.this,)+args)
+    def SetMask(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_SetMask,(self,) + _args, _kwargs)

         return val
         return val

-    def HasMask(self):
-        val = imagec.wxImage_HasMask(self.this)
+    def HasMask(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_HasMask,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxImage instance>"
+        return "<C wxImage instance at %s>" % (self.this,)

 class wxImage(wxImagePtr):
 class wxImage(wxImagePtr):

-    def __init__(self,arg0,*args) :
-        self.this = apply(imagec.new_wxImage,(arg0,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(imagec.new_wxImage,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -195,33 +193,27 @@ class wxImage(wxImagePtr):
 
 #-------------- FUNCTION WRAPPERS ------------------
 
 
 #-------------- FUNCTION WRAPPERS ------------------
 

-def wxNullImage():
-    val = imagec.wxNullImage()
-    val = wxImagePtr(val)
-    val.thisown = 1
+def wxNullImage(*_args, **_kwargs):
+    val = apply(imagec.wxNullImage,_args,_kwargs)
+    if val: val = wxImagePtr(val); val.thisown = 1

     return val
 
     return val
 

-def wxEmptyImage(arg0,arg1):
-    val = imagec.wxEmptyImage(arg0,arg1)
-    val = wxImagePtr(val)
-    val.thisown = 1
+def wxEmptyImage(*_args, **_kwargs):
+    val = apply(imagec.wxEmptyImage,_args,_kwargs)
+    if val: val = wxImagePtr(val); val.thisown = 1

     return val
 
     return val
 

-def wxImageFromMime(arg0,arg1):
-    val = imagec.wxImageFromMime(arg0,arg1)
-    val = wxImagePtr(val)
-    val.thisown = 1
+def wxImageFromMime(*_args, **_kwargs):
+    val = apply(imagec.wxImageFromMime,_args,_kwargs)
+    if val: val = wxImagePtr(val); val.thisown = 1

     return val
 
     return val
 

-def wxImageFromBitmap(arg0):
-    val = imagec.wxImageFromBitmap(arg0.this)
-    val = wxImagePtr(val)
-    val.thisown = 1
+def wxImageFromBitmap(*_args, **_kwargs):
+    val = apply(imagec.wxImageFromBitmap,_args,_kwargs)
+    if val: val = wxImagePtr(val); val.thisown = 1

     return val
 
     return val
 

-def wxImage_AddHandler(arg0):
-    val = imagec.wxImage_AddHandler(arg0.this)
-    return val
+wxImage_AddHandler = imagec.wxImage_AddHandler

 
 
 
 
 
 

diff --git a/utils/wxPython/src/msw/mdi.cpp b/utils/wxPython/src/msw/mdi.cpp
index ca76437d0802b1e7c816e5fddb61274600a46f9a..aab8bf8657408c0a0d934a6c1d44f815fc7ab549 100644 (file)
--- a/utils/wxPython/src/msw/mdi.cpp
+++ b/utils/wxPython/src/msw/mdi.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)

- * Version 1.1 (Patch 5)
+ * Version 1.1 (Patch 6)

  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.


@@ -24,16 +24,16 @@
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)

-#      define SWIGEXPORT(a,b) __declspec(dllexport) a b
+#      define SWIGEXPORT(a) __declspec(dllexport) a

 #   else
 #      if defined(__BORLANDC__)
 #   else
 #      if defined(__BORLANDC__)

-#          define SWIGEXPORT(a,b) a _export b
+#          define SWIGEXPORT(a) a _export 

 #      else
 #      else

-#          define SWIGEXPORT(a,b) a b
+#          define SWIGEXPORT(a) a 

 #      endif
 #   endif
 #else
 #      endif
 #   endif
 #else

-#   define SWIGEXPORT(a,b) a b
+#   define SWIGEXPORT(a) a 

 #endif
 
 #ifdef __cplusplus
 #endif
 
 #ifdef __cplusplus


@@ -43,12 +43,12 @@ extern "C" {
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);

+extern char *SWIG_GetPtrObj(PyObject *, void **, char *);

 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif
 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif

-

 #define SWIG_init    initmdic
 
 #define SWIG_name    "mdic"
 #define SWIG_init    initmdic
 
 #define SWIG_name    "mdic"


@@ -57,12 +57,13 @@ extern PyObject *SWIG_newvarlink(void);
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;

-    if (!target) {
+    PyObject*   o3;
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);
         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);


@@ -79,23 +80,23 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
     PyObject*   o3;
 
     PyObject*   o2;
     PyObject*   o3;
 

-    if (!target) {
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }
         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }

-        o3 = PyTuple_New(1);
-        PyTuple_SetItem(o3, 0, o);
+        o3 = PyTuple_New(1);            
+        PyTuple_SetItem(o3, 0, o);      

 
         o2 = target;
 
         o2 = target;

-        target = PySequence_Concat(o2, o3);
-        Py_DECREF(o2);
+        target = PySequence_Concat(o2, o3); 
+        Py_DECREF(o2);                      

         Py_DECREF(o3);
     }
     return target;
         Py_DECREF(o3);
     }
     return target;


@@ -113,6 +114,9 @@ extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
 
 
 static char* wxStringErrorMsg = "string type is required for parameter";
 
 
 static char* wxStringErrorMsg = "string type is required for parameter";

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

 static void *SwigwxMDIParentFrameTowxFrame(void *ptr) {
     wxMDIParentFrame *src;
     wxFrame *dest;
 static void *SwigwxMDIParentFrameTowxFrame(void *ptr) {
     wxMDIParentFrame *src;
     wxFrame *dest;


@@ -144,21 +148,22 @@ static PyObject *_wrap_new_wxMDIParentFrame(PyObject *self, PyObject *args) {
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;

-    wxPoint * _arg3 = &wxPyDefaultPosition;
-    wxSize * _arg4 = &wxPyDefaultSize;
-    long  _arg5 = (wxDEFAULT_FRAME_STYLE)|(wxVSCROLL)|(wxHSCROLL);
-    char * _arg6 = "frame";
-    char * _argc0 = 0;
+    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    long  _arg5 = (long ) wxDEFAULT_FRAME_STYLE|wxVSCROLL|wxHSCROLL;
+    char * _arg6 = (char *) "frame";
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
     PyObject * _obj2 = 0;

-    char * _argc3 = 0;
-    char * _argc4 = 0;
+    PyObject * _argo3 = 0;
+    PyObject * _argo4 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siO|ssls:new_wxMDIParentFrame",&_argc0,&_arg1,&_obj2,&_argc3,&_argc4,&_arg5,&_arg6)) 
+    if(!PyArg_ParseTuple(args,"OiO|OOls:new_wxMDIParentFrame",&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxMDIParentFrame. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxMDIParentFrame. Expected _wxWindow_p.");
         return NULL;
         }


@@ -170,14 +175,16 @@ static PyObject *_wrap_new_wxMDIParentFrame(PyObject *self, PyObject *args) {
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxPoint_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxMDIParentFrame. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxMDIParentFrame. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_wxSize_p")) {
+    if (_argo4) {
+        if (_argo4 == Py_None) { _arg4 = NULL; }
+        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxMDIParentFrame. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxMDIParentFrame. Expected _wxSize_p.");
         return NULL;
         }


@@ -187,8 +194,13 @@ static PyObject *_wrap_new_wxMDIParentFrame(PyObject *self, PyObject *args) {
         _result = (wxMDIParentFrame *)new_wxMDIParentFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxMDIParentFrame *)new_wxMDIParentFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMDIParentFrame_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMDIParentFrame_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     if (_obj2)
         delete _arg2;
 {
     if (_obj2)
         delete _arg2;


@@ -200,13 +212,14 @@ static PyObject *_wrap_new_wxMDIParentFrame(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxMDIParentFrame_ActivateNext(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMDIParentFrame * _arg0;
 static PyObject *_wrap_wxMDIParentFrame_ActivateNext(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMDIParentFrame * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMDIParentFrame_ActivateNext",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMDIParentFrame_ActivateNext",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMDIParentFrame_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMDIParentFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMDIParentFrame_ActivateNext. Expected _wxMDIParentFrame_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMDIParentFrame_ActivateNext. Expected _wxMDIParentFrame_p.");
         return NULL;
         }


@@ -225,13 +238,14 @@ static PyObject *_wrap_wxMDIParentFrame_ActivateNext(PyObject *self, PyObject *a
 static PyObject *_wrap_wxMDIParentFrame_ActivatePrevious(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMDIParentFrame * _arg0;
 static PyObject *_wrap_wxMDIParentFrame_ActivatePrevious(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMDIParentFrame * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMDIParentFrame_ActivatePrevious",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMDIParentFrame_ActivatePrevious",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMDIParentFrame_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMDIParentFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMDIParentFrame_ActivatePrevious. Expected _wxMDIParentFrame_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMDIParentFrame_ActivatePrevious. Expected _wxMDIParentFrame_p.");
         return NULL;
         }


@@ -250,13 +264,14 @@ static PyObject *_wrap_wxMDIParentFrame_ActivatePrevious(PyObject *self, PyObjec
 static PyObject *_wrap_wxMDIParentFrame_ArrangeIcons(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMDIParentFrame * _arg0;
 static PyObject *_wrap_wxMDIParentFrame_ArrangeIcons(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMDIParentFrame * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMDIParentFrame_ArrangeIcons",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMDIParentFrame_ArrangeIcons",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMDIParentFrame_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMDIParentFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMDIParentFrame_ArrangeIcons. Expected _wxMDIParentFrame_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMDIParentFrame_ArrangeIcons. Expected _wxMDIParentFrame_p.");
         return NULL;
         }


@@ -275,13 +290,14 @@ static PyObject *_wrap_wxMDIParentFrame_ArrangeIcons(PyObject *self, PyObject *a
 static PyObject *_wrap_wxMDIParentFrame_Cascade(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMDIParentFrame * _arg0;
 static PyObject *_wrap_wxMDIParentFrame_Cascade(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMDIParentFrame * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMDIParentFrame_Cascade",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMDIParentFrame_Cascade",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMDIParentFrame_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMDIParentFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMDIParentFrame_Cascade. Expected _wxMDIParentFrame_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMDIParentFrame_Cascade. Expected _wxMDIParentFrame_p.");
         return NULL;
         }


@@ -301,14 +317,15 @@ static PyObject *_wrap_wxMDIParentFrame_GetActiveChild(PyObject *self, PyObject
     PyObject * _resultobj;
     wxMDIChildFrame * _result;
     wxMDIParentFrame * _arg0;
     PyObject * _resultobj;
     wxMDIChildFrame * _result;
     wxMDIParentFrame * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMDIParentFrame_GetActiveChild",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMDIParentFrame_GetActiveChild",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMDIParentFrame_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMDIParentFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMDIParentFrame_GetActiveChild. Expected _wxMDIParentFrame_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMDIParentFrame_GetActiveChild. Expected _wxMDIParentFrame_p.");
         return NULL;
         }


@@ -318,8 +335,13 @@ static PyObject *_wrap_wxMDIParentFrame_GetActiveChild(PyObject *self, PyObject
         _result = (wxMDIChildFrame *)wxMDIParentFrame_GetActiveChild(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxMDIChildFrame *)wxMDIParentFrame_GetActiveChild(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMDIChildFrame_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMDIChildFrame_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -328,14 +350,15 @@ static PyObject *_wrap_wxMDIParentFrame_GetClientWindow(PyObject *self, PyObject
     PyObject * _resultobj;
     wxMDIClientWindow * _result;
     wxMDIParentFrame * _arg0;
     PyObject * _resultobj;
     wxMDIClientWindow * _result;
     wxMDIParentFrame * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMDIParentFrame_GetClientWindow",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMDIParentFrame_GetClientWindow",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMDIParentFrame_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMDIParentFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMDIParentFrame_GetClientWindow. Expected _wxMDIParentFrame_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMDIParentFrame_GetClientWindow. Expected _wxMDIParentFrame_p.");
         return NULL;
         }


@@ -345,8 +368,13 @@ static PyObject *_wrap_wxMDIParentFrame_GetClientWindow(PyObject *self, PyObject
         _result = (wxMDIClientWindow *)wxMDIParentFrame_GetClientWindow(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxMDIClientWindow *)wxMDIParentFrame_GetClientWindow(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMDIClientWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMDIClientWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -355,14 +383,15 @@ static PyObject *_wrap_wxMDIParentFrame_GetToolBar(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     wxWindow * _result;
     wxMDIParentFrame * _arg0;
     PyObject * _resultobj;
     wxWindow * _result;
     wxMDIParentFrame * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMDIParentFrame_GetToolBar",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMDIParentFrame_GetToolBar",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMDIParentFrame_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMDIParentFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMDIParentFrame_GetToolBar. Expected _wxMDIParentFrame_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMDIParentFrame_GetToolBar. Expected _wxMDIParentFrame_p.");
         return NULL;
         }


@@ -372,8 +401,13 @@ static PyObject *_wrap_wxMDIParentFrame_GetToolBar(PyObject *self, PyObject *arg
         _result = (wxWindow *)wxMDIParentFrame_GetToolBar(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxWindow *)wxMDIParentFrame_GetToolBar(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -382,20 +416,22 @@ static PyObject *_wrap_wxMDIParentFrame_SetToolBar(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     wxMDIParentFrame * _arg0;
     wxToolBar * _arg1;
     PyObject * _resultobj;
     wxMDIParentFrame * _arg0;
     wxToolBar * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxMDIParentFrame_SetToolBar",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxMDIParentFrame_SetToolBar",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMDIParentFrame_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMDIParentFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMDIParentFrame_SetToolBar. Expected _wxMDIParentFrame_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMDIParentFrame_SetToolBar. Expected _wxMDIParentFrame_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxToolBar_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxToolBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMDIParentFrame_SetToolBar. Expected _wxToolBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMDIParentFrame_SetToolBar. Expected _wxToolBar_p.");
         return NULL;
         }


@@ -414,13 +450,14 @@ static PyObject *_wrap_wxMDIParentFrame_SetToolBar(PyObject *self, PyObject *arg
 static PyObject *_wrap_wxMDIParentFrame_Tile(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMDIParentFrame * _arg0;
 static PyObject *_wrap_wxMDIParentFrame_Tile(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMDIParentFrame * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMDIParentFrame_Tile",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMDIParentFrame_Tile",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMDIParentFrame_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMDIParentFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMDIParentFrame_Tile. Expected _wxMDIParentFrame_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMDIParentFrame_Tile. Expected _wxMDIParentFrame_p.");
         return NULL;
         }


@@ -466,21 +503,22 @@ static PyObject *_wrap_new_wxMDIChildFrame(PyObject *self, PyObject *args) {
     wxMDIParentFrame * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;
     wxMDIParentFrame * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;

-    wxPoint * _arg3 = &wxPyDefaultPosition;
-    wxSize * _arg4 = &wxPyDefaultSize;
-    long  _arg5 = (wxDEFAULT_FRAME_STYLE);
-    char * _arg6 = "frame";
-    char * _argc0 = 0;
+    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    long  _arg5 = (long ) wxDEFAULT_FRAME_STYLE;
+    char * _arg6 = (char *) "frame";
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
     PyObject * _obj2 = 0;

-    char * _argc3 = 0;
-    char * _argc4 = 0;
+    PyObject * _argo3 = 0;
+    PyObject * _argo4 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siO|ssls:new_wxMDIChildFrame",&_argc0,&_arg1,&_obj2,&_argc3,&_argc4,&_arg5,&_arg6)) 
+    if(!PyArg_ParseTuple(args,"OiO|OOls:new_wxMDIChildFrame",&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMDIParentFrame_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMDIParentFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxMDIChildFrame. Expected _wxMDIParentFrame_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxMDIChildFrame. Expected _wxMDIParentFrame_p.");
         return NULL;
         }


@@ -492,14 +530,16 @@ static PyObject *_wrap_new_wxMDIChildFrame(PyObject *self, PyObject *args) {
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxPoint_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxMDIChildFrame. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxMDIChildFrame. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_wxSize_p")) {
+    if (_argo4) {
+        if (_argo4 == Py_None) { _arg4 = NULL; }
+        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxMDIChildFrame. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxMDIChildFrame. Expected _wxSize_p.");
         return NULL;
         }


@@ -509,8 +549,13 @@ static PyObject *_wrap_new_wxMDIChildFrame(PyObject *self, PyObject *args) {
         _result = (wxMDIChildFrame *)new_wxMDIChildFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxMDIChildFrame *)new_wxMDIChildFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMDIChildFrame_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMDIChildFrame_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     if (_obj2)
         delete _arg2;
 {
     if (_obj2)
         delete _arg2;


@@ -522,13 +567,14 @@ static PyObject *_wrap_new_wxMDIChildFrame(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxMDIChildFrame_Activate(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMDIChildFrame * _arg0;
 static PyObject *_wrap_wxMDIChildFrame_Activate(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMDIChildFrame * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMDIChildFrame_Activate",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMDIChildFrame_Activate",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMDIChildFrame_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMDIChildFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMDIChildFrame_Activate. Expected _wxMDIChildFrame_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMDIChildFrame_Activate. Expected _wxMDIChildFrame_p.");
         return NULL;
         }


@@ -548,14 +594,15 @@ static PyObject *_wrap_wxMDIChildFrame_Maximize(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxMDIChildFrame * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxMDIChildFrame * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxMDIChildFrame_Maximize",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxMDIChildFrame_Maximize",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMDIChildFrame_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMDIChildFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMDIChildFrame_Maximize. Expected _wxMDIChildFrame_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMDIChildFrame_Maximize. Expected _wxMDIChildFrame_p.");
         return NULL;
         }


@@ -575,13 +622,14 @@ static PyObject *_wrap_wxMDIChildFrame_Maximize(PyObject *self, PyObject *args)
 static PyObject *_wrap_wxMDIChildFrame_Restore(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMDIChildFrame * _arg0;
 static PyObject *_wrap_wxMDIChildFrame_Restore(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMDIChildFrame * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMDIChildFrame_Restore",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMDIChildFrame_Restore",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMDIChildFrame_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMDIChildFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMDIChildFrame_Restore. Expected _wxMDIChildFrame_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMDIChildFrame_Restore. Expected _wxMDIChildFrame_p.");
         return NULL;
         }


@@ -617,15 +665,16 @@ static PyObject *_wrap_new_wxMDIClientWindow(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMDIClientWindow * _result;
     wxMDIParentFrame * _arg0;
     PyObject * _resultobj;
     wxMDIClientWindow * _result;
     wxMDIParentFrame * _arg0;

-    long  _arg1 = 0;
-    char * _argc0 = 0;
+    long  _arg1 = (long ) 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|l:new_wxMDIClientWindow",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"O|l:new_wxMDIClientWindow",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMDIParentFrame_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMDIParentFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxMDIClientWindow. Expected _wxMDIParentFrame_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxMDIClientWindow. Expected _wxMDIParentFrame_p.");
         return NULL;
         }


@@ -635,314 +684,329 @@ static PyObject *_wrap_new_wxMDIClientWindow(PyObject *self, PyObject *args) {
         _result = (wxMDIClientWindow *)new_wxMDIClientWindow(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxMDIClientWindow *)new_wxMDIClientWindow(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMDIClientWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMDIClientWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
 static PyMethodDef mdicMethods[] = {
     return _resultobj;
 }
 
 static PyMethodDef mdicMethods[] = {

-        { "new_wxMDIClientWindow", _wrap_new_wxMDIClientWindow, 1 },
-        { "wxMDIChildFrame_Restore", _wrap_wxMDIChildFrame_Restore, 1 },
-        { "wxMDIChildFrame_Maximize", _wrap_wxMDIChildFrame_Maximize, 1 },
-        { "wxMDIChildFrame_Activate", _wrap_wxMDIChildFrame_Activate, 1 },
-        { "new_wxMDIChildFrame", _wrap_new_wxMDIChildFrame, 1 },
-        { "wxMDIParentFrame_Tile", _wrap_wxMDIParentFrame_Tile, 1 },
-        { "wxMDIParentFrame_SetToolBar", _wrap_wxMDIParentFrame_SetToolBar, 1 },
-        { "wxMDIParentFrame_GetToolBar", _wrap_wxMDIParentFrame_GetToolBar, 1 },
-        { "wxMDIParentFrame_GetClientWindow", _wrap_wxMDIParentFrame_GetClientWindow, 1 },
-        { "wxMDIParentFrame_GetActiveChild", _wrap_wxMDIParentFrame_GetActiveChild, 1 },
-        { "wxMDIParentFrame_Cascade", _wrap_wxMDIParentFrame_Cascade, 1 },
-        { "wxMDIParentFrame_ArrangeIcons", _wrap_wxMDIParentFrame_ArrangeIcons, 1 },
-        { "wxMDIParentFrame_ActivatePrevious", _wrap_wxMDIParentFrame_ActivatePrevious, 1 },
-        { "wxMDIParentFrame_ActivateNext", _wrap_wxMDIParentFrame_ActivateNext, 1 },
-        { "new_wxMDIParentFrame", _wrap_new_wxMDIParentFrame, 1 },
+        { "new_wxMDIClientWindow", _wrap_new_wxMDIClientWindow, METH_VARARGS },
+        { "wxMDIChildFrame_Restore", _wrap_wxMDIChildFrame_Restore, METH_VARARGS },
+        { "wxMDIChildFrame_Maximize", _wrap_wxMDIChildFrame_Maximize, METH_VARARGS },
+        { "wxMDIChildFrame_Activate", _wrap_wxMDIChildFrame_Activate, METH_VARARGS },
+        { "new_wxMDIChildFrame", _wrap_new_wxMDIChildFrame, METH_VARARGS },
+        { "wxMDIParentFrame_Tile", _wrap_wxMDIParentFrame_Tile, METH_VARARGS },
+        { "wxMDIParentFrame_SetToolBar", _wrap_wxMDIParentFrame_SetToolBar, METH_VARARGS },
+        { "wxMDIParentFrame_GetToolBar", _wrap_wxMDIParentFrame_GetToolBar, METH_VARARGS },
+        { "wxMDIParentFrame_GetClientWindow", _wrap_wxMDIParentFrame_GetClientWindow, METH_VARARGS },
+        { "wxMDIParentFrame_GetActiveChild", _wrap_wxMDIParentFrame_GetActiveChild, METH_VARARGS },
+        { "wxMDIParentFrame_Cascade", _wrap_wxMDIParentFrame_Cascade, METH_VARARGS },
+        { "wxMDIParentFrame_ArrangeIcons", _wrap_wxMDIParentFrame_ArrangeIcons, METH_VARARGS },
+        { "wxMDIParentFrame_ActivatePrevious", _wrap_wxMDIParentFrame_ActivatePrevious, METH_VARARGS },
+        { "wxMDIParentFrame_ActivateNext", _wrap_wxMDIParentFrame_ActivateNext, METH_VARARGS },
+        { "new_wxMDIParentFrame", _wrap_new_wxMDIParentFrame, METH_VARARGS },

         { NULL, NULL }
 };
         { NULL, NULL }
 };

+#ifdef __cplusplus
+}
+#endif
+/*
+ * This table is used by the pointer type-checker
+ */
+static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
+    { "_wxAcceleratorTable","_class_wxAcceleratorTable",0},
+    { "_wxEvent","_class_wxEvent",0},
+    { "_class_wxActivateEvent","_wxActivateEvent",0},
+    { "_signed_long","_long",0},
+    { "_wxMenuEvent","_class_wxMenuEvent",0},
+    { "_wxPrintQuality","_int",0},
+    { "_wxPrintQuality","_signed_int",0},
+    { "_wxPrintQuality","_unsigned_int",0},
+    { "_wxPrintQuality","_wxWindowID",0},
+    { "_wxPrintQuality","_uint",0},
+    { "_wxPrintQuality","_EBool",0},
+    { "_wxPrintQuality","_size_t",0},
+    { "_class_wxRegionIterator","_wxRegionIterator",0},
+    { "_class_wxMenuBar","_wxMenuBar",0},
+    { "_class_wxEvtHandler","_class_wxMDIClientWindow",SwigwxMDIClientWindowTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxMDIClientWindow",SwigwxMDIClientWindowTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxMDIChildFrame",SwigwxMDIChildFrameTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxMDIParentFrame",SwigwxMDIParentFrameTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxMDIParentFrame",SwigwxMDIParentFrameTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxEvtHandler",0},
+    { "_wxPaintEvent","_class_wxPaintEvent",0},
+    { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
+    { "_wxCursor","_class_wxCursor",0},
+    { "_wxNotifyEvent","_class_wxNotifyEvent",0},
+    { "_wxMask","_class_wxMask",0},
+    { "_wxPen","_class_wxPen",0},
+    { "_wxUpdateUIEvent","_class_wxUpdateUIEvent",0},
+    { "_byte","_unsigned_char",0},
+    { "_wxStaticBox","_class_wxStaticBox",0},
+    { "_wxChoice","_class_wxChoice",0},
+    { "_wxSlider","_class_wxSlider",0},
+    { "_long","_wxDash",0},
+    { "_long","_unsigned_long",0},
+    { "_long","_signed_long",0},
+    { "_wxImageList","_class_wxImageList",0},
+    { "_wxDropFilesEvent","_class_wxDropFilesEvent",0},
+    { "_wxBitmapButton","_class_wxBitmapButton",0},
+    { "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
+    { "_class_wxGauge","_wxGauge",0},
+    { "_wxDC","_class_wxDC",0},
+    { "_wxSpinEvent","_class_wxSpinEvent",0},
+    { "_size_t","_wxPrintQuality",0},
+    { "_size_t","_unsigned_int",0},
+    { "_size_t","_int",0},
+    { "_size_t","_wxWindowID",0},
+    { "_size_t","_uint",0},
+    { "_class_wxRealPoint","_wxRealPoint",0},
+    { "_wxPrinterDC","_class_wxPrinterDC",0},
+    { "_class_wxMenuItem","_wxMenuItem",0},
+    { "_class_wxPaintEvent","_wxPaintEvent",0},
+    { "_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0},
+    { "_class_wxStatusBar","_wxStatusBar",0},
+    { "_wxPanel","_class_wxPanel",0},
+    { "_wxInitDialogEvent","_class_wxInitDialogEvent",0},
+    { "_wxCheckBox","_class_wxCheckBox",0},
+    { "_wxPyEvent","_class_wxPyEvent",0},
+    { "_wxTextCtrl","_class_wxTextCtrl",0},
+    { "_class_wxMask","_wxMask",0},
+    { "_class_wxKeyEvent","_wxKeyEvent",0},
+    { "_wxColour","_class_wxColour",0},
+    { "_class_wxDialog","_wxDialog",0},
+    { "_wxIdleEvent","_class_wxIdleEvent",0},
+    { "_class_wxUpdateUIEvent","_wxUpdateUIEvent",0},
+    { "_wxToolBar","_class_wxToolBar",0},
+    { "_wxStaticLine","_class_wxStaticLine",0},
+    { "_wxBrush","_class_wxBrush",0},
+    { "_wxMiniFrame","_class_wxMiniFrame",0},
+    { "_wxShowEvent","_class_wxShowEvent",0},
+    { "_uint","_wxPrintQuality",0},
+    { "_uint","_size_t",0},
+    { "_uint","_unsigned_int",0},
+    { "_uint","_int",0},
+    { "_uint","_wxWindowID",0},
+    { "_class_wxEvent","_wxEvent",0},
+    { "_wxCheckListBox","_class_wxCheckListBox",0},
+    { "_wxRect","_class_wxRect",0},
+    { "_wxCommandEvent","_class_wxCommandEvent",0},
+    { "_wxSizeEvent","_class_wxSizeEvent",0},
+    { "_wxPoint","_class_wxPoint",0},
+    { "_class_wxButton","_wxButton",0},
+    { "_wxRadioBox","_class_wxRadioBox",0},
+    { "_wxBitmap","_class_wxBitmap",0},
+    { "_wxPyTimer","_class_wxPyTimer",0},
+    { "_wxWindowDC","_class_wxWindowDC",0},
+    { "_wxScrollBar","_class_wxScrollBar",0},
+    { "_wxSpinButton","_class_wxSpinButton",0},
+    { "_wxToolBarTool","_class_wxToolBarTool",0},
+    { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
+    { "_class_wxNotifyEvent","_wxNotifyEvent",0},
+    { "_class_wxPyEvent","_wxPyEvent",0},
+    { "_class_wxIconizeEvent","_wxIconizeEvent",0},
+    { "_class_wxStaticBitmap","_wxStaticBitmap",0},
+    { "_wxMDIChildFrame","_class_wxMDIChildFrame",0},
+    { "_class_wxToolBar","_wxToolBar",0},
+    { "_class_wxStaticLine","_wxStaticLine",0},
+    { "_wxScrollEvent","_class_wxScrollEvent",0},
+    { "_EBool","_wxPrintQuality",0},
+    { "_EBool","_signed_int",0},
+    { "_EBool","_int",0},
+    { "_EBool","_wxWindowID",0},
+    { "_class_wxRegion","_wxRegion",0},
+    { "_class_wxDropFilesEvent","_wxDropFilesEvent",0},
+    { "_wxStaticText","_class_wxStaticText",0},
+    { "_wxFont","_class_wxFont",0},
+    { "_wxCloseEvent","_class_wxCloseEvent",0},
+    { "_unsigned_long","_wxDash",0},
+    { "_unsigned_long","_long",0},
+    { "_class_wxRect","_wxRect",0},
+    { "_class_wxDC","_wxDC",0},
+    { "_wxMDIParentFrame","_class_wxMDIParentFrame",0},
+    { "_class_wxPyTimer","_wxPyTimer",0},
+    { "_wxFocusEvent","_class_wxFocusEvent",0},
+    { "_wxMaximizeEvent","_class_wxMaximizeEvent",0},
+    { "_class_wxSpinButton","_wxSpinButton",0},
+    { "_wxAcceleratorEntry","_class_wxAcceleratorEntry",0},
+    { "_class_wxPanel","_wxPanel",0},
+    { "_class_wxCheckBox","_wxCheckBox",0},
+    { "_wxComboBox","_class_wxComboBox",0},
+    { "_wxRadioButton","_class_wxRadioButton",0},
+    { "_signed_int","_wxPrintQuality",0},
+    { "_signed_int","_EBool",0},
+    { "_signed_int","_wxWindowID",0},
+    { "_signed_int","_int",0},
+    { "_class_wxTextCtrl","_wxTextCtrl",0},
+    { "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
+    { "_wxMetaFileDC","_class_wxMetaFileDC",0},
+    { "_wxMenu","_class_wxMenu",0},
+    { "_class_wxMoveEvent","_wxMoveEvent",0},
+    { "_wxListBox","_class_wxListBox",0},
+    { "_wxScreenDC","_class_wxScreenDC",0},
+    { "_class_wxMDIChildFrame","_wxMDIChildFrame",0},
+    { "_WXTYPE","_short",0},
+    { "_WXTYPE","_signed_short",0},
+    { "_WXTYPE","_unsigned_short",0},
+    { "_class_wxMDIClientWindow","_wxMDIClientWindow",0},
+    { "_class_wxBrush","_wxBrush",0},
+    { "_unsigned_short","_WXTYPE",0},
+    { "_unsigned_short","_short",0},
+    { "_class_wxWindow","_class_wxMDIClientWindow",SwigwxMDIClientWindowTowxWindow},
+    { "_class_wxWindow","_wxMDIClientWindow",SwigwxMDIClientWindowTowxWindow},
+    { "_class_wxWindow","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxWindow},
+    { "_class_wxWindow","_wxMDIChildFrame",SwigwxMDIChildFrameTowxWindow},
+    { "_class_wxWindow","_class_wxMDIParentFrame",SwigwxMDIParentFrameTowxWindow},
+    { "_class_wxWindow","_wxMDIParentFrame",SwigwxMDIParentFrameTowxWindow},
+    { "_class_wxWindow","_wxWindow",0},
+    { "_class_wxStaticText","_wxStaticText",0},
+    { "_class_wxFont","_wxFont",0},
+    { "_class_wxCloseEvent","_wxCloseEvent",0},
+    { "_class_wxMenuEvent","_wxMenuEvent",0},
+    { "_wxClientDC","_class_wxClientDC",0},
+    { "_wxMouseEvent","_class_wxMouseEvent",0},
+    { "_class_wxPoint","_wxPoint",0},
+    { "_wxRealPoint","_class_wxRealPoint",0},
+    { "_class_wxRadioBox","_wxRadioBox",0},
+    { "_signed_short","_WXTYPE",0},
+    { "_signed_short","_short",0},
+    { "_wxMemoryDC","_class_wxMemoryDC",0},
+    { "_wxPaintDC","_class_wxPaintDC",0},
+    { "_class_wxWindowDC","_wxWindowDC",0},
+    { "_class_wxFocusEvent","_wxFocusEvent",0},
+    { "_class_wxMaximizeEvent","_wxMaximizeEvent",0},
+    { "_wxStatusBar","_class_wxStatusBar",0},
+    { "_class_wxToolBarTool","_wxToolBarTool",0},
+    { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
+    { "_class_wxCursor","_wxCursor",0},
+    { "_wxScrolledWindow","_class_wxScrolledWindow",0},
+    { "_unsigned_char","_byte",0},
+    { "_class_wxMetaFileDC","_wxMetaFileDC",0},
+    { "_class_wxMenu","_wxMenu",0},
+    { "_wxControl","_class_wxControl",0},
+    { "_class_wxListBox","_wxListBox",0},
+    { "_unsigned_int","_wxPrintQuality",0},
+    { "_unsigned_int","_size_t",0},
+    { "_unsigned_int","_uint",0},
+    { "_unsigned_int","_wxWindowID",0},
+    { "_unsigned_int","_int",0},
+    { "_wxIcon","_class_wxIcon",0},
+    { "_wxDialog","_class_wxDialog",0},
+    { "_class_wxPen","_wxPen",0},
+    { "_short","_WXTYPE",0},
+    { "_short","_unsigned_short",0},
+    { "_short","_signed_short",0},
+    { "_class_wxStaticBox","_wxStaticBox",0},
+    { "_class_wxScrollEvent","_wxScrollEvent",0},
+    { "_wxJoystickEvent","_class_wxJoystickEvent",0},
+    { "_class_wxChoice","_wxChoice",0},
+    { "_class_wxSlider","_wxSlider",0},
+    { "_class_wxImageList","_wxImageList",0},
+    { "_class_wxBitmapButton","_wxBitmapButton",0},
+    { "_wxFrame","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxFrame},
+    { "_wxFrame","_wxMDIChildFrame",SwigwxMDIChildFrameTowxFrame},
+    { "_wxFrame","_class_wxMDIParentFrame",SwigwxMDIParentFrameTowxFrame},
+    { "_wxFrame","_wxMDIParentFrame",SwigwxMDIParentFrameTowxFrame},
+    { "_wxFrame","_class_wxFrame",0},
+    { "_wxWindowID","_wxPrintQuality",0},
+    { "_wxWindowID","_size_t",0},
+    { "_wxWindowID","_EBool",0},
+    { "_wxWindowID","_uint",0},
+    { "_wxWindowID","_int",0},
+    { "_wxWindowID","_signed_int",0},
+    { "_wxWindowID","_unsigned_int",0},
+    { "_int","_wxPrintQuality",0},
+    { "_int","_size_t",0},
+    { "_int","_EBool",0},
+    { "_int","_uint",0},
+    { "_int","_wxWindowID",0},
+    { "_int","_unsigned_int",0},
+    { "_int","_signed_int",0},
+    { "_class_wxMouseEvent","_wxMouseEvent",0},
+    { "_class_wxSpinEvent","_wxSpinEvent",0},
+    { "_wxButton","_class_wxButton",0},
+    { "_wxSize","_class_wxSize",0},
+    { "_wxRegionIterator","_class_wxRegionIterator",0},
+    { "_class_wxPrinterDC","_wxPrinterDC",0},
+    { "_class_wxMDIParentFrame","_wxMDIParentFrame",0},
+    { "_class_wxPaintDC","_wxPaintDC",0},
+    { "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0},
+    { "_class_wxInitDialogEvent","_wxInitDialogEvent",0},
+    { "_class_wxComboBox","_wxComboBox",0},
+    { "_class_wxRadioButton","_wxRadioButton",0},
+    { "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
+    { "_wxIconizeEvent","_class_wxIconizeEvent",0},
+    { "_class_wxControl","_wxControl",0},
+    { "_wxStaticBitmap","_class_wxStaticBitmap",0},
+    { "_class_wxIcon","_wxIcon",0},
+    { "_class_wxColour","_wxColour",0},
+    { "_class_wxScreenDC","_wxScreenDC",0},
+    { "_wxPalette","_class_wxPalette",0},
+    { "_class_wxIdleEvent","_wxIdleEvent",0},
+    { "_wxEraseEvent","_class_wxEraseEvent",0},
+    { "_class_wxJoystickEvent","_wxJoystickEvent",0},
+    { "_class_wxMiniFrame","_wxMiniFrame",0},
+    { "_wxRegion","_class_wxRegion",0},
+    { "_class_wxShowEvent","_wxShowEvent",0},
+    { "_wxActivateEvent","_class_wxActivateEvent",0},
+    { "_wxGauge","_class_wxGauge",0},
+    { "_class_wxCheckListBox","_wxCheckListBox",0},
+    { "_class_wxCommandEvent","_wxCommandEvent",0},
+    { "_class_wxClientDC","_wxClientDC",0},
+    { "_class_wxSizeEvent","_wxSizeEvent",0},
+    { "_class_wxSize","_wxSize",0},
+    { "_class_wxBitmap","_wxBitmap",0},
+    { "_class_wxMemoryDC","_wxMemoryDC",0},
+    { "_wxMenuBar","_class_wxMenuBar",0},
+    { "_wxEvtHandler","_class_wxMDIClientWindow",SwigwxMDIClientWindowTowxEvtHandler},
+    { "_wxEvtHandler","_wxMDIClientWindow",SwigwxMDIClientWindowTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxEvtHandler},
+    { "_wxEvtHandler","_wxMDIChildFrame",SwigwxMDIChildFrameTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxMDIParentFrame",SwigwxMDIParentFrameTowxEvtHandler},
+    { "_wxEvtHandler","_wxMDIParentFrame",SwigwxMDIParentFrameTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxEvtHandler",0},
+    { "_wxMenuItem","_class_wxMenuItem",0},
+    { "_class_wxScrollBar","_wxScrollBar",0},
+    { "_wxDash","_unsigned_long",0},
+    { "_wxDash","_long",0},
+    { "_class_wxScrolledWindow","_wxScrolledWindow",0},
+    { "_wxKeyEvent","_class_wxKeyEvent",0},
+    { "_wxMoveEvent","_class_wxMoveEvent",0},
+    { "_class_wxPalette","_wxPalette",0},
+    { "_class_wxEraseEvent","_wxEraseEvent",0},
+    { "_wxMDIClientWindow","_class_wxMDIClientWindow",0},
+    { "_wxWindow","_class_wxMDIClientWindow",SwigwxMDIClientWindowTowxWindow},
+    { "_wxWindow","_wxMDIClientWindow",SwigwxMDIClientWindowTowxWindow},
+    { "_wxWindow","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxWindow},
+    { "_wxWindow","_wxMDIChildFrame",SwigwxMDIChildFrameTowxWindow},
+    { "_wxWindow","_class_wxMDIParentFrame",SwigwxMDIParentFrameTowxWindow},
+    { "_wxWindow","_wxMDIParentFrame",SwigwxMDIParentFrameTowxWindow},
+    { "_wxWindow","_class_wxWindow",0},
+    { "_class_wxFrame","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxFrame},
+    { "_class_wxFrame","_wxMDIChildFrame",SwigwxMDIChildFrameTowxFrame},
+    { "_class_wxFrame","_class_wxMDIParentFrame",SwigwxMDIParentFrameTowxFrame},
+    { "_class_wxFrame","_wxMDIParentFrame",SwigwxMDIParentFrameTowxFrame},
+    { "_class_wxFrame","_wxFrame",0},
+{0,0,0}};
+

 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif
 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif

-SWIGEXPORT(void,initmdic)() {
+SWIGEXPORT(void) initmdic() {

         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("mdic", mdicMethods);
         d = PyModule_GetDict(m);
         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("mdic", mdicMethods);
         d = PyModule_GetDict(m);

-/*
- * These are the pointer type-equivalency mappings. 
- * (Used by the SWIG pointer type-checker).
- */
-        SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_wxEvent","_class_wxEvent",0);
-        SWIG_RegisterMapping("_class_wxActivateEvent","_wxActivateEvent",0);
-        SWIG_RegisterMapping("_signed_long","_long",0);
-        SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_signed_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_unsigned_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_wxWindowID",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_uint",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_EBool",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_size_t",0);
-        SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
-        SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxMDIClientWindow",SwigwxMDIClientWindowTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxMDIClientWindow",SwigwxMDIClientWindowTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxMDIChildFrame",SwigwxMDIChildFrameTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxMDIParentFrame",SwigwxMDIParentFrameTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxMDIParentFrame",SwigwxMDIParentFrameTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxEvtHandler",0);
-        SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
-        SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
-        SWIG_RegisterMapping("_wxNotifyEvent","_class_wxNotifyEvent",0);
-        SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
-        SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
-        SWIG_RegisterMapping("_wxUpdateUIEvent","_class_wxUpdateUIEvent",0);
-        SWIG_RegisterMapping("_byte","_unsigned_char",0);
-        SWIG_RegisterMapping("_wxStaticBox","_class_wxStaticBox",0);
-        SWIG_RegisterMapping("_wxChoice","_class_wxChoice",0);
-        SWIG_RegisterMapping("_wxSlider","_class_wxSlider",0);
-        SWIG_RegisterMapping("_long","_wxDash",0);
-        SWIG_RegisterMapping("_long","_unsigned_long",0);
-        SWIG_RegisterMapping("_long","_signed_long",0);
-        SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0);
-        SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0);
-        SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_class_wxGauge","_wxGauge",0);
-        SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
-        SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0);
-        SWIG_RegisterMapping("_size_t","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_size_t","_unsigned_int",0);
-        SWIG_RegisterMapping("_size_t","_int",0);
-        SWIG_RegisterMapping("_size_t","_wxWindowID",0);
-        SWIG_RegisterMapping("_size_t","_uint",0);
-        SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
-        SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0);
-        SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0);
-        SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0);
-        SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0);
-        SWIG_RegisterMapping("_class_wxStatusBar","_wxStatusBar",0);
-        SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);
-        SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
-        SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
-        SWIG_RegisterMapping("_wxPyEvent","_class_wxPyEvent",0);
-        SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);
-        SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
-        SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0);
-        SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
-        SWIG_RegisterMapping("_class_wxDialog","_wxDialog",0);
-        SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0);
-        SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0);
-        SWIG_RegisterMapping("_wxToolBar","_class_wxToolBar",0);
-        SWIG_RegisterMapping("_wxStaticLine","_class_wxStaticLine",0);
-        SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
-        SWIG_RegisterMapping("_wxMiniFrame","_class_wxMiniFrame",0);
-        SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0);
-        SWIG_RegisterMapping("_uint","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_uint","_size_t",0);
-        SWIG_RegisterMapping("_uint","_unsigned_int",0);
-        SWIG_RegisterMapping("_uint","_int",0);
-        SWIG_RegisterMapping("_uint","_wxWindowID",0);
-        SWIG_RegisterMapping("_class_wxEvent","_wxEvent",0);
-        SWIG_RegisterMapping("_wxCheckListBox","_class_wxCheckListBox",0);
-        SWIG_RegisterMapping("_wxRect","_class_wxRect",0);
-        SWIG_RegisterMapping("_wxCommandEvent","_class_wxCommandEvent",0);
-        SWIG_RegisterMapping("_wxSizeEvent","_class_wxSizeEvent",0);
-        SWIG_RegisterMapping("_wxPoint","_class_wxPoint",0);
-        SWIG_RegisterMapping("_class_wxButton","_wxButton",0);
-        SWIG_RegisterMapping("_wxRadioBox","_class_wxRadioBox",0);
-        SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
-        SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0);
-        SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0);
-        SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0);
-        SWIG_RegisterMapping("_wxToolBarTool","_class_wxToolBarTool",0);
-        SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_class_wxNotifyEvent","_wxNotifyEvent",0);
-        SWIG_RegisterMapping("_class_wxPyEvent","_wxPyEvent",0);
-        SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
-        SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
-        SWIG_RegisterMapping("_wxMDIChildFrame","_class_wxMDIChildFrame",0);
-        SWIG_RegisterMapping("_class_wxToolBar","_wxToolBar",0);
-        SWIG_RegisterMapping("_class_wxStaticLine","_wxStaticLine",0);
-        SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0);
-        SWIG_RegisterMapping("_EBool","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_EBool","_signed_int",0);
-        SWIG_RegisterMapping("_EBool","_int",0);
-        SWIG_RegisterMapping("_EBool","_wxWindowID",0);
-        SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
-        SWIG_RegisterMapping("_class_wxDropFilesEvent","_wxDropFilesEvent",0);
-        SWIG_RegisterMapping("_wxStaticText","_class_wxStaticText",0);
-        SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
-        SWIG_RegisterMapping("_wxCloseEvent","_class_wxCloseEvent",0);
-        SWIG_RegisterMapping("_unsigned_long","_wxDash",0);
-        SWIG_RegisterMapping("_unsigned_long","_long",0);
-        SWIG_RegisterMapping("_class_wxRect","_wxRect",0);
-        SWIG_RegisterMapping("_class_wxDC","_wxDC",0);
-        SWIG_RegisterMapping("_wxMDIParentFrame","_class_wxMDIParentFrame",0);
-        SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxFocusEvent","_class_wxFocusEvent",0);
-        SWIG_RegisterMapping("_wxMaximizeEvent","_class_wxMaximizeEvent",0);
-        SWIG_RegisterMapping("_class_wxSpinButton","_wxSpinButton",0);
-        SWIG_RegisterMapping("_wxAcceleratorEntry","_class_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_class_wxPanel","_wxPanel",0);
-        SWIG_RegisterMapping("_class_wxCheckBox","_wxCheckBox",0);
-        SWIG_RegisterMapping("_wxComboBox","_class_wxComboBox",0);
-        SWIG_RegisterMapping("_wxRadioButton","_class_wxRadioButton",0);
-        SWIG_RegisterMapping("_signed_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_signed_int","_EBool",0);
-        SWIG_RegisterMapping("_signed_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_signed_int","_int",0);
-        SWIG_RegisterMapping("_class_wxTextCtrl","_wxTextCtrl",0);
-        SWIG_RegisterMapping("_wxLayoutConstraints","_class_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_wxMetaFileDC","_class_wxMetaFileDC",0);
-        SWIG_RegisterMapping("_wxMenu","_class_wxMenu",0);
-        SWIG_RegisterMapping("_class_wxMoveEvent","_wxMoveEvent",0);
-        SWIG_RegisterMapping("_wxListBox","_class_wxListBox",0);
-        SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0);
-        SWIG_RegisterMapping("_class_wxMDIChildFrame","_wxMDIChildFrame",0);
-        SWIG_RegisterMapping("_WXTYPE","_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_signed_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_unsigned_short",0);
-        SWIG_RegisterMapping("_class_wxMDIClientWindow","_wxMDIClientWindow",0);
-        SWIG_RegisterMapping("_class_wxBrush","_wxBrush",0);
-        SWIG_RegisterMapping("_unsigned_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_unsigned_short","_short",0);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxMDIClientWindow",SwigwxMDIClientWindowTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxMDIClientWindow",SwigwxMDIClientWindowTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxMDIChildFrame",SwigwxMDIChildFrameTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxMDIParentFrame",SwigwxMDIParentFrameTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxMDIParentFrame",SwigwxMDIParentFrameTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxWindow",0);
-        SWIG_RegisterMapping("_class_wxStaticText","_wxStaticText",0);
-        SWIG_RegisterMapping("_class_wxFont","_wxFont",0);
-        SWIG_RegisterMapping("_class_wxCloseEvent","_wxCloseEvent",0);
-        SWIG_RegisterMapping("_class_wxMenuEvent","_wxMenuEvent",0);
-        SWIG_RegisterMapping("_wxClientDC","_class_wxClientDC",0);
-        SWIG_RegisterMapping("_wxMouseEvent","_class_wxMouseEvent",0);
-        SWIG_RegisterMapping("_class_wxPoint","_wxPoint",0);
-        SWIG_RegisterMapping("_wxRealPoint","_class_wxRealPoint",0);
-        SWIG_RegisterMapping("_class_wxRadioBox","_wxRadioBox",0);
-        SWIG_RegisterMapping("_signed_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_signed_short","_short",0);
-        SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0);
-        SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
-        SWIG_RegisterMapping("_class_wxWindowDC","_wxWindowDC",0);
-        SWIG_RegisterMapping("_class_wxFocusEvent","_wxFocusEvent",0);
-        SWIG_RegisterMapping("_class_wxMaximizeEvent","_wxMaximizeEvent",0);
-        SWIG_RegisterMapping("_wxStatusBar","_class_wxStatusBar",0);
-        SWIG_RegisterMapping("_class_wxToolBarTool","_wxToolBarTool",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
-        SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0);
-        SWIG_RegisterMapping("_unsigned_char","_byte",0);
-        SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0);
-        SWIG_RegisterMapping("_class_wxMenu","_wxMenu",0);
-        SWIG_RegisterMapping("_wxControl","_class_wxControl",0);
-        SWIG_RegisterMapping("_class_wxListBox","_wxListBox",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_unsigned_int","_size_t",0);
-        SWIG_RegisterMapping("_unsigned_int","_uint",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_unsigned_int","_int",0);
-        SWIG_RegisterMapping("_wxIcon","_class_wxIcon",0);
-        SWIG_RegisterMapping("_wxDialog","_class_wxDialog",0);
-        SWIG_RegisterMapping("_class_wxPen","_wxPen",0);
-        SWIG_RegisterMapping("_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_short","_unsigned_short",0);
-        SWIG_RegisterMapping("_short","_signed_short",0);
-        SWIG_RegisterMapping("_class_wxStaticBox","_wxStaticBox",0);
-        SWIG_RegisterMapping("_class_wxScrollEvent","_wxScrollEvent",0);
-        SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0);
-        SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
-        SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);
-        SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0);
-        SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
-        SWIG_RegisterMapping("_wxFrame","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxFrame);
-        SWIG_RegisterMapping("_wxFrame","_wxMDIChildFrame",SwigwxMDIChildFrameTowxFrame);
-        SWIG_RegisterMapping("_wxFrame","_class_wxMDIParentFrame",SwigwxMDIParentFrameTowxFrame);
-        SWIG_RegisterMapping("_wxFrame","_wxMDIParentFrame",SwigwxMDIParentFrameTowxFrame);
-        SWIG_RegisterMapping("_wxFrame","_class_wxFrame",0);
-        SWIG_RegisterMapping("_wxWindowID","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_wxWindowID","_size_t",0);
-        SWIG_RegisterMapping("_wxWindowID","_EBool",0);
-        SWIG_RegisterMapping("_wxWindowID","_uint",0);
-        SWIG_RegisterMapping("_wxWindowID","_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_signed_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_int","_size_t",0);
-        SWIG_RegisterMapping("_int","_EBool",0);
-        SWIG_RegisterMapping("_int","_uint",0);
-        SWIG_RegisterMapping("_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_int","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_signed_int",0);
-        SWIG_RegisterMapping("_class_wxMouseEvent","_wxMouseEvent",0);
-        SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0);
-        SWIG_RegisterMapping("_wxButton","_class_wxButton",0);
-        SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
-        SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
-        SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
-        SWIG_RegisterMapping("_class_wxMDIParentFrame","_wxMDIParentFrame",0);
-        SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
-        SWIG_RegisterMapping("_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0);
-        SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0);
-        SWIG_RegisterMapping("_class_wxComboBox","_wxComboBox",0);
-        SWIG_RegisterMapping("_class_wxRadioButton","_wxRadioButton",0);
-        SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_wxIconizeEvent","_class_wxIconizeEvent",0);
-        SWIG_RegisterMapping("_class_wxControl","_wxControl",0);
-        SWIG_RegisterMapping("_wxStaticBitmap","_class_wxStaticBitmap",0);
-        SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
-        SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
-        SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
-        SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
-        SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0);
-        SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
-        SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
-        SWIG_RegisterMapping("_class_wxMiniFrame","_wxMiniFrame",0);
-        SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
-        SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
-        SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
-        SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0);
-        SWIG_RegisterMapping("_class_wxCheckListBox","_wxCheckListBox",0);
-        SWIG_RegisterMapping("_class_wxCommandEvent","_wxCommandEvent",0);
-        SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
-        SWIG_RegisterMapping("_class_wxSizeEvent","_wxSizeEvent",0);
-        SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
-        SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0);
-        SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0);
-        SWIG_RegisterMapping("_wxMenuBar","_class_wxMenuBar",0);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxMDIClientWindow",SwigwxMDIClientWindowTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxMDIClientWindow",SwigwxMDIClientWindowTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxMDIChildFrame",SwigwxMDIChildFrameTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxMDIParentFrame",SwigwxMDIParentFrameTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxMDIParentFrame",SwigwxMDIParentFrameTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxEvtHandler",0);
-        SWIG_RegisterMapping("_wxMenuItem","_class_wxMenuItem",0);
-        SWIG_RegisterMapping("_class_wxScrollBar","_wxScrollBar",0);
-        SWIG_RegisterMapping("_wxDash","_unsigned_long",0);
-        SWIG_RegisterMapping("_wxDash","_long",0);
-        SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
-        SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0);
-        SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0);
-        SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
-        SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0);
-        SWIG_RegisterMapping("_wxMDIClientWindow","_class_wxMDIClientWindow",0);
-        SWIG_RegisterMapping("_wxWindow","_class_wxMDIClientWindow",SwigwxMDIClientWindowTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxMDIClientWindow",SwigwxMDIClientWindowTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxMDIChildFrame",SwigwxMDIChildFrameTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxMDIParentFrame",SwigwxMDIParentFrameTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxMDIParentFrame",SwigwxMDIParentFrameTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxWindow",0);
-        SWIG_RegisterMapping("_class_wxFrame","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxFrame);
-        SWIG_RegisterMapping("_class_wxFrame","_wxMDIChildFrame",SwigwxMDIChildFrameTowxFrame);
-        SWIG_RegisterMapping("_class_wxFrame","_class_wxMDIParentFrame",SwigwxMDIParentFrameTowxFrame);
-        SWIG_RegisterMapping("_class_wxFrame","_wxMDIParentFrame",SwigwxMDIParentFrameTowxFrame);
-        SWIG_RegisterMapping("_class_wxFrame","_wxFrame",0);
+{
+   int i;
+   for (i = 0; _swig_mapping[i].n1; i++)
+        SWIG_RegisterMapping(_swig_mapping[i].n1,_swig_mapping[i].n2,_swig_mapping[i].pcnv);
+}

 }
 }

diff --git a/utils/wxPython/src/msw/mdi.py b/utils/wxPython/src/msw/mdi.py
index 1bc1b3c689e8f93fef37abdbb4e988591eb10155..e2bbea43bd6ec03b21b9adb3d59a5ea9c9e53df3 100644 (file)
--- a/utils/wxPython/src/msw/mdi.py
+++ b/utils/wxPython/src/msw/mdi.py
@@ -19,47 +19,41 @@ class wxMDIParentFramePtr(wxFramePtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def ActivateNext(self):
-        val = mdic.wxMDIParentFrame_ActivateNext(self.this)
+    def ActivateNext(self, *_args, **_kwargs):
+        val = apply(mdic.wxMDIParentFrame_ActivateNext,(self,) + _args, _kwargs)

         return val
         return val

-    def ActivatePrevious(self):
-        val = mdic.wxMDIParentFrame_ActivatePrevious(self.this)
+    def ActivatePrevious(self, *_args, **_kwargs):
+        val = apply(mdic.wxMDIParentFrame_ActivatePrevious,(self,) + _args, _kwargs)

         return val
         return val

-    def ArrangeIcons(self):
-        val = mdic.wxMDIParentFrame_ArrangeIcons(self.this)
+    def ArrangeIcons(self, *_args, **_kwargs):
+        val = apply(mdic.wxMDIParentFrame_ArrangeIcons,(self,) + _args, _kwargs)

         return val
         return val

-    def Cascade(self):
-        val = mdic.wxMDIParentFrame_Cascade(self.this)
+    def Cascade(self, *_args, **_kwargs):
+        val = apply(mdic.wxMDIParentFrame_Cascade,(self,) + _args, _kwargs)

         return val
         return val

-    def GetActiveChild(self):
-        val = mdic.wxMDIParentFrame_GetActiveChild(self.this)
-        val = wxMDIChildFramePtr(val)
+    def GetActiveChild(self, *_args, **_kwargs):
+        val = apply(mdic.wxMDIParentFrame_GetActiveChild,(self,) + _args, _kwargs)
+        if val: val = wxMDIChildFramePtr(val) 

         return val
         return val

-    def GetClientWindow(self):
-        val = mdic.wxMDIParentFrame_GetClientWindow(self.this)
-        val = wxMDIClientWindowPtr(val)
+    def GetClientWindow(self, *_args, **_kwargs):
+        val = apply(mdic.wxMDIParentFrame_GetClientWindow,(self,) + _args, _kwargs)
+        if val: val = wxMDIClientWindowPtr(val) 

         return val
         return val

-    def GetToolBar(self):
-        val = mdic.wxMDIParentFrame_GetToolBar(self.this)
-        val = wxWindowPtr(val)
+    def GetToolBar(self, *_args, **_kwargs):
+        val = apply(mdic.wxMDIParentFrame_GetToolBar,(self,) + _args, _kwargs)
+        if val: val = wxWindowPtr(val) 

         return val
         return val

-    def SetToolBar(self,arg0):
-        val = mdic.wxMDIParentFrame_SetToolBar(self.this,arg0.this)
+    def SetToolBar(self, *_args, **_kwargs):
+        val = apply(mdic.wxMDIParentFrame_SetToolBar,(self,) + _args, _kwargs)

         return val
         return val

-    def Tile(self):
-        val = mdic.wxMDIParentFrame_Tile(self.this)
+    def Tile(self, *_args, **_kwargs):
+        val = apply(mdic.wxMDIParentFrame_Tile,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxMDIParentFrame instance>"
+        return "<C wxMDIParentFrame instance at %s>" % (self.this,)

 class wxMDIParentFrame(wxMDIParentFramePtr):
 class wxMDIParentFrame(wxMDIParentFramePtr):

-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(mdic.new_wxMDIParentFrame,(arg0.this,arg1,arg2,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(mdic.new_wxMDIParentFrame,_args,_kwargs)

         self.thisown = 1
         wx._StdFrameCallbacks(self)
 
         self.thisown = 1
         wx._StdFrameCallbacks(self)
 


@@ -70,26 +64,20 @@ class wxMDIChildFramePtr(wxFramePtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def Activate(self):
-        val = mdic.wxMDIChildFrame_Activate(self.this)
+    def Activate(self, *_args, **_kwargs):
+        val = apply(mdic.wxMDIChildFrame_Activate,(self,) + _args, _kwargs)

         return val
         return val

-    def Maximize(self,arg0):
-        val = mdic.wxMDIChildFrame_Maximize(self.this,arg0)
+    def Maximize(self, *_args, **_kwargs):
+        val = apply(mdic.wxMDIChildFrame_Maximize,(self,) + _args, _kwargs)

         return val
         return val

-    def Restore(self):
-        val = mdic.wxMDIChildFrame_Restore(self.this)
+    def Restore(self, *_args, **_kwargs):
+        val = apply(mdic.wxMDIChildFrame_Restore,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxMDIChildFrame instance>"
+        return "<C wxMDIChildFrame instance at %s>" % (self.this,)

 class wxMDIChildFrame(wxMDIChildFramePtr):
 class wxMDIChildFrame(wxMDIChildFramePtr):

-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(mdic.new_wxMDIChildFrame,(arg0.this,arg1,arg2,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(mdic.new_wxMDIChildFrame,_args,_kwargs)

         self.thisown = 1
         wx._StdFrameCallbacks(self)
 
         self.thisown = 1
         wx._StdFrameCallbacks(self)
 


@@ -101,10 +89,10 @@ class wxMDIClientWindowPtr(wxWindowPtr):
         self.this = this
         self.thisown = 0
     def __repr__(self):
         self.this = this
         self.thisown = 0
     def __repr__(self):

-        return "<C wxMDIClientWindow instance>"
+        return "<C wxMDIClientWindow instance at %s>" % (self.this,)

 class wxMDIClientWindow(wxMDIClientWindowPtr):
 class wxMDIClientWindow(wxMDIClientWindowPtr):

-    def __init__(self,arg0,*args) :
-        self.this = apply(mdic.new_wxMDIClientWindow,(arg0.this,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(mdic.new_wxMDIClientWindow,_args,_kwargs)

         self.thisown = 1
         wx._StdWindowCallbacks(self)
         wx._StdOnScrollCallbacks(self)
         self.thisown = 1
         wx._StdWindowCallbacks(self)
         wx._StdOnScrollCallbacks(self)

diff --git a/utils/wxPython/src/msw/misc.cpp b/utils/wxPython/src/msw/misc.cpp
index 1c9b1dcebe265d4e35ee4c82d60960750c3e7cb4..8daa610a092eda991c9d9178181ca2d689834209 100644 (file)
--- a/utils/wxPython/src/msw/misc.cpp
+++ b/utils/wxPython/src/msw/misc.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)

- * Version 1.1 (Patch 5)
+ * Version 1.1 (Patch 6)

  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.


@@ -24,16 +24,16 @@
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)

-#      define SWIGEXPORT(a,b) __declspec(dllexport) a b
+#      define SWIGEXPORT(a) __declspec(dllexport) a

 #   else
 #      if defined(__BORLANDC__)
 #   else
 #      if defined(__BORLANDC__)

-#          define SWIGEXPORT(a,b) a _export b
+#          define SWIGEXPORT(a) a _export 

 #      else
 #      else

-#          define SWIGEXPORT(a,b) a b
+#          define SWIGEXPORT(a) a 

 #      endif
 #   endif
 #else
 #      endif
 #   endif
 #else

-#   define SWIGEXPORT(a,b) a b
+#   define SWIGEXPORT(a) a 

 #endif
 
 #ifdef __cplusplus
 #endif
 
 #ifdef __cplusplus


@@ -43,12 +43,12 @@ extern "C" {
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);

+extern char *SWIG_GetPtrObj(PyObject *, void **, char *);

 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif
 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif

-

 #define SWIG_init    initmiscc
 
 #define SWIG_name    "miscc"
 #define SWIG_init    initmiscc
 
 #define SWIG_name    "miscc"


@@ -59,12 +59,13 @@ extern PyObject *SWIG_newvarlink(void);
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;

-    if (!target) {
+    PyObject*   o3;
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);
         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);


@@ -81,23 +82,23 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
     PyObject*   o3;
 
     PyObject*   o2;
     PyObject*   o3;
 

-    if (!target) {
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }
         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }

-        o3 = PyTuple_New(1);
-        PyTuple_SetItem(o3, 0, o);
+        o3 = PyTuple_New(1);            
+        PyTuple_SetItem(o3, 0, o);      

 
         o2 = target;
 
         o2 = target;

-        target = PySequence_Concat(o2, o3);
-        Py_DECREF(o2);
+        target = PySequence_Concat(o2, o3); 
+        Py_DECREF(o2);                      

         Py_DECREF(o3);
     }
     return target;
         Py_DECREF(o3);
     }
     return target;


@@ -134,25 +135,29 @@ static char* wxStringErrorMsg = "string type is required for parameter";
     int wxSystemSettings_GetSystemMetric(int index) {
         return wxSystemSettings::GetSystemMetric(index);
     }
     int wxSystemSettings_GetSystemMetric(int index) {
         return wxSystemSettings::GetSystemMetric(index);
     }

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

 static PyObject *_wrap_wxFileSelector(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     char * _arg0;
 static PyObject *_wrap_wxFileSelector(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     char * _arg0;

-    char * _arg1 = NULL;
-    char * _arg2 = NULL;
-    char * _arg3 = NULL;
-    char * _arg4 = "*.*";
-    int  _arg5 = 0;
-    wxWindow * _arg6 = NULL;
-    int  _arg7 = -1;
-    int  _arg8 = -1;
-    char * _argc6 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"s|ssssisii:wxFileSelector",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_argc6,&_arg7,&_arg8)) 
-        return NULL;
-    if (_argc6) {
-        if (SWIG_GetPtr(_argc6,(void **) &_arg6,"_wxWindow_p")) {
+    char * _arg1 = (char *) NULL;
+    char * _arg2 = (char *) NULL;
+    char * _arg3 = (char *) NULL;
+    char * _arg4 = (char *) "*.*";
+    int  _arg5 = (int ) 0;
+    wxWindow * _arg6 = (wxWindow *) NULL;
+    int  _arg7 = (int ) -1;
+    int  _arg8 = (int ) -1;
+    PyObject * _argo6 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s|ssssiOii:wxFileSelector",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_argo6,&_arg7,&_arg8)) 
+        return NULL;
+    if (_argo6) {
+        if (_argo6 == Py_None) { _arg6 = NULL; }
+        else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of wxFileSelector. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of wxFileSelector. Expected _wxWindow_p.");
         return NULL;
         }


@@ -175,20 +180,20 @@ static PyObject *_wrap_wxGetTextFromUser(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxString * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxString * _arg0;

-    wxString * _arg1 = &wxPyEmptyStr;
-    wxString * _arg2 = &wxPyEmptyStr;
-    wxWindow * _arg3 = NULL;
-    int  _arg4 = -1;
-    int  _arg5 = -1;
-    bool  _arg6 = (1);
+    wxString * _arg1 = (wxString *) &wxPyEmptyStr;
+    wxString * _arg2 = (wxString *) &wxPyEmptyStr;
+    wxWindow * _arg3 = (wxWindow *) NULL;
+    int  _arg4 = (int ) -1;
+    int  _arg5 = (int ) -1;
+    bool  _arg6 = (bool ) TRUE;

     PyObject * _obj0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;
     PyObject * _obj0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;

-    char * _argc3 = 0;
-    int tempbool6;
+    PyObject * _argo3 = 0;
+    int tempbool6 = (int) TRUE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"O|OOsiii:wxGetTextFromUser",&_obj0,&_obj1,&_obj2,&_argc3,&_arg4,&_arg5,&tempbool6)) 
+    if(!PyArg_ParseTuple(args,"O|OOOiii:wxGetTextFromUser",&_obj0,&_obj1,&_obj2,&_argo3,&_arg4,&_arg5,&tempbool6)) 

         return NULL;
 {
     if (!PyString_Check(_obj0)) {
         return NULL;
 {
     if (!PyString_Check(_obj0)) {


@@ -213,8 +218,9 @@ static PyObject *_wrap_wxGetTextFromUser(PyObject *self, PyObject *args) {
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxWindow_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxGetTextFromUser. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxGetTextFromUser. Expected _wxWindow_p.");
         return NULL;
         }


@@ -253,20 +259,20 @@ static PyObject *_wrap_wxGetSingleChoice(PyObject *self, PyObject *args) {
     wxString * _arg1;
     int  _arg2;
     wxString * _arg3;
     wxString * _arg1;
     int  _arg2;
     wxString * _arg3;

-    wxWindow * _arg4 = NULL;
-    int  _arg5 = -1;
-    int  _arg6 = -1;
-    bool  _arg7 = (1);
-    int  _arg8 = 150;
-    int  _arg9 = 200;
+    wxWindow * _arg4 = (wxWindow *) NULL;
+    int  _arg5 = (int ) -1;
+    int  _arg6 = (int ) -1;
+    bool  _arg7 = (bool ) TRUE;
+    int  _arg8 = (int ) 150;
+    int  _arg9 = (int ) 200;

     PyObject * _obj0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _obj3 = 0;
     PyObject * _obj0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _obj3 = 0;

-    char * _argc4 = 0;
-    int tempbool7;
+    PyObject * _argo4 = 0;
+    int tempbool7 = (int) TRUE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"OOO|siiiii:wxGetSingleChoice",&_obj0,&_obj1,&_obj3,&_argc4,&_arg5,&_arg6,&tempbool7,&_arg8,&_arg9)) 
+    if(!PyArg_ParseTuple(args,"OOO|Oiiiii:wxGetSingleChoice",&_obj0,&_obj1,&_obj3,&_argo4,&_arg5,&_arg6,&tempbool7,&_arg8,&_arg9)) 

         return NULL;
 {
     if (!PyString_Check(_obj0)) {
         return NULL;
 {
     if (!PyString_Check(_obj0)) {


@@ -289,8 +295,9 @@ static PyObject *_wrap_wxGetSingleChoice(PyObject *self, PyObject *args) {
         return NULL;
     }
 }
         return NULL;
     }
 }

-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_wxWindow_p")) {
+    if (_argo4) {
+        if (_argo4 == Py_None) { _arg4 = NULL; }
+        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of wxGetSingleChoice. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of wxGetSingleChoice. Expected _wxWindow_p.");
         return NULL;
         }


@@ -336,20 +343,20 @@ static PyObject *_wrap_wxGetSingleChoiceIndex(PyObject *self, PyObject *args) {
     wxString * _arg1;
     int  _arg2;
     wxString * _arg3;
     wxString * _arg1;
     int  _arg2;
     wxString * _arg3;

-    wxWindow * _arg4 = NULL;
-    int  _arg5 = -1;
-    int  _arg6 = -1;
-    bool  _arg7 = (1);
-    int  _arg8 = 150;
-    int  _arg9 = 200;
+    wxWindow * _arg4 = (wxWindow *) NULL;
+    int  _arg5 = (int ) -1;
+    int  _arg6 = (int ) -1;
+    bool  _arg7 = (bool ) TRUE;
+    int  _arg8 = (int ) 150;
+    int  _arg9 = (int ) 200;

     PyObject * _obj0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _obj3 = 0;
     PyObject * _obj0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _obj3 = 0;

-    char * _argc4 = 0;
-    int tempbool7;
+    PyObject * _argo4 = 0;
+    int tempbool7 = (int) TRUE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"OOO|siiiii:wxGetSingleChoiceIndex",&_obj0,&_obj1,&_obj3,&_argc4,&_arg5,&_arg6,&tempbool7,&_arg8,&_arg9)) 
+    if(!PyArg_ParseTuple(args,"OOO|Oiiiii:wxGetSingleChoiceIndex",&_obj0,&_obj1,&_obj3,&_argo4,&_arg5,&_arg6,&tempbool7,&_arg8,&_arg9)) 

         return NULL;
 {
     if (!PyString_Check(_obj0)) {
         return NULL;
 {
     if (!PyString_Check(_obj0)) {


@@ -372,8 +379,9 @@ static PyObject *_wrap_wxGetSingleChoiceIndex(PyObject *self, PyObject *args) {
         return NULL;
     }
 }
         return NULL;
     }
 }

-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_wxWindow_p")) {
+    if (_argo4) {
+        if (_argo4 == Py_None) { _arg4 = NULL; }
+        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of wxGetSingleChoiceIndex. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of wxGetSingleChoiceIndex. Expected _wxWindow_p.");
         return NULL;
         }


@@ -411,17 +419,17 @@ static PyObject *_wrap_wxMessageBox(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxString * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxString * _arg0;

-    wxString * _arg1 = &wxPyEmptyStr;
-    int  _arg2 = (wxOK)|(wxCENTRE);
-    wxWindow * _arg3 = NULL;
-    int  _arg4 = -1;
-    int  _arg5 = -1;
+    wxString * _arg1 = (wxString *) &wxPyEmptyStr;
+    int  _arg2 = (int ) wxOK|wxCENTRE;
+    wxWindow * _arg3 = (wxWindow *) NULL;
+    int  _arg4 = (int ) -1;
+    int  _arg5 = (int ) -1;

     PyObject * _obj0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _obj0 = 0;
     PyObject * _obj1 = 0;

-    char * _argc3 = 0;
+    PyObject * _argo3 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"O|Oisii:wxMessageBox",&_obj0,&_obj1,&_arg2,&_argc3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTuple(args,"O|OiOii:wxMessageBox",&_obj0,&_obj1,&_arg2,&_argo3,&_arg4,&_arg5)) 

         return NULL;
 {
     if (!PyString_Check(_obj0)) {
         return NULL;
 {
     if (!PyString_Check(_obj0)) {


@@ -438,8 +446,9 @@ static PyObject *_wrap_wxMessageBox(PyObject *self, PyObject *args) {
     }
     _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }
     }
     _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxWindow_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxMessageBox. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxMessageBox. Expected _wxWindow_p.");
         return NULL;
         }


@@ -468,18 +477,18 @@ static PyObject *_wrap_wxGetNumberFromUser(PyObject *self, PyObject *args) {
     wxString * _arg1;
     wxString * _arg2;
     long  _arg3;
     wxString * _arg1;
     wxString * _arg2;
     long  _arg3;

-    long  _arg4 = 0;
-    long  _arg5 = 100;
-    wxWindow * _arg6 = NULL;
-    wxPoint * _arg7 = &wxPyDefaultPosition;
+    long  _arg4 = (long ) 0;
+    long  _arg5 = (long ) 100;
+    wxWindow * _arg6 = (wxWindow *) NULL;
+    wxPoint * _arg7 = (wxPoint *) &wxPyDefaultPosition;

     PyObject * _obj0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;
     PyObject * _obj0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;

-    char * _argc6 = 0;
-    char * _argc7 = 0;
+    PyObject * _argo6 = 0;
+    PyObject * _argo7 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"OOOl|llss:wxGetNumberFromUser",&_obj0,&_obj1,&_obj2,&_arg3,&_arg4,&_arg5,&_argc6,&_argc7)) 
+    if(!PyArg_ParseTuple(args,"OOOl|llOO:wxGetNumberFromUser",&_obj0,&_obj1,&_obj2,&_arg3,&_arg4,&_arg5,&_argo6,&_argo7)) 

         return NULL;
 {
     if (!PyString_Check(_obj0)) {
         return NULL;
 {
     if (!PyString_Check(_obj0)) {


@@ -502,14 +511,16 @@ static PyObject *_wrap_wxGetNumberFromUser(PyObject *self, PyObject *args) {
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }

-    if (_argc6) {
-        if (SWIG_GetPtr(_argc6,(void **) &_arg6,"_wxWindow_p")) {
+    if (_argo6) {
+        if (_argo6 == Py_None) { _arg6 = NULL; }
+        else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of wxGetNumberFromUser. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of wxGetNumberFromUser. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc7) {
-        if (SWIG_GetPtr(_argc7,(void **) &_arg7,"_wxPoint_p")) {
+    if (_argo7) {
+        if (_argo7 == Py_None) { _arg7 = NULL; }
+        else if (SWIG_GetPtrObj(_argo7,(void **) &_arg7,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 8 of wxGetNumberFromUser. Expected _wxPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 8 of wxGetNumberFromUser. Expected _wxPoint_p.");
         return NULL;
         }


@@ -570,13 +581,14 @@ static PyObject *_wrap_wxDisplayDepth(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxSetCursor(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxCursor * _arg0;
 static PyObject *_wrap_wxSetCursor(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxCursor * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSetCursor",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSetCursor",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCursor_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCursor_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSetCursor. Expected _wxCursor_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSetCursor. Expected _wxCursor_p.");
         return NULL;
         }


@@ -659,14 +671,15 @@ static PyObject *_wrap_RegisterId(PyObject *self, PyObject *args) {
 
 static PyObject *_wrap_wxBeginBusyCursor(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 
 static PyObject *_wrap_wxBeginBusyCursor(PyObject *self, PyObject *args) {
     PyObject * _resultobj;

-    wxCursor * _arg0 = wxHOURGLASS_CURSOR;
-    char * _argc0 = 0;
+    wxCursor * _arg0 = (wxCursor *) wxHOURGLASS_CURSOR;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"|s:wxBeginBusyCursor",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"|O:wxBeginBusyCursor",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCursor_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCursor_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBeginBusyCursor. Expected _wxCursor_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBeginBusyCursor. Expected _wxCursor_p.");
         return NULL;
         }


@@ -753,9 +766,9 @@ static PyObject *_wrap_wxExecute(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxString * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxString * _arg0;

-    bool  _arg1 = (0);
+    bool  _arg1 = (bool ) FALSE;

     PyObject * _obj0 = 0;
     PyObject * _obj0 = 0;

-    int tempbool1;
+    int tempbool1 = (int) FALSE;

 
     self = self;
     if(!PyArg_ParseTuple(args,"O|i:wxExecute",&_obj0,&tempbool1)) 
 
     self = self;
     if(!PyArg_ParseTuple(args,"O|i:wxExecute",&_obj0,&tempbool1)) 


@@ -794,16 +807,21 @@ static PyObject *_wrap_wxGetActiveWindow(PyObject *self, PyObject *args) {
         _result = (wxWindow *)wxGetActiveWindow();
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxWindow *)wxGetActiveWindow();
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
 static PyObject *_wrap_wxGetElapsedTime(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     return _resultobj;
 }
 
 static PyObject *_wrap_wxGetElapsedTime(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;

-    bool  _arg0 = (1);
-    int tempbool0;
+    bool  _arg0 = (bool ) TRUE;
+    int tempbool0 = (int) TRUE;

 
     self = self;
     if(!PyArg_ParseTuple(args,"|i:wxGetElapsedTime",&tempbool0)) 
 
     self = self;
     if(!PyArg_ParseTuple(args,"|i:wxGetElapsedTime",&tempbool0)) 


@@ -910,7 +928,7 @@ static PyObject *_wrap_wxNow(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxShell(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
 static PyObject *_wrap_wxShell(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;

-    wxString * _arg0 = &wxPyEmptyStr;
+    wxString * _arg0 = (wxString *) &wxPyEmptyStr;

     PyObject * _obj0 = 0;
 
     self = self;
     PyObject * _obj0 = 0;
 
     self = self;


@@ -1062,7 +1080,7 @@ static PyObject *_wrap_wxGetResource(PyObject *self, PyObject *args) {
     char * _result;
     char * _arg0;
     char * _arg1;
     char * _result;
     char * _arg0;
     char * _arg1;

-    char * _arg2 = NULL;
+    char * _arg2 = (char *) NULL;

 
     self = self;
     if(!PyArg_ParseTuple(args,"ss|s:wxGetResource",&_arg0,&_arg1,&_arg2)) 
 
     self = self;
     if(!PyArg_ParseTuple(args,"ss|s:wxGetResource",&_arg0,&_arg1,&_arg2)) 


@@ -1162,8 +1180,13 @@ static PyObject *_wrap_wxResourceCreateMenuBar(PyObject *self, PyObject *args) {
         _result = (wxMenuBar *)wxResourceCreateMenuBar(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxMenuBar *)wxResourceCreateMenuBar(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenuBar_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenuBar_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1188,14 +1211,15 @@ static PyObject *_wrap_wxResourceParseData(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     char * _arg0;
     PyObject * _resultobj;
     bool  _result;
     char * _arg0;

-    wxResourceTable * _arg1 = NULL;
-    char * _argc1 = 0;
+    wxResourceTable * _arg1 = (wxResourceTable *) NULL;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|s:wxResourceParseData",&_arg0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"s|O:wxResourceParseData",&_arg0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxResourceTable_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxResourceTable_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxResourceParseData. Expected _wxResourceTable_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxResourceParseData. Expected _wxResourceTable_p.");
         return NULL;
         }


@@ -1213,14 +1237,15 @@ static PyObject *_wrap_wxResourceParseFile(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     char * _arg0;
     PyObject * _resultobj;
     bool  _result;
     char * _arg0;

-    wxResourceTable * _arg1 = NULL;
-    char * _argc1 = 0;
+    wxResourceTable * _arg1 = (wxResourceTable *) NULL;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|s:wxResourceParseFile",&_arg0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"s|O:wxResourceParseFile",&_arg0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxResourceTable_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxResourceTable_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxResourceParseFile. Expected _wxResourceTable_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxResourceParseFile. Expected _wxResourceTable_p.");
         return NULL;
         }


@@ -1238,14 +1263,15 @@ static PyObject *_wrap_wxResourceParseString(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     char * _arg0;
     PyObject * _resultobj;
     bool  _result;
     char * _arg0;

-    wxResourceTable * _arg1 = NULL;
-    char * _argc1 = 0;
+    wxResourceTable * _arg1 = (wxResourceTable *) NULL;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|s:wxResourceParseString",&_arg0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"s|O:wxResourceParseString",&_arg0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxResourceTable_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxResourceTable_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxResourceParseString. Expected _wxResourceTable_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxResourceParseString. Expected _wxResourceTable_p.");
         return NULL;
         }


@@ -1320,13 +1346,14 @@ static PyObject *_wrap_wxSize_x_set(PyObject *self, PyObject *args) {
     long  _result;
     wxSize * _arg0;
     long  _arg1;
     long  _result;
     wxSize * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxSize_x_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxSize_x_set",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_x_set. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_x_set. Expected _wxSize_p.");
         return NULL;
         }


@@ -1345,13 +1372,14 @@ static PyObject *_wrap_wxSize_x_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSize_x_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSize_x_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_x_get. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_x_get. Expected _wxSize_p.");
         return NULL;
         }


@@ -1371,13 +1399,14 @@ static PyObject *_wrap_wxSize_y_set(PyObject *self, PyObject *args) {
     long  _result;
     wxSize * _arg0;
     long  _arg1;
     long  _result;
     wxSize * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxSize_y_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxSize_y_set",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_y_set. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_y_set. Expected _wxSize_p.");
         return NULL;
         }


@@ -1396,13 +1425,14 @@ static PyObject *_wrap_wxSize_y_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSize_y_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSize_y_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_y_get. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_y_get. Expected _wxSize_p.");
         return NULL;
         }


@@ -1420,8 +1450,8 @@ static PyObject *_wrap_wxSize_y_get(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_wxSize(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxSize * _result;
 static PyObject *_wrap_new_wxSize(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxSize * _result;

-    long  _arg0 = 0;
-    long  _arg1 = 0;
+    long  _arg0 = (long ) 0;
+    long  _arg1 = (long ) 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;


@@ -1432,8 +1462,13 @@ static PyObject *_wrap_new_wxSize(PyObject *self, PyObject *args) {
         _result = (wxSize *)new_wxSize(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxSize *)new_wxSize(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxSize_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxSize_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1441,13 +1476,14 @@ static PyObject *_wrap_new_wxSize(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxSize(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxSize * _arg0;
 static PyObject *_wrap_delete_wxSize(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxSize * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:delete_wxSize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxSize",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxSize. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxSize. Expected _wxSize_p.");
         return NULL;
         }


@@ -1468,13 +1504,14 @@ static PyObject *_wrap_wxSize_Set(PyObject *self, PyObject *args) {
     wxSize * _arg0;
     long  _arg1;
     long  _arg2;
     wxSize * _arg0;
     long  _arg1;
     long  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sll:wxSize_Set",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oll:wxSize_Set",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_Set. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_Set. Expected _wxSize_p.");
         return NULL;
         }


@@ -1494,13 +1531,14 @@ static PyObject *_wrap_wxSize_GetX(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSize_GetX",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSize_GetX",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_GetX. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_GetX. Expected _wxSize_p.");
         return NULL;
         }


@@ -1519,13 +1557,14 @@ static PyObject *_wrap_wxSize_GetY(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSize_GetY",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSize_GetY",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_GetY. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_GetY. Expected _wxSize_p.");
         return NULL;
         }


@@ -1544,13 +1583,14 @@ static PyObject *_wrap_wxSize_GetWidth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSize_GetWidth",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSize_GetWidth",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_GetWidth. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_GetWidth. Expected _wxSize_p.");
         return NULL;
         }


@@ -1569,13 +1609,14 @@ static PyObject *_wrap_wxSize_GetHeight(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSize_GetHeight",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSize_GetHeight",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_GetHeight. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_GetHeight. Expected _wxSize_p.");
         return NULL;
         }


@@ -1594,13 +1635,14 @@ static PyObject *_wrap_wxSize_SetWidth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxSize * _arg0;
     long  _arg1;
     PyObject * _resultobj;
     wxSize * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxSize_SetWidth",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxSize_SetWidth",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_SetWidth. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_SetWidth. Expected _wxSize_p.");
         return NULL;
         }


@@ -1620,13 +1662,14 @@ static PyObject *_wrap_wxSize_SetHeight(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxSize * _arg0;
     long  _arg1;
     PyObject * _resultobj;
     wxSize * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxSize_SetHeight",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxSize_SetHeight",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_SetHeight. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_SetHeight. Expected _wxSize_p.");
         return NULL;
         }


@@ -1651,13 +1694,14 @@ static PyObject *_wrap_wxSize_asTuple(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     PyObject * _result;
     wxSize * _arg0;
     PyObject * _resultobj;
     PyObject * _result;
     wxSize * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSize_asTuple",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSize_asTuple",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_asTuple. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_asTuple. Expected _wxSize_p.");
         return NULL;
         }


@@ -1679,13 +1723,14 @@ static PyObject *_wrap_wxRealPoint_x_set(PyObject *self, PyObject *args) {
     double  _result;
     wxRealPoint * _arg0;
     double  _arg1;
     double  _result;
     wxRealPoint * _arg0;
     double  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sd:wxRealPoint_x_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Od:wxRealPoint_x_set",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRealPoint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRealPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRealPoint_x_set. Expected _wxRealPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRealPoint_x_set. Expected _wxRealPoint_p.");
         return NULL;
         }


@@ -1704,13 +1749,14 @@ static PyObject *_wrap_wxRealPoint_x_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     double  _result;
     wxRealPoint * _arg0;
     PyObject * _resultobj;
     double  _result;
     wxRealPoint * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxRealPoint_x_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRealPoint_x_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRealPoint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRealPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRealPoint_x_get. Expected _wxRealPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRealPoint_x_get. Expected _wxRealPoint_p.");
         return NULL;
         }


@@ -1730,13 +1776,14 @@ static PyObject *_wrap_wxRealPoint_y_set(PyObject *self, PyObject *args) {
     double  _result;
     wxRealPoint * _arg0;
     double  _arg1;
     double  _result;
     wxRealPoint * _arg0;
     double  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sd:wxRealPoint_y_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Od:wxRealPoint_y_set",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRealPoint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRealPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRealPoint_y_set. Expected _wxRealPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRealPoint_y_set. Expected _wxRealPoint_p.");
         return NULL;
         }


@@ -1755,13 +1802,14 @@ static PyObject *_wrap_wxRealPoint_y_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     double  _result;
     wxRealPoint * _arg0;
     PyObject * _resultobj;
     double  _result;
     wxRealPoint * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxRealPoint_y_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRealPoint_y_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRealPoint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRealPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRealPoint_y_get. Expected _wxRealPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRealPoint_y_get. Expected _wxRealPoint_p.");
         return NULL;
         }


@@ -1779,8 +1827,8 @@ static PyObject *_wrap_wxRealPoint_y_get(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_wxRealPoint(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRealPoint * _result;
 static PyObject *_wrap_new_wxRealPoint(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRealPoint * _result;

-    double  _arg0 = 0.0;
-    double  _arg1 = 0.0;
+    double  _arg0 = (double ) 0.0;
+    double  _arg1 = (double ) 0.0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;


@@ -1791,8 +1839,13 @@ static PyObject *_wrap_new_wxRealPoint(PyObject *self, PyObject *args) {
         _result = (wxRealPoint *)new_wxRealPoint(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxRealPoint *)new_wxRealPoint(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxRealPoint_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxRealPoint_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1800,13 +1853,14 @@ static PyObject *_wrap_new_wxRealPoint(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxRealPoint(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRealPoint * _arg0;
 static PyObject *_wrap_delete_wxRealPoint(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRealPoint * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:delete_wxRealPoint",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxRealPoint",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRealPoint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRealPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxRealPoint. Expected _wxRealPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxRealPoint. Expected _wxRealPoint_p.");
         return NULL;
         }


@@ -1827,13 +1881,14 @@ static PyObject *_wrap_wxPoint_x_set(PyObject *self, PyObject *args) {
     long  _result;
     wxPoint * _arg0;
     long  _arg1;
     long  _result;
     wxPoint * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxPoint_x_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxPoint_x_set",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPoint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPoint_x_set. Expected _wxPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPoint_x_set. Expected _wxPoint_p.");
         return NULL;
         }


@@ -1852,13 +1907,14 @@ static PyObject *_wrap_wxPoint_x_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxPoint * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxPoint * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPoint_x_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPoint_x_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPoint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPoint_x_get. Expected _wxPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPoint_x_get. Expected _wxPoint_p.");
         return NULL;
         }


@@ -1878,13 +1934,14 @@ static PyObject *_wrap_wxPoint_y_set(PyObject *self, PyObject *args) {
     long  _result;
     wxPoint * _arg0;
     long  _arg1;
     long  _result;
     wxPoint * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxPoint_y_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxPoint_y_set",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPoint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPoint_y_set. Expected _wxPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPoint_y_set. Expected _wxPoint_p.");
         return NULL;
         }


@@ -1903,13 +1960,14 @@ static PyObject *_wrap_wxPoint_y_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxPoint * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxPoint * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPoint_y_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPoint_y_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPoint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPoint_y_get. Expected _wxPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPoint_y_get. Expected _wxPoint_p.");
         return NULL;
         }


@@ -1927,8 +1985,8 @@ static PyObject *_wrap_wxPoint_y_get(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_wxPoint(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPoint * _result;
 static PyObject *_wrap_new_wxPoint(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPoint * _result;

-    long  _arg0 = 0;
-    long  _arg1 = 0;
+    long  _arg0 = (long ) 0;
+    long  _arg1 = (long ) 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;


@@ -1939,8 +1997,13 @@ static PyObject *_wrap_new_wxPoint(PyObject *self, PyObject *args) {
         _result = (wxPoint *)new_wxPoint(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxPoint *)new_wxPoint(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPoint_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPoint_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1948,13 +2011,14 @@ static PyObject *_wrap_new_wxPoint(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxPoint(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPoint * _arg0;
 static PyObject *_wrap_delete_wxPoint(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPoint * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:delete_wxPoint",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxPoint",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPoint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPoint. Expected _wxPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPoint. Expected _wxPoint_p.");
         return NULL;
         }


@@ -1978,13 +2042,14 @@ static PyObject *_wrap_wxPoint_Set(PyObject *self, PyObject *args) {
     wxPoint * _arg0;
     long  _arg1;
     long  _arg2;
     wxPoint * _arg0;
     long  _arg1;
     long  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sll:wxPoint_Set",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oll:wxPoint_Set",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPoint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPoint_Set. Expected _wxPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPoint_Set. Expected _wxPoint_p.");
         return NULL;
         }


@@ -2009,13 +2074,14 @@ static PyObject *_wrap_wxPoint_asTuple(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     PyObject * _result;
     wxPoint * _arg0;
     PyObject * _resultobj;
     PyObject * _result;
     wxPoint * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPoint_asTuple",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPoint_asTuple",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPoint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPoint_asTuple. Expected _wxPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPoint_asTuple. Expected _wxPoint_p.");
         return NULL;
         }


@@ -2035,10 +2101,10 @@ static PyObject *_wrap_wxPoint_asTuple(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_wxRect(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRect * _result;
 static PyObject *_wrap_new_wxRect(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRect * _result;

-    long  _arg0 = 0;
-    long  _arg1 = 0;
-    long  _arg2 = 0;
-    long  _arg3 = 0;
+    long  _arg0 = (long ) 0;
+    long  _arg1 = (long ) 0;
+    long  _arg2 = (long ) 0;
+    long  _arg3 = (long ) 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;


@@ -2049,8 +2115,13 @@ static PyObject *_wrap_new_wxRect(PyObject *self, PyObject *args) {
         _result = (wxRect *)new_wxRect(_arg0,_arg1,_arg2,_arg3);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxRect *)new_wxRect(_arg0,_arg1,_arg2,_arg3);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxRect_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxRect_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -2058,13 +2129,14 @@ static PyObject *_wrap_new_wxRect(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxRect(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRect * _arg0;
 static PyObject *_wrap_delete_wxRect(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRect * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:delete_wxRect",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxRect",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxRect. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxRect. Expected _wxRect_p.");
         return NULL;
         }


@@ -2084,13 +2156,14 @@ static PyObject *_wrap_wxRect_GetX(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxRect_GetX",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRect_GetX",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetX. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetX. Expected _wxRect_p.");
         return NULL;
         }


@@ -2109,13 +2182,14 @@ static PyObject *_wrap_wxRect_SetX(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRect * _arg0;
     long  _arg1;
     PyObject * _resultobj;
     wxRect * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxRect_SetX",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxRect_SetX",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_SetX. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_SetX. Expected _wxRect_p.");
         return NULL;
         }


@@ -2135,13 +2209,14 @@ static PyObject *_wrap_wxRect_GetY(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxRect_GetY",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRect_GetY",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetY. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetY. Expected _wxRect_p.");
         return NULL;
         }


@@ -2160,13 +2235,14 @@ static PyObject *_wrap_wxRect_SetY(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRect * _arg0;
     long  _arg1;
     PyObject * _resultobj;
     wxRect * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxRect_SetY",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxRect_SetY",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_SetY. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_SetY. Expected _wxRect_p.");
         return NULL;
         }


@@ -2186,13 +2262,14 @@ static PyObject *_wrap_wxRect_GetWidth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxRect_GetWidth",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRect_GetWidth",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetWidth. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetWidth. Expected _wxRect_p.");
         return NULL;
         }


@@ -2211,13 +2288,14 @@ static PyObject *_wrap_wxRect_SetWidth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRect * _arg0;
     long  _arg1;
     PyObject * _resultobj;
     wxRect * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxRect_SetWidth",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxRect_SetWidth",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_SetWidth. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_SetWidth. Expected _wxRect_p.");
         return NULL;
         }


@@ -2237,13 +2315,14 @@ static PyObject *_wrap_wxRect_GetHeight(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxRect_GetHeight",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRect_GetHeight",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetHeight. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetHeight. Expected _wxRect_p.");
         return NULL;
         }


@@ -2262,13 +2341,14 @@ static PyObject *_wrap_wxRect_SetHeight(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRect * _arg0;
     long  _arg1;
     PyObject * _resultobj;
     wxRect * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxRect_SetHeight",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxRect_SetHeight",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_SetHeight. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_SetHeight. Expected _wxRect_p.");
         return NULL;
         }


@@ -2288,14 +2368,15 @@ static PyObject *_wrap_wxRect_GetPosition(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPoint * _result;
     wxRect * _arg0;
     PyObject * _resultobj;
     wxPoint * _result;
     wxRect * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxRect_GetPosition",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRect_GetPosition",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetPosition. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetPosition. Expected _wxRect_p.");
         return NULL;
         }


@@ -2315,14 +2396,15 @@ static PyObject *_wrap_wxRect_GetSize(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxSize * _result;
     wxRect * _arg0;
     PyObject * _resultobj;
     wxSize * _result;
     wxRect * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxRect_GetSize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRect_GetSize",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetSize. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetSize. Expected _wxRect_p.");
         return NULL;
         }


@@ -2342,13 +2424,14 @@ static PyObject *_wrap_wxRect_GetLeft(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxRect_GetLeft",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRect_GetLeft",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetLeft. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetLeft. Expected _wxRect_p.");
         return NULL;
         }


@@ -2367,13 +2450,14 @@ static PyObject *_wrap_wxRect_GetTop(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxRect_GetTop",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRect_GetTop",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetTop. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetTop. Expected _wxRect_p.");
         return NULL;
         }


@@ -2392,13 +2476,14 @@ static PyObject *_wrap_wxRect_GetBottom(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxRect_GetBottom",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRect_GetBottom",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetBottom. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetBottom. Expected _wxRect_p.");
         return NULL;
         }


@@ -2417,13 +2502,14 @@ static PyObject *_wrap_wxRect_GetRight(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxRect_GetRight",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRect_GetRight",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetRight. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetRight. Expected _wxRect_p.");
         return NULL;
         }


@@ -2443,13 +2529,14 @@ static PyObject *_wrap_wxRect_x_set(PyObject *self, PyObject *args) {
     long  _result;
     wxRect * _arg0;
     long  _arg1;
     long  _result;
     wxRect * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxRect_x_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxRect_x_set",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_x_set. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_x_set. Expected _wxRect_p.");
         return NULL;
         }


@@ -2468,13 +2555,14 @@ static PyObject *_wrap_wxRect_x_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxRect_x_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRect_x_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_x_get. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_x_get. Expected _wxRect_p.");
         return NULL;
         }


@@ -2494,13 +2582,14 @@ static PyObject *_wrap_wxRect_y_set(PyObject *self, PyObject *args) {
     long  _result;
     wxRect * _arg0;
     long  _arg1;
     long  _result;
     wxRect * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxRect_y_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxRect_y_set",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_y_set. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_y_set. Expected _wxRect_p.");
         return NULL;
         }


@@ -2519,13 +2608,14 @@ static PyObject *_wrap_wxRect_y_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxRect_y_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRect_y_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_y_get. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_y_get. Expected _wxRect_p.");
         return NULL;
         }


@@ -2545,13 +2635,14 @@ static PyObject *_wrap_wxRect_width_set(PyObject *self, PyObject *args) {
     long  _result;
     wxRect * _arg0;
     long  _arg1;
     long  _result;
     wxRect * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxRect_width_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxRect_width_set",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_width_set. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_width_set. Expected _wxRect_p.");
         return NULL;
         }


@@ -2570,13 +2661,14 @@ static PyObject *_wrap_wxRect_width_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxRect_width_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRect_width_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_width_get. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_width_get. Expected _wxRect_p.");
         return NULL;
         }


@@ -2596,13 +2688,14 @@ static PyObject *_wrap_wxRect_height_set(PyObject *self, PyObject *args) {
     long  _result;
     wxRect * _arg0;
     long  _arg1;
     long  _result;
     wxRect * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxRect_height_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxRect_height_set",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_height_set. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_height_set. Expected _wxRect_p.");
         return NULL;
         }


@@ -2621,13 +2714,14 @@ static PyObject *_wrap_wxRect_height_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxRect_height_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRect_height_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_height_get. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_height_get. Expected _wxRect_p.");
         return NULL;
         }


@@ -2653,13 +2747,14 @@ static PyObject *_wrap_wxRect_asTuple(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     PyObject * _result;
     wxRect * _arg0;
     PyObject * _resultobj;
     PyObject * _result;
     wxRect * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxRect_asTuple",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRect_asTuple",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_asTuple. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_asTuple. Expected _wxRect_p.");
         return NULL;
         }


@@ -2694,8 +2789,13 @@ static PyObject *_wrap_new_wxPyTimer(PyObject *self, PyObject *args) {
         _result = (wxPyTimer *)new_wxPyTimer(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxPyTimer *)new_wxPyTimer(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyTimer_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyTimer_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -2703,13 +2803,14 @@ static PyObject *_wrap_new_wxPyTimer(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxPyTimer(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyTimer * _arg0;
 static PyObject *_wrap_delete_wxPyTimer(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyTimer * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:delete_wxPyTimer",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxPyTimer",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyTimer_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyTimer_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPyTimer. Expected _wxPyTimer_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPyTimer. Expected _wxPyTimer_p.");
         return NULL;
         }


@@ -2729,13 +2830,14 @@ static PyObject *_wrap_wxPyTimer_Interval(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxPyTimer * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxPyTimer * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPyTimer_Interval",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPyTimer_Interval",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyTimer_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyTimer_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyTimer_Interval. Expected _wxPyTimer_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyTimer_Interval. Expected _wxPyTimer_p.");
         return NULL;
         }


@@ -2753,15 +2855,16 @@ static PyObject *_wrap_wxPyTimer_Interval(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxPyTimer_Start(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyTimer * _arg0;
 static PyObject *_wrap_wxPyTimer_Start(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyTimer * _arg0;

-    int  _arg1 = -1;
-    int  _arg2 = (0);
-    char * _argc0 = 0;
+    int  _arg1 = (int ) -1;
+    int  _arg2 = (int ) FALSE;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|ii:wxPyTimer_Start",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"O|ii:wxPyTimer_Start",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyTimer_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyTimer_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyTimer_Start. Expected _wxPyTimer_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyTimer_Start. Expected _wxPyTimer_p.");
         return NULL;
         }


@@ -2780,13 +2883,14 @@ static PyObject *_wrap_wxPyTimer_Start(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxPyTimer_Stop(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyTimer * _arg0;
 static PyObject *_wrap_wxPyTimer_Stop(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyTimer * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPyTimer_Stop",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPyTimer_Stop",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyTimer_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyTimer_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyTimer_Stop. Expected _wxPyTimer_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyTimer_Stop. Expected _wxPyTimer_p.");
         return NULL;
         }


@@ -2806,21 +2910,23 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_Above(PyObject *self, PyObje
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _arg0;
     wxWindow * _arg1;
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _arg0;
     wxWindow * _arg1;

-    int  _arg2 = 0;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    int  _arg2 = (int ) 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss|i:wxIndividualLayoutConstraint_Above",&_argc0,&_argc1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"OO|i:wxIndividualLayoutConstraint_Above",&_argo0,&_argo1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIndividualLayoutConstraint_Above. Expected _wxIndividualLayoutConstraint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIndividualLayoutConstraint_Above. Expected _wxIndividualLayoutConstraint_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxIndividualLayoutConstraint_Above. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxIndividualLayoutConstraint_Above. Expected _wxWindow_p.");
         return NULL;
         }


@@ -2840,13 +2946,14 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_Absolute(PyObject *self, PyO
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxIndividualLayoutConstraint_Absolute",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxIndividualLayoutConstraint_Absolute",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIndividualLayoutConstraint_Absolute. Expected _wxIndividualLayoutConstraint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIndividualLayoutConstraint_Absolute. Expected _wxIndividualLayoutConstraint_p.");
         return NULL;
         }


@@ -2865,13 +2972,14 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_Absolute(PyObject *self, PyO
 static PyObject *_wrap_wxIndividualLayoutConstraint_AsIs(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _arg0;
 static PyObject *_wrap_wxIndividualLayoutConstraint_AsIs(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxIndividualLayoutConstraint_AsIs",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxIndividualLayoutConstraint_AsIs",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIndividualLayoutConstraint_AsIs. Expected _wxIndividualLayoutConstraint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIndividualLayoutConstraint_AsIs. Expected _wxIndividualLayoutConstraint_p.");
         return NULL;
         }


@@ -2891,21 +2999,23 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_Below(PyObject *self, PyObje
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _arg0;
     wxWindow * _arg1;
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _arg0;
     wxWindow * _arg1;

-    int  _arg2 = 0;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    int  _arg2 = (int ) 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss|i:wxIndividualLayoutConstraint_Below",&_argc0,&_argc1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"OO|i:wxIndividualLayoutConstraint_Below",&_argo0,&_argo1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIndividualLayoutConstraint_Below. Expected _wxIndividualLayoutConstraint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIndividualLayoutConstraint_Below. Expected _wxIndividualLayoutConstraint_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxIndividualLayoutConstraint_Below. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxIndividualLayoutConstraint_Below. Expected _wxWindow_p.");
         return NULL;
         }


@@ -2924,13 +3034,14 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_Below(PyObject *self, PyObje
 static PyObject *_wrap_wxIndividualLayoutConstraint_Unconstrained(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _arg0;
 static PyObject *_wrap_wxIndividualLayoutConstraint_Unconstrained(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxIndividualLayoutConstraint_Unconstrained",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxIndividualLayoutConstraint_Unconstrained",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIndividualLayoutConstraint_Unconstrained. Expected _wxIndividualLayoutConstraint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIndividualLayoutConstraint_Unconstrained. Expected _wxIndividualLayoutConstraint_p.");
         return NULL;
         }


@@ -2950,21 +3061,23 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_LeftOf(PyObject *self, PyObj
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _arg0;
     wxWindow * _arg1;
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _arg0;
     wxWindow * _arg1;

-    int  _arg2 = 0;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    int  _arg2 = (int ) 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss|i:wxIndividualLayoutConstraint_LeftOf",&_argc0,&_argc1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"OO|i:wxIndividualLayoutConstraint_LeftOf",&_argo0,&_argo1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIndividualLayoutConstraint_LeftOf. Expected _wxIndividualLayoutConstraint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIndividualLayoutConstraint_LeftOf. Expected _wxIndividualLayoutConstraint_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxIndividualLayoutConstraint_LeftOf. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxIndividualLayoutConstraint_LeftOf. Expected _wxWindow_p.");
         return NULL;
         }


@@ -2986,20 +3099,22 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_PercentOf(PyObject *self, Py
     wxWindow * _arg1;
     wxEdge  _arg2;
     int  _arg3;
     wxWindow * _arg1;
     wxEdge  _arg2;
     int  _arg3;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ssii:wxIndividualLayoutConstraint_PercentOf",&_argc0,&_argc1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"OOii:wxIndividualLayoutConstraint_PercentOf",&_argo0,&_argo1,&_arg2,&_arg3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIndividualLayoutConstraint_PercentOf. Expected _wxIndividualLayoutConstraint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIndividualLayoutConstraint_PercentOf. Expected _wxIndividualLayoutConstraint_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxIndividualLayoutConstraint_PercentOf. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxIndividualLayoutConstraint_PercentOf. Expected _wxWindow_p.");
         return NULL;
         }


@@ -3019,21 +3134,23 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_RightOf(PyObject *self, PyOb
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _arg0;
     wxWindow * _arg1;
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _arg0;
     wxWindow * _arg1;

-    int  _arg2 = 0;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    int  _arg2 = (int ) 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss|i:wxIndividualLayoutConstraint_RightOf",&_argc0,&_argc1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"OO|i:wxIndividualLayoutConstraint_RightOf",&_argo0,&_argo1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIndividualLayoutConstraint_RightOf. Expected _wxIndividualLayoutConstraint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIndividualLayoutConstraint_RightOf. Expected _wxIndividualLayoutConstraint_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxIndividualLayoutConstraint_RightOf. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxIndividualLayoutConstraint_RightOf. Expected _wxWindow_p.");
         return NULL;
         }


@@ -3054,21 +3171,23 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_SameAs(PyObject *self, PyObj
     wxIndividualLayoutConstraint * _arg0;
     wxWindow * _arg1;
     wxEdge  _arg2;
     wxIndividualLayoutConstraint * _arg0;
     wxWindow * _arg1;
     wxEdge  _arg2;

-    int  _arg3 = 0;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    int  _arg3 = (int ) 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ssi|i:wxIndividualLayoutConstraint_SameAs",&_argc0,&_argc1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"OOi|i:wxIndividualLayoutConstraint_SameAs",&_argo0,&_argo1,&_arg2,&_arg3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIndividualLayoutConstraint_SameAs. Expected _wxIndividualLayoutConstraint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIndividualLayoutConstraint_SameAs. Expected _wxIndividualLayoutConstraint_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxIndividualLayoutConstraint_SameAs. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxIndividualLayoutConstraint_SameAs. Expected _wxWindow_p.");
         return NULL;
         }


@@ -3090,22 +3209,24 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_Set(PyObject *self, PyObject
     wxRelationship  _arg1;
     wxWindow * _arg2;
     wxEdge  _arg3;
     wxRelationship  _arg1;
     wxWindow * _arg2;
     wxEdge  _arg3;

-    int  _arg4 = 0;
-    int  _arg5 = 0;
-    char * _argc0 = 0;
-    char * _argc2 = 0;
+    int  _arg4 = (int ) 0;
+    int  _arg5 = (int ) 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sisi|ii:wxIndividualLayoutConstraint_Set",&_argc0,&_arg1,&_argc2,&_arg3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTuple(args,"OiOi|ii:wxIndividualLayoutConstraint_Set",&_argo0,&_arg1,&_argo2,&_arg3,&_arg4,&_arg5)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIndividualLayoutConstraint_Set. Expected _wxIndividualLayoutConstraint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIndividualLayoutConstraint_Set. Expected _wxIndividualLayoutConstraint_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxWindow_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxIndividualLayoutConstraint_Set. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxIndividualLayoutConstraint_Set. Expected _wxWindow_p.");
         return NULL;
         }


@@ -3134,8 +3255,13 @@ static PyObject *_wrap_new_wxLayoutConstraints(PyObject *self, PyObject *args) {
         _result = (wxLayoutConstraints *)new_wxLayoutConstraints();
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxLayoutConstraints *)new_wxLayoutConstraints();
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxLayoutConstraints_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxLayoutConstraints_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3144,14 +3270,15 @@ static PyObject *_wrap_wxLayoutConstraints_bottom_get(PyObject *self, PyObject *
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _result;
     wxLayoutConstraints * _arg0;
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _result;
     wxLayoutConstraints * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxLayoutConstraints_bottom_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxLayoutConstraints_bottom_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxLayoutConstraints_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLayoutConstraints_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLayoutConstraints_bottom_get. Expected _wxLayoutConstraints_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLayoutConstraints_bottom_get. Expected _wxLayoutConstraints_p.");
         return NULL;
         }


@@ -3161,8 +3288,13 @@ static PyObject *_wrap_wxLayoutConstraints_bottom_get(PyObject *self, PyObject *
         _result = (wxIndividualLayoutConstraint *)wxLayoutConstraints_bottom_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxIndividualLayoutConstraint *)wxLayoutConstraints_bottom_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3171,14 +3303,15 @@ static PyObject *_wrap_wxLayoutConstraints_centreX_get(PyObject *self, PyObject
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _result;
     wxLayoutConstraints * _arg0;
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _result;
     wxLayoutConstraints * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxLayoutConstraints_centreX_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxLayoutConstraints_centreX_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxLayoutConstraints_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLayoutConstraints_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLayoutConstraints_centreX_get. Expected _wxLayoutConstraints_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLayoutConstraints_centreX_get. Expected _wxLayoutConstraints_p.");
         return NULL;
         }


@@ -3188,8 +3321,13 @@ static PyObject *_wrap_wxLayoutConstraints_centreX_get(PyObject *self, PyObject
         _result = (wxIndividualLayoutConstraint *)wxLayoutConstraints_centreX_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxIndividualLayoutConstraint *)wxLayoutConstraints_centreX_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3198,14 +3336,15 @@ static PyObject *_wrap_wxLayoutConstraints_centreY_get(PyObject *self, PyObject
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _result;
     wxLayoutConstraints * _arg0;
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _result;
     wxLayoutConstraints * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxLayoutConstraints_centreY_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxLayoutConstraints_centreY_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxLayoutConstraints_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLayoutConstraints_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLayoutConstraints_centreY_get. Expected _wxLayoutConstraints_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLayoutConstraints_centreY_get. Expected _wxLayoutConstraints_p.");
         return NULL;
         }


@@ -3215,8 +3354,13 @@ static PyObject *_wrap_wxLayoutConstraints_centreY_get(PyObject *self, PyObject
         _result = (wxIndividualLayoutConstraint *)wxLayoutConstraints_centreY_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxIndividualLayoutConstraint *)wxLayoutConstraints_centreY_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3225,14 +3369,15 @@ static PyObject *_wrap_wxLayoutConstraints_height_get(PyObject *self, PyObject *
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _result;
     wxLayoutConstraints * _arg0;
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _result;
     wxLayoutConstraints * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxLayoutConstraints_height_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxLayoutConstraints_height_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxLayoutConstraints_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLayoutConstraints_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLayoutConstraints_height_get. Expected _wxLayoutConstraints_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLayoutConstraints_height_get. Expected _wxLayoutConstraints_p.");
         return NULL;
         }


@@ -3242,8 +3387,13 @@ static PyObject *_wrap_wxLayoutConstraints_height_get(PyObject *self, PyObject *
         _result = (wxIndividualLayoutConstraint *)wxLayoutConstraints_height_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxIndividualLayoutConstraint *)wxLayoutConstraints_height_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3252,14 +3402,15 @@ static PyObject *_wrap_wxLayoutConstraints_left_get(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _result;
     wxLayoutConstraints * _arg0;
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _result;
     wxLayoutConstraints * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxLayoutConstraints_left_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxLayoutConstraints_left_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxLayoutConstraints_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLayoutConstraints_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLayoutConstraints_left_get. Expected _wxLayoutConstraints_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLayoutConstraints_left_get. Expected _wxLayoutConstraints_p.");
         return NULL;
         }


@@ -3269,8 +3420,13 @@ static PyObject *_wrap_wxLayoutConstraints_left_get(PyObject *self, PyObject *ar
         _result = (wxIndividualLayoutConstraint *)wxLayoutConstraints_left_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxIndividualLayoutConstraint *)wxLayoutConstraints_left_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3279,14 +3435,15 @@ static PyObject *_wrap_wxLayoutConstraints_right_get(PyObject *self, PyObject *a
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _result;
     wxLayoutConstraints * _arg0;
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _result;
     wxLayoutConstraints * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxLayoutConstraints_right_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxLayoutConstraints_right_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxLayoutConstraints_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLayoutConstraints_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLayoutConstraints_right_get. Expected _wxLayoutConstraints_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLayoutConstraints_right_get. Expected _wxLayoutConstraints_p.");
         return NULL;
         }


@@ -3296,8 +3453,13 @@ static PyObject *_wrap_wxLayoutConstraints_right_get(PyObject *self, PyObject *a
         _result = (wxIndividualLayoutConstraint *)wxLayoutConstraints_right_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxIndividualLayoutConstraint *)wxLayoutConstraints_right_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3306,14 +3468,15 @@ static PyObject *_wrap_wxLayoutConstraints_top_get(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _result;
     wxLayoutConstraints * _arg0;
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _result;
     wxLayoutConstraints * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxLayoutConstraints_top_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxLayoutConstraints_top_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxLayoutConstraints_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLayoutConstraints_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLayoutConstraints_top_get. Expected _wxLayoutConstraints_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLayoutConstraints_top_get. Expected _wxLayoutConstraints_p.");
         return NULL;
         }


@@ -3323,8 +3486,13 @@ static PyObject *_wrap_wxLayoutConstraints_top_get(PyObject *self, PyObject *arg
         _result = (wxIndividualLayoutConstraint *)wxLayoutConstraints_top_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxIndividualLayoutConstraint *)wxLayoutConstraints_top_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3333,14 +3501,15 @@ static PyObject *_wrap_wxLayoutConstraints_width_get(PyObject *self, PyObject *a
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _result;
     wxLayoutConstraints * _arg0;
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _result;
     wxLayoutConstraints * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxLayoutConstraints_width_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxLayoutConstraints_width_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxLayoutConstraints_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLayoutConstraints_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLayoutConstraints_width_get. Expected _wxLayoutConstraints_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLayoutConstraints_width_get. Expected _wxLayoutConstraints_p.");
         return NULL;
         }


@@ -3350,8 +3519,13 @@ static PyObject *_wrap_wxLayoutConstraints_width_get(PyObject *self, PyObject *a
         _result = (wxIndividualLayoutConstraint *)wxLayoutConstraints_width_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxIndividualLayoutConstraint *)wxLayoutConstraints_width_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3369,8 +3543,13 @@ static PyObject *_wrap_new_wxRegion(PyObject *self, PyObject *args) {
         _result = (wxRegion *)new_wxRegion();
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxRegion *)new_wxRegion();
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxRegion_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxRegion_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3378,13 +3557,14 @@ static PyObject *_wrap_new_wxRegion(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxRegion(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRegion * _arg0;
 static PyObject *_wrap_delete_wxRegion(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRegion * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:delete_wxRegion",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxRegion",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxRegion. Expected _wxRegion_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxRegion. Expected _wxRegion_p.");
         return NULL;
         }


@@ -3403,13 +3583,14 @@ static PyObject *_wrap_delete_wxRegion(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxRegion_Clear(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRegion * _arg0;
 static PyObject *_wrap_wxRegion_Clear(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRegion * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxRegion_Clear",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRegion_Clear",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Clear. Expected _wxRegion_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Clear. Expected _wxRegion_p.");
         return NULL;
         }


@@ -3431,13 +3612,14 @@ static PyObject *_wrap_wxRegion_Contains(PyObject *self, PyObject *args) {
     wxRegion * _arg0;
     long  _arg1;
     long  _arg2;
     wxRegion * _arg0;
     long  _arg1;
     long  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sll:wxRegion_Contains",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oll:wxRegion_Contains",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Contains. Expected _wxRegion_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Contains. Expected _wxRegion_p.");
         return NULL;
         }


@@ -3457,20 +3639,22 @@ static PyObject *_wrap_wxRegion_ContainsPoint(PyObject *self, PyObject *args) {
     wxRegionContain  _result;
     wxRegion * _arg0;
     wxPoint * _arg1;
     wxRegionContain  _result;
     wxRegion * _arg0;
     wxPoint * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxRegion_ContainsPoint",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxRegion_ContainsPoint",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_ContainsPoint. Expected _wxRegion_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_ContainsPoint. Expected _wxRegion_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPoint_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_ContainsPoint. Expected _wxPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_ContainsPoint. Expected _wxPoint_p.");
         return NULL;
         }


@@ -3490,20 +3674,22 @@ static PyObject *_wrap_wxRegion_ContainsRect(PyObject *self, PyObject *args) {
     wxRegionContain  _result;
     wxRegion * _arg0;
     wxRect * _arg1;
     wxRegionContain  _result;
     wxRegion * _arg0;
     wxRect * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxRegion_ContainsRect",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxRegion_ContainsRect",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_ContainsRect. Expected _wxRegion_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_ContainsRect. Expected _wxRegion_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxRect_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_ContainsRect. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_ContainsRect. Expected _wxRect_p.");
         return NULL;
         }


@@ -3522,14 +3708,15 @@ static PyObject *_wrap_wxRegion_GetBox(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRect * _result;
     wxRegion * _arg0;
     PyObject * _resultobj;
     wxRect * _result;
     wxRegion * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxRegion_GetBox",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRegion_GetBox",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_GetBox. Expected _wxRegion_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_GetBox. Expected _wxRegion_p.");
         return NULL;
         }


@@ -3550,20 +3737,22 @@ static PyObject *_wrap_wxRegion_Intersect(PyObject *self, PyObject *args) {
     bool  _result;
     wxRegion * _arg0;
     wxRect * _arg1;
     bool  _result;
     wxRegion * _arg0;
     wxRect * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxRegion_Intersect",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxRegion_Intersect",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Intersect. Expected _wxRegion_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Intersect. Expected _wxRegion_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxRect_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_Intersect. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_Intersect. Expected _wxRect_p.");
         return NULL;
         }


@@ -3582,13 +3771,14 @@ static PyObject *_wrap_wxRegion_IsEmpty(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxRegion * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxRegion * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxRegion_IsEmpty",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRegion_IsEmpty",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_IsEmpty. Expected _wxRegion_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_IsEmpty. Expected _wxRegion_p.");
         return NULL;
         }


@@ -3608,20 +3798,22 @@ static PyObject *_wrap_wxRegion_Subtract(PyObject *self, PyObject *args) {
     bool  _result;
     wxRegion * _arg0;
     wxRect * _arg1;
     bool  _result;
     wxRegion * _arg0;
     wxRect * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxRegion_Subtract",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxRegion_Subtract",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Subtract. Expected _wxRegion_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Subtract. Expected _wxRegion_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxRect_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_Subtract. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_Subtract. Expected _wxRect_p.");
         return NULL;
         }


@@ -3641,20 +3833,22 @@ static PyObject *_wrap_wxRegion_Union(PyObject *self, PyObject *args) {
     bool  _result;
     wxRegion * _arg0;
     wxRect * _arg1;
     bool  _result;
     wxRegion * _arg0;
     wxRect * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxRegion_Union",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxRegion_Union",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Union. Expected _wxRegion_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Union. Expected _wxRegion_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxRect_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_Union. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_Union. Expected _wxRect_p.");
         return NULL;
         }


@@ -3674,20 +3868,22 @@ static PyObject *_wrap_wxRegion_Xor(PyObject *self, PyObject *args) {
     bool  _result;
     wxRegion * _arg0;
     wxRect * _arg1;
     bool  _result;
     wxRegion * _arg0;
     wxRect * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxRegion_Xor",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxRegion_Xor",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Xor. Expected _wxRegion_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Xor. Expected _wxRegion_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxRect_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_Xor. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_Xor. Expected _wxRect_p.");
         return NULL;
         }


@@ -3706,14 +3902,15 @@ static PyObject *_wrap_new_wxRegionIterator(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRegionIterator * _result;
     wxRegion * _arg0;
     PyObject * _resultobj;
     wxRegionIterator * _result;
     wxRegion * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:new_wxRegionIterator",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:new_wxRegionIterator",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxRegionIterator. Expected _wxRegion_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxRegionIterator. Expected _wxRegion_p.");
         return NULL;
         }


@@ -3723,8 +3920,13 @@ static PyObject *_wrap_new_wxRegionIterator(PyObject *self, PyObject *args) {
         _result = (wxRegionIterator *)new_wxRegionIterator(*_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxRegionIterator *)new_wxRegionIterator(*_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxRegionIterator_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxRegionIterator_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3732,13 +3934,14 @@ static PyObject *_wrap_new_wxRegionIterator(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxRegionIterator(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRegionIterator * _arg0;
 static PyObject *_wrap_delete_wxRegionIterator(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRegionIterator * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:delete_wxRegionIterator",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxRegionIterator",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegionIterator_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxRegionIterator. Expected _wxRegionIterator_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxRegionIterator. Expected _wxRegionIterator_p.");
         return NULL;
         }


@@ -3758,13 +3961,14 @@ static PyObject *_wrap_wxRegionIterator_GetX(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxRegionIterator * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxRegionIterator * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxRegionIterator_GetX",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRegionIterator_GetX",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegionIterator_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetX. Expected _wxRegionIterator_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetX. Expected _wxRegionIterator_p.");
         return NULL;
         }


@@ -3783,13 +3987,14 @@ static PyObject *_wrap_wxRegionIterator_GetY(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxRegionIterator * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxRegionIterator * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxRegionIterator_GetY",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRegionIterator_GetY",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegionIterator_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetY. Expected _wxRegionIterator_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetY. Expected _wxRegionIterator_p.");
         return NULL;
         }


@@ -3808,13 +4013,14 @@ static PyObject *_wrap_wxRegionIterator_GetW(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxRegionIterator * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxRegionIterator * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxRegionIterator_GetW",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRegionIterator_GetW",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegionIterator_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetW. Expected _wxRegionIterator_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetW. Expected _wxRegionIterator_p.");
         return NULL;
         }


@@ -3833,13 +4039,14 @@ static PyObject *_wrap_wxRegionIterator_GetWidth(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     long  _result;
     wxRegionIterator * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxRegionIterator * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxRegionIterator_GetWidth",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRegionIterator_GetWidth",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegionIterator_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetWidth. Expected _wxRegionIterator_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetWidth. Expected _wxRegionIterator_p.");
         return NULL;
         }


@@ -3858,13 +4065,14 @@ static PyObject *_wrap_wxRegionIterator_GetH(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxRegionIterator * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxRegionIterator * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxRegionIterator_GetH",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRegionIterator_GetH",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegionIterator_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetH. Expected _wxRegionIterator_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetH. Expected _wxRegionIterator_p.");
         return NULL;
         }


@@ -3883,13 +4091,14 @@ static PyObject *_wrap_wxRegionIterator_GetHeight(PyObject *self, PyObject *args
     PyObject * _resultobj;
     long  _result;
     wxRegionIterator * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxRegionIterator * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxRegionIterator_GetHeight",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRegionIterator_GetHeight",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegionIterator_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetHeight. Expected _wxRegionIterator_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetHeight. Expected _wxRegionIterator_p.");
         return NULL;
         }


@@ -3908,14 +4117,15 @@ static PyObject *_wrap_wxRegionIterator_GetRect(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxRect * _result;
     wxRegionIterator * _arg0;
     PyObject * _resultobj;
     wxRect * _result;
     wxRegionIterator * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxRegionIterator_GetRect",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRegionIterator_GetRect",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegionIterator_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetRect. Expected _wxRegionIterator_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetRect. Expected _wxRegionIterator_p.");
         return NULL;
         }


@@ -3935,13 +4145,14 @@ static PyObject *_wrap_wxRegionIterator_HaveRects(PyObject *self, PyObject *args
     PyObject * _resultobj;
     bool  _result;
     wxRegionIterator * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxRegionIterator * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxRegionIterator_HaveRects",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRegionIterator_HaveRects",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegionIterator_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_HaveRects. Expected _wxRegionIterator_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_HaveRects. Expected _wxRegionIterator_p.");
         return NULL;
         }


@@ -3959,13 +4170,14 @@ static PyObject *_wrap_wxRegionIterator_HaveRects(PyObject *self, PyObject *args
 static PyObject *_wrap_wxRegionIterator_Reset(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRegionIterator * _arg0;
 static PyObject *_wrap_wxRegionIterator_Reset(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRegionIterator * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxRegionIterator_Reset",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRegionIterator_Reset",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegionIterator_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_Reset. Expected _wxRegionIterator_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_Reset. Expected _wxRegionIterator_p.");
         return NULL;
         }


@@ -3986,13 +4198,14 @@ static void  wxRegionIterator_Next(wxRegionIterator *self) {
 static PyObject *_wrap_wxRegionIterator_Next(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRegionIterator * _arg0;
 static PyObject *_wrap_wxRegionIterator_Next(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRegionIterator * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxRegionIterator_Next",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRegionIterator_Next",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegionIterator_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_Next. Expected _wxRegionIterator_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_Next. Expected _wxRegionIterator_p.");
         return NULL;
         }


@@ -4011,9 +4224,9 @@ static PyObject *_wrap_wxRegionIterator_Next(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_wxAcceleratorEntry(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxAcceleratorEntry * _result;
 static PyObject *_wrap_new_wxAcceleratorEntry(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxAcceleratorEntry * _result;

-    int  _arg0 = 0;
-    int  _arg1 = 0;
-    int  _arg2 = 0;
+    int  _arg0 = (int ) 0;
+    int  _arg1 = (int ) 0;
+    int  _arg2 = (int ) 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;


@@ -4024,8 +4237,13 @@ static PyObject *_wrap_new_wxAcceleratorEntry(PyObject *self, PyObject *args) {
         _result = (wxAcceleratorEntry *)new_wxAcceleratorEntry(_arg0,_arg1,_arg2);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxAcceleratorEntry *)new_wxAcceleratorEntry(_arg0,_arg1,_arg2);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxAcceleratorEntry_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxAcceleratorEntry_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -4036,13 +4254,14 @@ static PyObject *_wrap_wxAcceleratorEntry_Set(PyObject *self, PyObject *args) {
     int  _arg1;
     int  _arg2;
     int  _arg3;
     int  _arg1;
     int  _arg2;
     int  _arg3;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siii:wxAcceleratorEntry_Set",&_argc0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"Oiii:wxAcceleratorEntry_Set",&_argo0,&_arg1,&_arg2,&_arg3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxAcceleratorEntry_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxAcceleratorEntry_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxAcceleratorEntry_Set. Expected _wxAcceleratorEntry_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxAcceleratorEntry_Set. Expected _wxAcceleratorEntry_p.");
         return NULL;
         }


@@ -4062,13 +4281,14 @@ static PyObject *_wrap_wxAcceleratorEntry_GetFlags(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     int  _result;
     wxAcceleratorEntry * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxAcceleratorEntry * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxAcceleratorEntry_GetFlags",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxAcceleratorEntry_GetFlags",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxAcceleratorEntry_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxAcceleratorEntry_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxAcceleratorEntry_GetFlags. Expected _wxAcceleratorEntry_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxAcceleratorEntry_GetFlags. Expected _wxAcceleratorEntry_p.");
         return NULL;
         }


@@ -4087,13 +4307,14 @@ static PyObject *_wrap_wxAcceleratorEntry_GetKeyCode(PyObject *self, PyObject *a
     PyObject * _resultobj;
     int  _result;
     wxAcceleratorEntry * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxAcceleratorEntry * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxAcceleratorEntry_GetKeyCode",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxAcceleratorEntry_GetKeyCode",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxAcceleratorEntry_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxAcceleratorEntry_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxAcceleratorEntry_GetKeyCode. Expected _wxAcceleratorEntry_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxAcceleratorEntry_GetKeyCode. Expected _wxAcceleratorEntry_p.");
         return NULL;
         }


@@ -4112,13 +4333,14 @@ static PyObject *_wrap_wxAcceleratorEntry_GetCommand(PyObject *self, PyObject *a
     PyObject * _resultobj;
     int  _result;
     wxAcceleratorEntry * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxAcceleratorEntry * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxAcceleratorEntry_GetCommand",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxAcceleratorEntry_GetCommand",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxAcceleratorEntry_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxAcceleratorEntry_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxAcceleratorEntry_GetCommand. Expected _wxAcceleratorEntry_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxAcceleratorEntry_GetCommand. Expected _wxAcceleratorEntry_p.");
         return NULL;
         }


@@ -4164,8 +4386,13 @@ static PyObject *_wrap_new_wxAcceleratorTable(PyObject *self, PyObject *args) {
         _result = (wxAcceleratorTable *)new_wxAcceleratorTable(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxAcceleratorTable *)new_wxAcceleratorTable(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxAcceleratorTable_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxAcceleratorTable_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     delete [] _arg1;
 }
 {
     delete [] _arg1;
 }


@@ -4173,168 +4400,259 @@ static PyObject *_wrap_new_wxAcceleratorTable(PyObject *self, PyObject *args) {
 }
 
 static PyMethodDef misccMethods[] = {
 }
 
 static PyMethodDef misccMethods[] = {

-        { "new_wxAcceleratorTable", _wrap_new_wxAcceleratorTable, 1 },
-        { "wxAcceleratorEntry_GetCommand", _wrap_wxAcceleratorEntry_GetCommand, 1 },
-        { "wxAcceleratorEntry_GetKeyCode", _wrap_wxAcceleratorEntry_GetKeyCode, 1 },
-        { "wxAcceleratorEntry_GetFlags", _wrap_wxAcceleratorEntry_GetFlags, 1 },
-        { "wxAcceleratorEntry_Set", _wrap_wxAcceleratorEntry_Set, 1 },
-        { "new_wxAcceleratorEntry", _wrap_new_wxAcceleratorEntry, 1 },
-        { "wxRegionIterator_Next", _wrap_wxRegionIterator_Next, 1 },
-        { "wxRegionIterator_Reset", _wrap_wxRegionIterator_Reset, 1 },
-        { "wxRegionIterator_HaveRects", _wrap_wxRegionIterator_HaveRects, 1 },
-        { "wxRegionIterator_GetRect", _wrap_wxRegionIterator_GetRect, 1 },
-        { "wxRegionIterator_GetHeight", _wrap_wxRegionIterator_GetHeight, 1 },
-        { "wxRegionIterator_GetH", _wrap_wxRegionIterator_GetH, 1 },
-        { "wxRegionIterator_GetWidth", _wrap_wxRegionIterator_GetWidth, 1 },
-        { "wxRegionIterator_GetW", _wrap_wxRegionIterator_GetW, 1 },
-        { "wxRegionIterator_GetY", _wrap_wxRegionIterator_GetY, 1 },
-        { "wxRegionIterator_GetX", _wrap_wxRegionIterator_GetX, 1 },
-        { "delete_wxRegionIterator", _wrap_delete_wxRegionIterator, 1 },
-        { "new_wxRegionIterator", _wrap_new_wxRegionIterator, 1 },
-        { "wxRegion_Xor", _wrap_wxRegion_Xor, 1 },
-        { "wxRegion_Union", _wrap_wxRegion_Union, 1 },
-        { "wxRegion_Subtract", _wrap_wxRegion_Subtract, 1 },
-        { "wxRegion_IsEmpty", _wrap_wxRegion_IsEmpty, 1 },
-        { "wxRegion_Intersect", _wrap_wxRegion_Intersect, 1 },
-        { "wxRegion_GetBox", _wrap_wxRegion_GetBox, 1 },
-        { "wxRegion_ContainsRect", _wrap_wxRegion_ContainsRect, 1 },
-        { "wxRegion_ContainsPoint", _wrap_wxRegion_ContainsPoint, 1 },
-        { "wxRegion_Contains", _wrap_wxRegion_Contains, 1 },
-        { "wxRegion_Clear", _wrap_wxRegion_Clear, 1 },
-        { "delete_wxRegion", _wrap_delete_wxRegion, 1 },
-        { "new_wxRegion", _wrap_new_wxRegion, 1 },
-        { "wxLayoutConstraints_width_get", _wrap_wxLayoutConstraints_width_get, 1 },
-        { "wxLayoutConstraints_top_get", _wrap_wxLayoutConstraints_top_get, 1 },
-        { "wxLayoutConstraints_right_get", _wrap_wxLayoutConstraints_right_get, 1 },
-        { "wxLayoutConstraints_left_get", _wrap_wxLayoutConstraints_left_get, 1 },
-        { "wxLayoutConstraints_height_get", _wrap_wxLayoutConstraints_height_get, 1 },
-        { "wxLayoutConstraints_centreY_get", _wrap_wxLayoutConstraints_centreY_get, 1 },
-        { "wxLayoutConstraints_centreX_get", _wrap_wxLayoutConstraints_centreX_get, 1 },
-        { "wxLayoutConstraints_bottom_get", _wrap_wxLayoutConstraints_bottom_get, 1 },
-        { "new_wxLayoutConstraints", _wrap_new_wxLayoutConstraints, 1 },
-        { "wxIndividualLayoutConstraint_Set", _wrap_wxIndividualLayoutConstraint_Set, 1 },
-        { "wxIndividualLayoutConstraint_SameAs", _wrap_wxIndividualLayoutConstraint_SameAs, 1 },
-        { "wxIndividualLayoutConstraint_RightOf", _wrap_wxIndividualLayoutConstraint_RightOf, 1 },
-        { "wxIndividualLayoutConstraint_PercentOf", _wrap_wxIndividualLayoutConstraint_PercentOf, 1 },
-        { "wxIndividualLayoutConstraint_LeftOf", _wrap_wxIndividualLayoutConstraint_LeftOf, 1 },
-        { "wxIndividualLayoutConstraint_Unconstrained", _wrap_wxIndividualLayoutConstraint_Unconstrained, 1 },
-        { "wxIndividualLayoutConstraint_Below", _wrap_wxIndividualLayoutConstraint_Below, 1 },
-        { "wxIndividualLayoutConstraint_AsIs", _wrap_wxIndividualLayoutConstraint_AsIs, 1 },
-        { "wxIndividualLayoutConstraint_Absolute", _wrap_wxIndividualLayoutConstraint_Absolute, 1 },
-        { "wxIndividualLayoutConstraint_Above", _wrap_wxIndividualLayoutConstraint_Above, 1 },
-        { "wxPyTimer_Stop", _wrap_wxPyTimer_Stop, 1 },
-        { "wxPyTimer_Start", _wrap_wxPyTimer_Start, 1 },
-        { "wxPyTimer_Interval", _wrap_wxPyTimer_Interval, 1 },
-        { "delete_wxPyTimer", _wrap_delete_wxPyTimer, 1 },
-        { "new_wxPyTimer", _wrap_new_wxPyTimer, 1 },
-        { "wxRect_asTuple", _wrap_wxRect_asTuple, 1 },
-        { "wxRect_height_get", _wrap_wxRect_height_get, 1 },
-        { "wxRect_height_set", _wrap_wxRect_height_set, 1 },
-        { "wxRect_width_get", _wrap_wxRect_width_get, 1 },
-        { "wxRect_width_set", _wrap_wxRect_width_set, 1 },
-        { "wxRect_y_get", _wrap_wxRect_y_get, 1 },
-        { "wxRect_y_set", _wrap_wxRect_y_set, 1 },
-        { "wxRect_x_get", _wrap_wxRect_x_get, 1 },
-        { "wxRect_x_set", _wrap_wxRect_x_set, 1 },
-        { "wxRect_GetRight", _wrap_wxRect_GetRight, 1 },
-        { "wxRect_GetBottom", _wrap_wxRect_GetBottom, 1 },
-        { "wxRect_GetTop", _wrap_wxRect_GetTop, 1 },
-        { "wxRect_GetLeft", _wrap_wxRect_GetLeft, 1 },
-        { "wxRect_GetSize", _wrap_wxRect_GetSize, 1 },
-        { "wxRect_GetPosition", _wrap_wxRect_GetPosition, 1 },
-        { "wxRect_SetHeight", _wrap_wxRect_SetHeight, 1 },
-        { "wxRect_GetHeight", _wrap_wxRect_GetHeight, 1 },
-        { "wxRect_SetWidth", _wrap_wxRect_SetWidth, 1 },
-        { "wxRect_GetWidth", _wrap_wxRect_GetWidth, 1 },
-        { "wxRect_SetY", _wrap_wxRect_SetY, 1 },
-        { "wxRect_GetY", _wrap_wxRect_GetY, 1 },
-        { "wxRect_SetX", _wrap_wxRect_SetX, 1 },
-        { "wxRect_GetX", _wrap_wxRect_GetX, 1 },
-        { "delete_wxRect", _wrap_delete_wxRect, 1 },
-        { "new_wxRect", _wrap_new_wxRect, 1 },
-        { "wxPoint_asTuple", _wrap_wxPoint_asTuple, 1 },
-        { "wxPoint_Set", _wrap_wxPoint_Set, 1 },
-        { "delete_wxPoint", _wrap_delete_wxPoint, 1 },
-        { "new_wxPoint", _wrap_new_wxPoint, 1 },
-        { "wxPoint_y_get", _wrap_wxPoint_y_get, 1 },
-        { "wxPoint_y_set", _wrap_wxPoint_y_set, 1 },
-        { "wxPoint_x_get", _wrap_wxPoint_x_get, 1 },
-        { "wxPoint_x_set", _wrap_wxPoint_x_set, 1 },
-        { "delete_wxRealPoint", _wrap_delete_wxRealPoint, 1 },
-        { "new_wxRealPoint", _wrap_new_wxRealPoint, 1 },
-        { "wxRealPoint_y_get", _wrap_wxRealPoint_y_get, 1 },
-        { "wxRealPoint_y_set", _wrap_wxRealPoint_y_set, 1 },
-        { "wxRealPoint_x_get", _wrap_wxRealPoint_x_get, 1 },
-        { "wxRealPoint_x_set", _wrap_wxRealPoint_x_set, 1 },
-        { "wxSize_asTuple", _wrap_wxSize_asTuple, 1 },
-        { "wxSize_SetHeight", _wrap_wxSize_SetHeight, 1 },
-        { "wxSize_SetWidth", _wrap_wxSize_SetWidth, 1 },
-        { "wxSize_GetHeight", _wrap_wxSize_GetHeight, 1 },
-        { "wxSize_GetWidth", _wrap_wxSize_GetWidth, 1 },
-        { "wxSize_GetY", _wrap_wxSize_GetY, 1 },
-        { "wxSize_GetX", _wrap_wxSize_GetX, 1 },
-        { "wxSize_Set", _wrap_wxSize_Set, 1 },
-        { "delete_wxSize", _wrap_delete_wxSize, 1 },
-        { "new_wxSize", _wrap_new_wxSize, 1 },
-        { "wxSize_height_get", _wrap_wxSize_y_get, 1 },
-        { "wxSize_height_set", _wrap_wxSize_y_set, 1 },
-        { "wxSize_width_get", _wrap_wxSize_x_get, 1 },
-        { "wxSize_width_set", _wrap_wxSize_x_set, 1 },
-        { "wxSize_y_get", _wrap_wxSize_y_get, 1 },
-        { "wxSize_y_set", _wrap_wxSize_y_set, 1 },
-        { "wxSize_x_get", _wrap_wxSize_x_get, 1 },
-        { "wxSize_x_set", _wrap_wxSize_x_set, 1 },
-        { "wxSystemSettings_GetSystemMetric", _wrap_wxSystemSettings_GetSystemMetric, 1 },
-        { "wxSystemSettings_GetSystemFont", _wrap_wxSystemSettings_GetSystemFont, 1 },
-        { "wxSystemSettings_GetSystemColour", _wrap_wxSystemSettings_GetSystemColour, 1 },
-        { "wxResourceParseString", _wrap_wxResourceParseString, 1 },
-        { "wxResourceParseFile", _wrap_wxResourceParseFile, 1 },
-        { "wxResourceParseData", _wrap_wxResourceParseData, 1 },
-        { "wxResourceGetIdentifier", _wrap_wxResourceGetIdentifier, 1 },
-        { "wxResourceCreateMenuBar", _wrap_wxResourceCreateMenuBar, 1 },
-        { "wxResourceCreateIcon", _wrap_wxResourceCreateIcon, 1 },
-        { "wxResourceCreateBitmap", _wrap_wxResourceCreateBitmap, 1 },
-        { "wxResourceClear", _wrap_wxResourceClear, 1 },
-        { "wxResourceAddIdentifier", _wrap_wxResourceAddIdentifier, 1 },
-        { "wxGetResource", _wrap_wxGetResource, 1 },
-        { "wxEnableTopLevelWindows", _wrap_wxEnableTopLevelWindows, 1 },
-        { "wxSafeYield", _wrap_wxSafeYield, 1 },
-        { "wxYield", _wrap_wxYield, 1 },
-        { "wxSleep", _wrap_wxSleep, 1 },
-        { "wxGetOsVersion", _wrap_wxGetOsVersion, 1 },
-        { "wxStartTimer", _wrap_wxStartTimer, 1 },
-        { "wxShell", _wrap_wxShell, 1 },
-        { "wxNow", _wrap_wxNow, 1 },
-        { "wxIsBusy", _wrap_wxIsBusy, 1 },
-        { "wxGetMousePosition", _wrap_wxGetMousePosition, 1 },
-        { "wxGetFreeMemory", _wrap_wxGetFreeMemory, 1 },
-        { "wxGetElapsedTime", _wrap_wxGetElapsedTime, 1 },
-        { "wxGetActiveWindow", _wrap_wxGetActiveWindow, 1 },
-        { "wxExecute", _wrap_wxExecute, 1 },
-        { "wxEndBusyCursor", _wrap_wxEndBusyCursor, 1 },
-        { "wxDisplaySize", _wrap_wxDisplaySize, 1 },
-        { "wxBell", _wrap_wxBell, 1 },
-        { "wxBeginBusyCursor", _wrap_wxBeginBusyCursor, 1 },
-        { "RegisterId", _wrap_RegisterId, 1 },
-        { "NewId", _wrap_NewId, 1 },
-        { "wxRegisterId", _wrap_wxRegisterId, 1 },
-        { "wxNewId", _wrap_wxNewId, 1 },
-        { "wxSetCursor", _wrap_wxSetCursor, 1 },
-        { "wxDisplayDepth", _wrap_wxDisplayDepth, 1 },
-        { "wxColourDisplay", _wrap_wxColourDisplay, 1 },
-        { "wxGetNumberFromUser", _wrap_wxGetNumberFromUser, 1 },
-        { "wxMessageBox", _wrap_wxMessageBox, 1 },
-        { "wxGetSingleChoiceIndex", _wrap_wxGetSingleChoiceIndex, 1 },
-        { "wxGetSingleChoice", _wrap_wxGetSingleChoice, 1 },
-        { "wxGetTextFromUser", _wrap_wxGetTextFromUser, 1 },
-        { "wxFileSelector", _wrap_wxFileSelector, 1 },
+        { "new_wxAcceleratorTable", _wrap_new_wxAcceleratorTable, METH_VARARGS },
+        { "wxAcceleratorEntry_GetCommand", _wrap_wxAcceleratorEntry_GetCommand, METH_VARARGS },
+        { "wxAcceleratorEntry_GetKeyCode", _wrap_wxAcceleratorEntry_GetKeyCode, METH_VARARGS },
+        { "wxAcceleratorEntry_GetFlags", _wrap_wxAcceleratorEntry_GetFlags, METH_VARARGS },
+        { "wxAcceleratorEntry_Set", _wrap_wxAcceleratorEntry_Set, METH_VARARGS },
+        { "new_wxAcceleratorEntry", _wrap_new_wxAcceleratorEntry, METH_VARARGS },
+        { "wxRegionIterator_Next", _wrap_wxRegionIterator_Next, METH_VARARGS },
+        { "wxRegionIterator_Reset", _wrap_wxRegionIterator_Reset, METH_VARARGS },
+        { "wxRegionIterator_HaveRects", _wrap_wxRegionIterator_HaveRects, METH_VARARGS },
+        { "wxRegionIterator_GetRect", _wrap_wxRegionIterator_GetRect, METH_VARARGS },
+        { "wxRegionIterator_GetHeight", _wrap_wxRegionIterator_GetHeight, METH_VARARGS },
+        { "wxRegionIterator_GetH", _wrap_wxRegionIterator_GetH, METH_VARARGS },
+        { "wxRegionIterator_GetWidth", _wrap_wxRegionIterator_GetWidth, METH_VARARGS },
+        { "wxRegionIterator_GetW", _wrap_wxRegionIterator_GetW, METH_VARARGS },
+        { "wxRegionIterator_GetY", _wrap_wxRegionIterator_GetY, METH_VARARGS },
+        { "wxRegionIterator_GetX", _wrap_wxRegionIterator_GetX, METH_VARARGS },
+        { "delete_wxRegionIterator", _wrap_delete_wxRegionIterator, METH_VARARGS },
+        { "new_wxRegionIterator", _wrap_new_wxRegionIterator, METH_VARARGS },
+        { "wxRegion_Xor", _wrap_wxRegion_Xor, METH_VARARGS },
+        { "wxRegion_Union", _wrap_wxRegion_Union, METH_VARARGS },
+        { "wxRegion_Subtract", _wrap_wxRegion_Subtract, METH_VARARGS },
+        { "wxRegion_IsEmpty", _wrap_wxRegion_IsEmpty, METH_VARARGS },
+        { "wxRegion_Intersect", _wrap_wxRegion_Intersect, METH_VARARGS },
+        { "wxRegion_GetBox", _wrap_wxRegion_GetBox, METH_VARARGS },
+        { "wxRegion_ContainsRect", _wrap_wxRegion_ContainsRect, METH_VARARGS },
+        { "wxRegion_ContainsPoint", _wrap_wxRegion_ContainsPoint, METH_VARARGS },
+        { "wxRegion_Contains", _wrap_wxRegion_Contains, METH_VARARGS },
+        { "wxRegion_Clear", _wrap_wxRegion_Clear, METH_VARARGS },
+        { "delete_wxRegion", _wrap_delete_wxRegion, METH_VARARGS },
+        { "new_wxRegion", _wrap_new_wxRegion, METH_VARARGS },
+        { "wxLayoutConstraints_width_get", _wrap_wxLayoutConstraints_width_get, METH_VARARGS },
+        { "wxLayoutConstraints_top_get", _wrap_wxLayoutConstraints_top_get, METH_VARARGS },
+        { "wxLayoutConstraints_right_get", _wrap_wxLayoutConstraints_right_get, METH_VARARGS },
+        { "wxLayoutConstraints_left_get", _wrap_wxLayoutConstraints_left_get, METH_VARARGS },
+        { "wxLayoutConstraints_height_get", _wrap_wxLayoutConstraints_height_get, METH_VARARGS },
+        { "wxLayoutConstraints_centreY_get", _wrap_wxLayoutConstraints_centreY_get, METH_VARARGS },
+        { "wxLayoutConstraints_centreX_get", _wrap_wxLayoutConstraints_centreX_get, METH_VARARGS },
+        { "wxLayoutConstraints_bottom_get", _wrap_wxLayoutConstraints_bottom_get, METH_VARARGS },
+        { "new_wxLayoutConstraints", _wrap_new_wxLayoutConstraints, METH_VARARGS },
+        { "wxIndividualLayoutConstraint_Set", _wrap_wxIndividualLayoutConstraint_Set, METH_VARARGS },
+        { "wxIndividualLayoutConstraint_SameAs", _wrap_wxIndividualLayoutConstraint_SameAs, METH_VARARGS },
+        { "wxIndividualLayoutConstraint_RightOf", _wrap_wxIndividualLayoutConstraint_RightOf, METH_VARARGS },
+        { "wxIndividualLayoutConstraint_PercentOf", _wrap_wxIndividualLayoutConstraint_PercentOf, METH_VARARGS },
+        { "wxIndividualLayoutConstraint_LeftOf", _wrap_wxIndividualLayoutConstraint_LeftOf, METH_VARARGS },
+        { "wxIndividualLayoutConstraint_Unconstrained", _wrap_wxIndividualLayoutConstraint_Unconstrained, METH_VARARGS },
+        { "wxIndividualLayoutConstraint_Below", _wrap_wxIndividualLayoutConstraint_Below, METH_VARARGS },
+        { "wxIndividualLayoutConstraint_AsIs", _wrap_wxIndividualLayoutConstraint_AsIs, METH_VARARGS },
+        { "wxIndividualLayoutConstraint_Absolute", _wrap_wxIndividualLayoutConstraint_Absolute, METH_VARARGS },
+        { "wxIndividualLayoutConstraint_Above", _wrap_wxIndividualLayoutConstraint_Above, METH_VARARGS },
+        { "wxPyTimer_Stop", _wrap_wxPyTimer_Stop, METH_VARARGS },
+        { "wxPyTimer_Start", _wrap_wxPyTimer_Start, METH_VARARGS },
+        { "wxPyTimer_Interval", _wrap_wxPyTimer_Interval, METH_VARARGS },
+        { "delete_wxPyTimer", _wrap_delete_wxPyTimer, METH_VARARGS },
+        { "new_wxPyTimer", _wrap_new_wxPyTimer, METH_VARARGS },
+        { "wxRect_asTuple", _wrap_wxRect_asTuple, METH_VARARGS },
+        { "wxRect_height_get", _wrap_wxRect_height_get, METH_VARARGS },
+        { "wxRect_height_set", _wrap_wxRect_height_set, METH_VARARGS },
+        { "wxRect_width_get", _wrap_wxRect_width_get, METH_VARARGS },
+        { "wxRect_width_set", _wrap_wxRect_width_set, METH_VARARGS },
+        { "wxRect_y_get", _wrap_wxRect_y_get, METH_VARARGS },
+        { "wxRect_y_set", _wrap_wxRect_y_set, METH_VARARGS },
+        { "wxRect_x_get", _wrap_wxRect_x_get, METH_VARARGS },
+        { "wxRect_x_set", _wrap_wxRect_x_set, METH_VARARGS },
+        { "wxRect_GetRight", _wrap_wxRect_GetRight, METH_VARARGS },
+        { "wxRect_GetBottom", _wrap_wxRect_GetBottom, METH_VARARGS },
+        { "wxRect_GetTop", _wrap_wxRect_GetTop, METH_VARARGS },
+        { "wxRect_GetLeft", _wrap_wxRect_GetLeft, METH_VARARGS },
+        { "wxRect_GetSize", _wrap_wxRect_GetSize, METH_VARARGS },
+        { "wxRect_GetPosition", _wrap_wxRect_GetPosition, METH_VARARGS },
+        { "wxRect_SetHeight", _wrap_wxRect_SetHeight, METH_VARARGS },
+        { "wxRect_GetHeight", _wrap_wxRect_GetHeight, METH_VARARGS },
+        { "wxRect_SetWidth", _wrap_wxRect_SetWidth, METH_VARARGS },
+        { "wxRect_GetWidth", _wrap_wxRect_GetWidth, METH_VARARGS },
+        { "wxRect_SetY", _wrap_wxRect_SetY, METH_VARARGS },
+        { "wxRect_GetY", _wrap_wxRect_GetY, METH_VARARGS },
+        { "wxRect_SetX", _wrap_wxRect_SetX, METH_VARARGS },
+        { "wxRect_GetX", _wrap_wxRect_GetX, METH_VARARGS },
+        { "delete_wxRect", _wrap_delete_wxRect, METH_VARARGS },
+        { "new_wxRect", _wrap_new_wxRect, METH_VARARGS },
+        { "wxPoint_asTuple", _wrap_wxPoint_asTuple, METH_VARARGS },
+        { "wxPoint_Set", _wrap_wxPoint_Set, METH_VARARGS },
+        { "delete_wxPoint", _wrap_delete_wxPoint, METH_VARARGS },
+        { "new_wxPoint", _wrap_new_wxPoint, METH_VARARGS },
+        { "wxPoint_y_get", _wrap_wxPoint_y_get, METH_VARARGS },
+        { "wxPoint_y_set", _wrap_wxPoint_y_set, METH_VARARGS },
+        { "wxPoint_x_get", _wrap_wxPoint_x_get, METH_VARARGS },
+        { "wxPoint_x_set", _wrap_wxPoint_x_set, METH_VARARGS },
+        { "delete_wxRealPoint", _wrap_delete_wxRealPoint, METH_VARARGS },
+        { "new_wxRealPoint", _wrap_new_wxRealPoint, METH_VARARGS },
+        { "wxRealPoint_y_get", _wrap_wxRealPoint_y_get, METH_VARARGS },
+        { "wxRealPoint_y_set", _wrap_wxRealPoint_y_set, METH_VARARGS },
+        { "wxRealPoint_x_get", _wrap_wxRealPoint_x_get, METH_VARARGS },
+        { "wxRealPoint_x_set", _wrap_wxRealPoint_x_set, METH_VARARGS },
+        { "wxSize_asTuple", _wrap_wxSize_asTuple, METH_VARARGS },
+        { "wxSize_SetHeight", _wrap_wxSize_SetHeight, METH_VARARGS },
+        { "wxSize_SetWidth", _wrap_wxSize_SetWidth, METH_VARARGS },
+        { "wxSize_GetHeight", _wrap_wxSize_GetHeight, METH_VARARGS },
+        { "wxSize_GetWidth", _wrap_wxSize_GetWidth, METH_VARARGS },
+        { "wxSize_GetY", _wrap_wxSize_GetY, METH_VARARGS },
+        { "wxSize_GetX", _wrap_wxSize_GetX, METH_VARARGS },
+        { "wxSize_Set", _wrap_wxSize_Set, METH_VARARGS },
+        { "delete_wxSize", _wrap_delete_wxSize, METH_VARARGS },
+        { "new_wxSize", _wrap_new_wxSize, METH_VARARGS },
+        { "wxSize_height_get", _wrap_wxSize_y_get, METH_VARARGS },
+        { "wxSize_height_set", _wrap_wxSize_y_set, METH_VARARGS },
+        { "wxSize_width_get", _wrap_wxSize_x_get, METH_VARARGS },
+        { "wxSize_width_set", _wrap_wxSize_x_set, METH_VARARGS },
+        { "wxSize_y_get", _wrap_wxSize_y_get, METH_VARARGS },
+        { "wxSize_y_set", _wrap_wxSize_y_set, METH_VARARGS },
+        { "wxSize_x_get", _wrap_wxSize_x_get, METH_VARARGS },
+        { "wxSize_x_set", _wrap_wxSize_x_set, METH_VARARGS },
+        { "wxSystemSettings_GetSystemMetric", _wrap_wxSystemSettings_GetSystemMetric, METH_VARARGS },
+        { "wxSystemSettings_GetSystemFont", _wrap_wxSystemSettings_GetSystemFont, METH_VARARGS },
+        { "wxSystemSettings_GetSystemColour", _wrap_wxSystemSettings_GetSystemColour, METH_VARARGS },
+        { "wxResourceParseString", _wrap_wxResourceParseString, METH_VARARGS },
+        { "wxResourceParseFile", _wrap_wxResourceParseFile, METH_VARARGS },
+        { "wxResourceParseData", _wrap_wxResourceParseData, METH_VARARGS },
+        { "wxResourceGetIdentifier", _wrap_wxResourceGetIdentifier, METH_VARARGS },
+        { "wxResourceCreateMenuBar", _wrap_wxResourceCreateMenuBar, METH_VARARGS },
+        { "wxResourceCreateIcon", _wrap_wxResourceCreateIcon, METH_VARARGS },
+        { "wxResourceCreateBitmap", _wrap_wxResourceCreateBitmap, METH_VARARGS },
+        { "wxResourceClear", _wrap_wxResourceClear, METH_VARARGS },
+        { "wxResourceAddIdentifier", _wrap_wxResourceAddIdentifier, METH_VARARGS },
+        { "wxGetResource", _wrap_wxGetResource, METH_VARARGS },
+        { "wxEnableTopLevelWindows", _wrap_wxEnableTopLevelWindows, METH_VARARGS },
+        { "wxSafeYield", _wrap_wxSafeYield, METH_VARARGS },
+        { "wxYield", _wrap_wxYield, METH_VARARGS },
+        { "wxSleep", _wrap_wxSleep, METH_VARARGS },
+        { "wxGetOsVersion", _wrap_wxGetOsVersion, METH_VARARGS },
+        { "wxStartTimer", _wrap_wxStartTimer, METH_VARARGS },
+        { "wxShell", _wrap_wxShell, METH_VARARGS },
+        { "wxNow", _wrap_wxNow, METH_VARARGS },
+        { "wxIsBusy", _wrap_wxIsBusy, METH_VARARGS },
+        { "wxGetMousePosition", _wrap_wxGetMousePosition, METH_VARARGS },
+        { "wxGetFreeMemory", _wrap_wxGetFreeMemory, METH_VARARGS },
+        { "wxGetElapsedTime", _wrap_wxGetElapsedTime, METH_VARARGS },
+        { "wxGetActiveWindow", _wrap_wxGetActiveWindow, METH_VARARGS },
+        { "wxExecute", _wrap_wxExecute, METH_VARARGS },
+        { "wxEndBusyCursor", _wrap_wxEndBusyCursor, METH_VARARGS },
+        { "wxDisplaySize", _wrap_wxDisplaySize, METH_VARARGS },
+        { "wxBell", _wrap_wxBell, METH_VARARGS },
+        { "wxBeginBusyCursor", _wrap_wxBeginBusyCursor, METH_VARARGS },
+        { "RegisterId", _wrap_RegisterId, METH_VARARGS },
+        { "NewId", _wrap_NewId, METH_VARARGS },
+        { "wxRegisterId", _wrap_wxRegisterId, METH_VARARGS },
+        { "wxNewId", _wrap_wxNewId, METH_VARARGS },
+        { "wxSetCursor", _wrap_wxSetCursor, METH_VARARGS },
+        { "wxDisplayDepth", _wrap_wxDisplayDepth, METH_VARARGS },
+        { "wxColourDisplay", _wrap_wxColourDisplay, METH_VARARGS },
+        { "wxGetNumberFromUser", _wrap_wxGetNumberFromUser, METH_VARARGS },
+        { "wxMessageBox", _wrap_wxMessageBox, METH_VARARGS },
+        { "wxGetSingleChoiceIndex", _wrap_wxGetSingleChoiceIndex, METH_VARARGS },
+        { "wxGetSingleChoice", _wrap_wxGetSingleChoice, METH_VARARGS },
+        { "wxGetTextFromUser", _wrap_wxGetTextFromUser, METH_VARARGS },
+        { "wxFileSelector", _wrap_wxFileSelector, METH_VARARGS },

         { NULL, NULL }
 };
         { NULL, NULL }
 };

+#ifdef __cplusplus
+}
+#endif
+/*
+ * This table is used by the pointer type-checker
+ */
+static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
+    { "_wxAcceleratorTable","_class_wxAcceleratorTable",0},
+    { "_signed_long","_long",0},
+    { "_wxPrintQuality","_int",0},
+    { "_wxPrintQuality","_signed_int",0},
+    { "_wxPrintQuality","_unsigned_int",0},
+    { "_wxPrintQuality","_wxWindowID",0},
+    { "_wxPrintQuality","_uint",0},
+    { "_wxPrintQuality","_EBool",0},
+    { "_wxPrintQuality","_size_t",0},
+    { "_class_wxRegionIterator","_wxRegionIterator",0},
+    { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
+    { "_byte","_unsigned_char",0},
+    { "_long","_unsigned_long",0},
+    { "_long","_signed_long",0},
+    { "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
+    { "_size_t","_wxPrintQuality",0},
+    { "_size_t","_unsigned_int",0},
+    { "_size_t","_int",0},
+    { "_size_t","_wxWindowID",0},
+    { "_size_t","_uint",0},
+    { "_class_wxRealPoint","_wxRealPoint",0},
+    { "_uint","_wxPrintQuality",0},
+    { "_uint","_size_t",0},
+    { "_uint","_unsigned_int",0},
+    { "_uint","_int",0},
+    { "_uint","_wxWindowID",0},
+    { "_wxRect","_class_wxRect",0},
+    { "_wxPoint","_class_wxPoint",0},
+    { "_wxPyTimer","_class_wxPyTimer",0},
+    { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
+    { "_EBool","_wxPrintQuality",0},
+    { "_EBool","_signed_int",0},
+    { "_EBool","_int",0},
+    { "_EBool","_wxWindowID",0},
+    { "_class_wxRegion","_wxRegion",0},
+    { "_unsigned_long","_long",0},
+    { "_class_wxRect","_wxRect",0},
+    { "_class_wxPyTimer","_wxPyTimer",0},
+    { "_wxAcceleratorEntry","_class_wxAcceleratorEntry",0},
+    { "_signed_int","_wxPrintQuality",0},
+    { "_signed_int","_EBool",0},
+    { "_signed_int","_wxWindowID",0},
+    { "_signed_int","_int",0},
+    { "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
+    { "_WXTYPE","_short",0},
+    { "_WXTYPE","_signed_short",0},
+    { "_WXTYPE","_unsigned_short",0},
+    { "_unsigned_short","_WXTYPE",0},
+    { "_unsigned_short","_short",0},
+    { "_class_wxPoint","_wxPoint",0},
+    { "_wxRealPoint","_class_wxRealPoint",0},
+    { "_signed_short","_WXTYPE",0},
+    { "_signed_short","_short",0},
+    { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
+    { "_unsigned_char","_byte",0},
+    { "_unsigned_int","_wxPrintQuality",0},
+    { "_unsigned_int","_size_t",0},
+    { "_unsigned_int","_uint",0},
+    { "_unsigned_int","_wxWindowID",0},
+    { "_unsigned_int","_int",0},
+    { "_short","_WXTYPE",0},
+    { "_short","_unsigned_short",0},
+    { "_short","_signed_short",0},
+    { "_wxWindowID","_wxPrintQuality",0},
+    { "_wxWindowID","_size_t",0},
+    { "_wxWindowID","_EBool",0},
+    { "_wxWindowID","_uint",0},
+    { "_wxWindowID","_int",0},
+    { "_wxWindowID","_signed_int",0},
+    { "_wxWindowID","_unsigned_int",0},
+    { "_int","_wxPrintQuality",0},
+    { "_int","_size_t",0},
+    { "_int","_EBool",0},
+    { "_int","_uint",0},
+    { "_int","_wxWindowID",0},
+    { "_int","_unsigned_int",0},
+    { "_int","_signed_int",0},
+    { "_wxSize","_class_wxSize",0},
+    { "_wxRegionIterator","_class_wxRegionIterator",0},
+    { "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
+    { "_wxRegion","_class_wxRegion",0},
+    { "_class_wxSize","_wxSize",0},
+{0,0,0}};
+

 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif
 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif

-SWIGEXPORT(void,initmiscc)() {
+SWIGEXPORT(void) initmiscc() {

         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("miscc", misccMethods);
         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("miscc", misccMethods);


@@ -4447,90 +4765,9 @@ SWIGEXPORT(void,initmiscc)() {
         PyDict_SetItemString(d,"wxSYS_PENWINDOWS_PRESENT", PyInt_FromLong((long) wxSYS_PENWINDOWS_PRESENT));
         PyDict_SetItemString(d,"wxSYS_SHOW_SOUNDS", PyInt_FromLong((long) wxSYS_SHOW_SOUNDS));
         PyDict_SetItemString(d,"wxSYS_SWAP_BUTTONS", PyInt_FromLong((long) wxSYS_SWAP_BUTTONS));
         PyDict_SetItemString(d,"wxSYS_PENWINDOWS_PRESENT", PyInt_FromLong((long) wxSYS_PENWINDOWS_PRESENT));
         PyDict_SetItemString(d,"wxSYS_SHOW_SOUNDS", PyInt_FromLong((long) wxSYS_SHOW_SOUNDS));
         PyDict_SetItemString(d,"wxSYS_SWAP_BUTTONS", PyInt_FromLong((long) wxSYS_SWAP_BUTTONS));

-/*
- * These are the pointer type-equivalency mappings. 
- * (Used by the SWIG pointer type-checker).
- */
-        SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_signed_long","_long",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_signed_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_unsigned_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_wxWindowID",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_uint",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_EBool",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_size_t",0);
-        SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
-        SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_byte","_unsigned_char",0);
-        SWIG_RegisterMapping("_long","_unsigned_long",0);
-        SWIG_RegisterMapping("_long","_signed_long",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_size_t","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_size_t","_unsigned_int",0);
-        SWIG_RegisterMapping("_size_t","_int",0);
-        SWIG_RegisterMapping("_size_t","_wxWindowID",0);
-        SWIG_RegisterMapping("_size_t","_uint",0);
-        SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
-        SWIG_RegisterMapping("_uint","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_uint","_size_t",0);
-        SWIG_RegisterMapping("_uint","_unsigned_int",0);
-        SWIG_RegisterMapping("_uint","_int",0);
-        SWIG_RegisterMapping("_uint","_wxWindowID",0);
-        SWIG_RegisterMapping("_wxRect","_class_wxRect",0);
-        SWIG_RegisterMapping("_wxPoint","_class_wxPoint",0);
-        SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
-        SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_EBool","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_EBool","_signed_int",0);
-        SWIG_RegisterMapping("_EBool","_int",0);
-        SWIG_RegisterMapping("_EBool","_wxWindowID",0);
-        SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
-        SWIG_RegisterMapping("_unsigned_long","_long",0);
-        SWIG_RegisterMapping("_class_wxRect","_wxRect",0);
-        SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxAcceleratorEntry","_class_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_signed_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_signed_int","_EBool",0);
-        SWIG_RegisterMapping("_signed_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_signed_int","_int",0);
-        SWIG_RegisterMapping("_wxLayoutConstraints","_class_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_WXTYPE","_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_signed_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_unsigned_short",0);
-        SWIG_RegisterMapping("_unsigned_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_unsigned_short","_short",0);
-        SWIG_RegisterMapping("_class_wxPoint","_wxPoint",0);
-        SWIG_RegisterMapping("_wxRealPoint","_class_wxRealPoint",0);
-        SWIG_RegisterMapping("_signed_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_signed_short","_short",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_unsigned_char","_byte",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_unsigned_int","_size_t",0);
-        SWIG_RegisterMapping("_unsigned_int","_uint",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_unsigned_int","_int",0);
-        SWIG_RegisterMapping("_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_short","_unsigned_short",0);
-        SWIG_RegisterMapping("_short","_signed_short",0);
-        SWIG_RegisterMapping("_wxWindowID","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_wxWindowID","_size_t",0);
-        SWIG_RegisterMapping("_wxWindowID","_EBool",0);
-        SWIG_RegisterMapping("_wxWindowID","_uint",0);
-        SWIG_RegisterMapping("_wxWindowID","_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_signed_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_int","_size_t",0);
-        SWIG_RegisterMapping("_int","_EBool",0);
-        SWIG_RegisterMapping("_int","_uint",0);
-        SWIG_RegisterMapping("_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_int","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_signed_int",0);
-        SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
-        SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
-        SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
-        SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
+{
+   int i;
+   for (i = 0; _swig_mapping[i].n1; i++)
+        SWIG_RegisterMapping(_swig_mapping[i].n1,_swig_mapping[i].n2,_swig_mapping[i].pcnv);
+}

 }
 }

diff --git a/utils/wxPython/src/msw/misc.py b/utils/wxPython/src/msw/misc.py
index d04285b4fd4de4ba8c3a45dae336879358dc068b..7aa83f61a385562b388a6b920ebcb2ec859cffcb 100644 (file)
--- a/utils/wxPython/src/msw/misc.py
+++ b/utils/wxPython/src/msw/misc.py
@@ -4,64 +4,64 @@ class wxSizePtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self, miscc=miscc):
+    def __del__(self,miscc=miscc):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            miscc.delete_wxSize(self.this)
-    def Set(self,arg0,arg1):
-        val = miscc.wxSize_Set(self.this,arg0,arg1)
+            miscc.delete_wxSize(self)
+    def Set(self, *_args, **_kwargs):
+        val = apply(miscc.wxSize_Set,(self,) + _args, _kwargs)

         return val
         return val

-    def GetX(self):
-        val = miscc.wxSize_GetX(self.this)
+    def GetX(self, *_args, **_kwargs):
+        val = apply(miscc.wxSize_GetX,(self,) + _args, _kwargs)

         return val
         return val

-    def GetY(self):
-        val = miscc.wxSize_GetY(self.this)
+    def GetY(self, *_args, **_kwargs):
+        val = apply(miscc.wxSize_GetY,(self,) + _args, _kwargs)

         return val
         return val

-    def GetWidth(self):
-        val = miscc.wxSize_GetWidth(self.this)
+    def GetWidth(self, *_args, **_kwargs):
+        val = apply(miscc.wxSize_GetWidth,(self,) + _args, _kwargs)

         return val
         return val

-    def GetHeight(self):
-        val = miscc.wxSize_GetHeight(self.this)
+    def GetHeight(self, *_args, **_kwargs):
+        val = apply(miscc.wxSize_GetHeight,(self,) + _args, _kwargs)

         return val
         return val

-    def SetWidth(self,arg0):
-        val = miscc.wxSize_SetWidth(self.this,arg0)
+    def SetWidth(self, *_args, **_kwargs):
+        val = apply(miscc.wxSize_SetWidth,(self,) + _args, _kwargs)

         return val
         return val

-    def SetHeight(self,arg0):
-        val = miscc.wxSize_SetHeight(self.this,arg0)
+    def SetHeight(self, *_args, **_kwargs):
+        val = apply(miscc.wxSize_SetHeight,(self,) + _args, _kwargs)

         return val
         return val

-    def asTuple(self):
-        val = miscc.wxSize_asTuple(self.this)
+    def asTuple(self, *_args, **_kwargs):
+        val = apply(miscc.wxSize_asTuple,(self,) + _args, _kwargs)

         return val
     def __setattr__(self,name,value):
         if name == "x" :
         return val
     def __setattr__(self,name,value):
         if name == "x" :

-            miscc.wxSize_x_set(self.this,value)
+            miscc.wxSize_x_set(self,value)

             return
         if name == "y" :
             return
         if name == "y" :

-            miscc.wxSize_y_set(self.this,value)
+            miscc.wxSize_y_set(self,value)

             return
         if name == "width" :
             return
         if name == "width" :

-            miscc.wxSize_width_set(self.this,value)
+            miscc.wxSize_width_set(self,value)

             return
         if name == "height" :
             return
         if name == "height" :

-            miscc.wxSize_height_set(self.this,value)
+            miscc.wxSize_height_set(self,value)

             return
         self.__dict__[name] = value
     def __getattr__(self,name):
         if name == "x" : 
             return
         self.__dict__[name] = value
     def __getattr__(self,name):
         if name == "x" : 

-            return miscc.wxSize_x_get(self.this)
+            return miscc.wxSize_x_get(self)

         if name == "y" : 
         if name == "y" : 

-            return miscc.wxSize_y_get(self.this)
+            return miscc.wxSize_y_get(self)

         if name == "width" : 
         if name == "width" : 

-            return miscc.wxSize_width_get(self.this)
+            return miscc.wxSize_width_get(self)

         if name == "height" : 
         if name == "height" : 

-            return miscc.wxSize_height_get(self.this)
+            return miscc.wxSize_height_get(self)

         raise AttributeError,name
     def __repr__(self):
         raise AttributeError,name
     def __repr__(self):

-        return "<C wxSize instance>"
+        return "<C wxSize instance at %s>" % (self.this,)

     def __str__(self): return str(self.asTuple())
     def __repr__(self): return str(self.asTuple())
 class wxSize(wxSizePtr):
     def __str__(self): return str(self.asTuple())
     def __repr__(self): return str(self.asTuple())
 class wxSize(wxSizePtr):

-    def __init__(self,*args) :
-        self.this = apply(miscc.new_wxSize,()+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(miscc.new_wxSize,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -71,28 +71,28 @@ class wxRealPointPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self, miscc=miscc):
+    def __del__(self,miscc=miscc):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            miscc.delete_wxRealPoint(self.this)
+            miscc.delete_wxRealPoint(self)

     def __setattr__(self,name,value):
         if name == "x" :
     def __setattr__(self,name,value):
         if name == "x" :

-            miscc.wxRealPoint_x_set(self.this,value)
+            miscc.wxRealPoint_x_set(self,value)

             return
         if name == "y" :
             return
         if name == "y" :

-            miscc.wxRealPoint_y_set(self.this,value)
+            miscc.wxRealPoint_y_set(self,value)

             return
         self.__dict__[name] = value
     def __getattr__(self,name):
         if name == "x" : 
             return
         self.__dict__[name] = value
     def __getattr__(self,name):
         if name == "x" : 

-            return miscc.wxRealPoint_x_get(self.this)
+            return miscc.wxRealPoint_x_get(self)

         if name == "y" : 
         if name == "y" : 

-            return miscc.wxRealPoint_y_get(self.this)
+            return miscc.wxRealPoint_y_get(self)

         raise AttributeError,name
     def __repr__(self):
         raise AttributeError,name
     def __repr__(self):

-        return "<C wxRealPoint instance>"
+        return "<C wxRealPoint instance at %s>" % (self.this,)

 class wxRealPoint(wxRealPointPtr):
 class wxRealPoint(wxRealPointPtr):

-    def __init__(self,*args) :
-        self.this = apply(miscc.new_wxRealPoint,()+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(miscc.new_wxRealPoint,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -102,36 +102,36 @@ class wxPointPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self, miscc=miscc):
+    def __del__(self,miscc=miscc):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            miscc.delete_wxPoint(self.this)
-    def Set(self,arg0,arg1):
-        val = miscc.wxPoint_Set(self.this,arg0,arg1)
+            miscc.delete_wxPoint(self)
+    def Set(self, *_args, **_kwargs):
+        val = apply(miscc.wxPoint_Set,(self,) + _args, _kwargs)

         return val
         return val

-    def asTuple(self):
-        val = miscc.wxPoint_asTuple(self.this)
+    def asTuple(self, *_args, **_kwargs):
+        val = apply(miscc.wxPoint_asTuple,(self,) + _args, _kwargs)

         return val
     def __setattr__(self,name,value):
         if name == "x" :
         return val
     def __setattr__(self,name,value):
         if name == "x" :

-            miscc.wxPoint_x_set(self.this,value)
+            miscc.wxPoint_x_set(self,value)

             return
         if name == "y" :
             return
         if name == "y" :

-            miscc.wxPoint_y_set(self.this,value)
+            miscc.wxPoint_y_set(self,value)

             return
         self.__dict__[name] = value
     def __getattr__(self,name):
         if name == "x" : 
             return
         self.__dict__[name] = value
     def __getattr__(self,name):
         if name == "x" : 

-            return miscc.wxPoint_x_get(self.this)
+            return miscc.wxPoint_x_get(self)

         if name == "y" : 
         if name == "y" : 

-            return miscc.wxPoint_y_get(self.this)
+            return miscc.wxPoint_y_get(self)

         raise AttributeError,name
     def __repr__(self):
         raise AttributeError,name
     def __repr__(self):

-        return "<C wxPoint instance>"
+        return "<C wxPoint instance at %s>" % (self.this,)

     def __str__(self): return str(self.asTuple())
     def __repr__(self): return str(self.asTuple())
 class wxPoint(wxPointPtr):
     def __str__(self): return str(self.asTuple())
     def __repr__(self): return str(self.asTuple())
 class wxPoint(wxPointPtr):

-    def __init__(self,*args) :
-        self.this = apply(miscc.new_wxPoint,()+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(miscc.new_wxPoint,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -141,89 +141,87 @@ class wxRectPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self, miscc=miscc):
+    def __del__(self,miscc=miscc):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            miscc.delete_wxRect(self.this)
-    def GetX(self):
-        val = miscc.wxRect_GetX(self.this)
+            miscc.delete_wxRect(self)
+    def GetX(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_GetX,(self,) + _args, _kwargs)

         return val
         return val

-    def SetX(self,arg0):
-        val = miscc.wxRect_SetX(self.this,arg0)
+    def SetX(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_SetX,(self,) + _args, _kwargs)

         return val
         return val

-    def GetY(self):
-        val = miscc.wxRect_GetY(self.this)
+    def GetY(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_GetY,(self,) + _args, _kwargs)

         return val
         return val

-    def SetY(self,arg0):
-        val = miscc.wxRect_SetY(self.this,arg0)
+    def SetY(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_SetY,(self,) + _args, _kwargs)

         return val
         return val

-    def GetWidth(self):
-        val = miscc.wxRect_GetWidth(self.this)
+    def GetWidth(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_GetWidth,(self,) + _args, _kwargs)

         return val
         return val

-    def SetWidth(self,arg0):
-        val = miscc.wxRect_SetWidth(self.this,arg0)
+    def SetWidth(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_SetWidth,(self,) + _args, _kwargs)

         return val
         return val

-    def GetHeight(self):
-        val = miscc.wxRect_GetHeight(self.this)
+    def GetHeight(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_GetHeight,(self,) + _args, _kwargs)

         return val
         return val

-    def SetHeight(self,arg0):
-        val = miscc.wxRect_SetHeight(self.this,arg0)
+    def SetHeight(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_SetHeight,(self,) + _args, _kwargs)

         return val
         return val

-    def GetPosition(self):
-        val = miscc.wxRect_GetPosition(self.this)
-        val = wxPointPtr(val)
-        val.thisown = 1
+    def GetPosition(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_GetPosition,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetSize(self):
-        val = miscc.wxRect_GetSize(self.this)
-        val = wxSizePtr(val)
-        val.thisown = 1
+    def GetSize(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_GetSize,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1

         return val
         return val

-    def GetLeft(self):
-        val = miscc.wxRect_GetLeft(self.this)
+    def GetLeft(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_GetLeft,(self,) + _args, _kwargs)

         return val
         return val

-    def GetTop(self):
-        val = miscc.wxRect_GetTop(self.this)
+    def GetTop(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_GetTop,(self,) + _args, _kwargs)

         return val
         return val

-    def GetBottom(self):
-        val = miscc.wxRect_GetBottom(self.this)
+    def GetBottom(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_GetBottom,(self,) + _args, _kwargs)

         return val
         return val

-    def GetRight(self):
-        val = miscc.wxRect_GetRight(self.this)
+    def GetRight(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_GetRight,(self,) + _args, _kwargs)

         return val
         return val

-    def asTuple(self):
-        val = miscc.wxRect_asTuple(self.this)
+    def asTuple(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_asTuple,(self,) + _args, _kwargs)

         return val
     def __setattr__(self,name,value):
         if name == "x" :
         return val
     def __setattr__(self,name,value):
         if name == "x" :

-            miscc.wxRect_x_set(self.this,value)
+            miscc.wxRect_x_set(self,value)

             return
         if name == "y" :
             return
         if name == "y" :

-            miscc.wxRect_y_set(self.this,value)
+            miscc.wxRect_y_set(self,value)

             return
         if name == "width" :
             return
         if name == "width" :

-            miscc.wxRect_width_set(self.this,value)
+            miscc.wxRect_width_set(self,value)

             return
         if name == "height" :
             return
         if name == "height" :

-            miscc.wxRect_height_set(self.this,value)
+            miscc.wxRect_height_set(self,value)

             return
         self.__dict__[name] = value
     def __getattr__(self,name):
         if name == "x" : 
             return
         self.__dict__[name] = value
     def __getattr__(self,name):
         if name == "x" : 

-            return miscc.wxRect_x_get(self.this)
+            return miscc.wxRect_x_get(self)

         if name == "y" : 
         if name == "y" : 

-            return miscc.wxRect_y_get(self.this)
+            return miscc.wxRect_y_get(self)

         if name == "width" : 
         if name == "width" : 

-            return miscc.wxRect_width_get(self.this)
+            return miscc.wxRect_width_get(self)

         if name == "height" : 
         if name == "height" : 

-            return miscc.wxRect_height_get(self.this)
+            return miscc.wxRect_height_get(self)

         raise AttributeError,name
     def __repr__(self):
         raise AttributeError,name
     def __repr__(self):

-        return "<C wxRect instance>"
+        return "<C wxRect instance at %s>" % (self.this,)

     def __str__(self): return str(self.asTuple())
     def __repr__(self): return str(self.asTuple())
 class wxRect(wxRectPtr):
     def __str__(self): return str(self.asTuple())
     def __repr__(self): return str(self.asTuple())
 class wxRect(wxRectPtr):

-    def __init__(self,*args) :
-        self.this = apply(miscc.new_wxRect,()+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(miscc.new_wxRect,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -233,23 +231,23 @@ class wxPyTimerPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self, miscc=miscc):
+    def __del__(self,miscc=miscc):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            miscc.delete_wxPyTimer(self.this)
-    def Interval(self):
-        val = miscc.wxPyTimer_Interval(self.this)
+            miscc.delete_wxPyTimer(self)
+    def Interval(self, *_args, **_kwargs):
+        val = apply(miscc.wxPyTimer_Interval,(self,) + _args, _kwargs)

         return val
         return val

-    def Start(self,*args):
-        val = apply(miscc.wxPyTimer_Start,(self.this,)+args)
+    def Start(self, *_args, **_kwargs):
+        val = apply(miscc.wxPyTimer_Start,(self,) + _args, _kwargs)

         return val
         return val

-    def Stop(self):
-        val = miscc.wxPyTimer_Stop(self.this)
+    def Stop(self, *_args, **_kwargs):
+        val = apply(miscc.wxPyTimer_Stop,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxPyTimer instance>"
+        return "<C wxPyTimer instance at %s>" % (self.this,)

 class wxPyTimer(wxPyTimerPtr):
 class wxPyTimer(wxPyTimerPtr):

-    def __init__(self,arg0) :
-        self.this = miscc.new_wxPyTimer(arg0)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(miscc.new_wxPyTimer,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -259,38 +257,38 @@ class wxIndividualLayoutConstraintPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def Above(self,arg0,*args):
-        val = apply(miscc.wxIndividualLayoutConstraint_Above,(self.this,arg0.this,)+args)
+    def Above(self, *_args, **_kwargs):
+        val = apply(miscc.wxIndividualLayoutConstraint_Above,(self,) + _args, _kwargs)

         return val
         return val

-    def Absolute(self,arg0):
-        val = miscc.wxIndividualLayoutConstraint_Absolute(self.this,arg0)
+    def Absolute(self, *_args, **_kwargs):
+        val = apply(miscc.wxIndividualLayoutConstraint_Absolute,(self,) + _args, _kwargs)

         return val
         return val

-    def AsIs(self):
-        val = miscc.wxIndividualLayoutConstraint_AsIs(self.this)
+    def AsIs(self, *_args, **_kwargs):
+        val = apply(miscc.wxIndividualLayoutConstraint_AsIs,(self,) + _args, _kwargs)

         return val
         return val

-    def Below(self,arg0,*args):
-        val = apply(miscc.wxIndividualLayoutConstraint_Below,(self.this,arg0.this,)+args)
+    def Below(self, *_args, **_kwargs):
+        val = apply(miscc.wxIndividualLayoutConstraint_Below,(self,) + _args, _kwargs)

         return val
         return val

-    def Unconstrained(self):
-        val = miscc.wxIndividualLayoutConstraint_Unconstrained(self.this)
+    def Unconstrained(self, *_args, **_kwargs):
+        val = apply(miscc.wxIndividualLayoutConstraint_Unconstrained,(self,) + _args, _kwargs)

         return val
         return val

-    def LeftOf(self,arg0,*args):
-        val = apply(miscc.wxIndividualLayoutConstraint_LeftOf,(self.this,arg0.this,)+args)
+    def LeftOf(self, *_args, **_kwargs):
+        val = apply(miscc.wxIndividualLayoutConstraint_LeftOf,(self,) + _args, _kwargs)

         return val
         return val

-    def PercentOf(self,arg0,arg1,arg2):
-        val = miscc.wxIndividualLayoutConstraint_PercentOf(self.this,arg0.this,arg1,arg2)
+    def PercentOf(self, *_args, **_kwargs):
+        val = apply(miscc.wxIndividualLayoutConstraint_PercentOf,(self,) + _args, _kwargs)

         return val
         return val

-    def RightOf(self,arg0,*args):
-        val = apply(miscc.wxIndividualLayoutConstraint_RightOf,(self.this,arg0.this,)+args)
+    def RightOf(self, *_args, **_kwargs):
+        val = apply(miscc.wxIndividualLayoutConstraint_RightOf,(self,) + _args, _kwargs)

         return val
         return val

-    def SameAs(self,arg0,arg1,*args):
-        val = apply(miscc.wxIndividualLayoutConstraint_SameAs,(self.this,arg0.this,arg1,)+args)
+    def SameAs(self, *_args, **_kwargs):
+        val = apply(miscc.wxIndividualLayoutConstraint_SameAs,(self,) + _args, _kwargs)

         return val
         return val

-    def Set(self,arg0,arg1,arg2,*args):
-        val = apply(miscc.wxIndividualLayoutConstraint_Set,(self.this,arg0,arg1.this,arg2,)+args)
+    def Set(self, *_args, **_kwargs):
+        val = apply(miscc.wxIndividualLayoutConstraint_Set,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxIndividualLayoutConstraint instance>"
+        return "<C wxIndividualLayoutConstraint instance at %s>" % (self.this,)

 class wxIndividualLayoutConstraint(wxIndividualLayoutConstraintPtr):
     def __init__(self,this):
         self.this = this
 class wxIndividualLayoutConstraint(wxIndividualLayoutConstraintPtr):
     def __init__(self,this):
         self.this = this


@@ -304,53 +302,53 @@ class wxLayoutConstraintsPtr :
         self.thisown = 0
     def __setattr__(self,name,value):
         if name == "bottom" :
         self.thisown = 0
     def __setattr__(self,name,value):
         if name == "bottom" :

-            miscc.wxLayoutConstraints_bottom_set(self.this,value.this)
+            miscc.wxLayoutConstraints_bottom_set(self,value.this)

             return
         if name == "centreX" :
             return
         if name == "centreX" :

-            miscc.wxLayoutConstraints_centreX_set(self.this,value.this)
+            miscc.wxLayoutConstraints_centreX_set(self,value.this)

             return
         if name == "centreY" :
             return
         if name == "centreY" :

-            miscc.wxLayoutConstraints_centreY_set(self.this,value.this)
+            miscc.wxLayoutConstraints_centreY_set(self,value.this)

             return
         if name == "height" :
             return
         if name == "height" :

-            miscc.wxLayoutConstraints_height_set(self.this,value.this)
+            miscc.wxLayoutConstraints_height_set(self,value.this)

             return
         if name == "left" :
             return
         if name == "left" :

-            miscc.wxLayoutConstraints_left_set(self.this,value.this)
+            miscc.wxLayoutConstraints_left_set(self,value.this)

             return
         if name == "right" :
             return
         if name == "right" :

-            miscc.wxLayoutConstraints_right_set(self.this,value.this)
+            miscc.wxLayoutConstraints_right_set(self,value.this)

             return
         if name == "top" :
             return
         if name == "top" :

-            miscc.wxLayoutConstraints_top_set(self.this,value.this)
+            miscc.wxLayoutConstraints_top_set(self,value.this)

             return
         if name == "width" :
             return
         if name == "width" :

-            miscc.wxLayoutConstraints_width_set(self.this,value.this)
+            miscc.wxLayoutConstraints_width_set(self,value.this)

             return
         self.__dict__[name] = value
     def __getattr__(self,name):
         if name == "bottom" : 
             return
         self.__dict__[name] = value
     def __getattr__(self,name):
         if name == "bottom" : 

-            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_bottom_get(self.this))
+            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_bottom_get(self))

         if name == "centreX" : 
         if name == "centreX" : 

-            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_centreX_get(self.this))
+            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_centreX_get(self))

         if name == "centreY" : 
         if name == "centreY" : 

-            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_centreY_get(self.this))
+            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_centreY_get(self))

         if name == "height" : 
         if name == "height" : 

-            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_height_get(self.this))
+            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_height_get(self))

         if name == "left" : 
         if name == "left" : 

-            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_left_get(self.this))
+            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_left_get(self))

         if name == "right" : 
         if name == "right" : 

-            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_right_get(self.this))
+            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_right_get(self))

         if name == "top" : 
         if name == "top" : 

-            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_top_get(self.this))
+            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_top_get(self))

         if name == "width" : 
         if name == "width" : 

-            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_width_get(self.this))
+            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_width_get(self))

         raise AttributeError,name
     def __repr__(self):
         raise AttributeError,name
     def __repr__(self):

-        return "<C wxLayoutConstraints instance>"
+        return "<C wxLayoutConstraints instance at %s>" % (self.this,)

 class wxLayoutConstraints(wxLayoutConstraintsPtr):
 class wxLayoutConstraints(wxLayoutConstraintsPtr):

-    def __init__(self) :
-        self.this = miscc.new_wxLayoutConstraints()
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(miscc.new_wxLayoutConstraints,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -360,46 +358,45 @@ class wxRegionPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self, miscc=miscc):
+    def __del__(self,miscc=miscc):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            miscc.delete_wxRegion(self.this)
-    def Clear(self):
-        val = miscc.wxRegion_Clear(self.this)
+            miscc.delete_wxRegion(self)
+    def Clear(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_Clear,(self,) + _args, _kwargs)

         return val
         return val

-    def Contains(self,arg0,arg1):
-        val = miscc.wxRegion_Contains(self.this,arg0,arg1)
+    def Contains(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_Contains,(self,) + _args, _kwargs)

         return val
         return val

-    def ContainsPoint(self,arg0):
-        val = miscc.wxRegion_ContainsPoint(self.this,arg0.this)
+    def ContainsPoint(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_ContainsPoint,(self,) + _args, _kwargs)

         return val
         return val

-    def ContainsRect(self,arg0):
-        val = miscc.wxRegion_ContainsRect(self.this,arg0.this)
+    def ContainsRect(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_ContainsRect,(self,) + _args, _kwargs)

         return val
         return val

-    def GetBox(self):
-        val = miscc.wxRegion_GetBox(self.this)
-        val = wxRectPtr(val)
-        val.thisown = 1
+    def GetBox(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_GetBox,(self,) + _args, _kwargs)
+        if val: val = wxRectPtr(val) ; val.thisown = 1

         return val
         return val

-    def Intersect(self,arg0):
-        val = miscc.wxRegion_Intersect(self.this,arg0.this)
+    def Intersect(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_Intersect,(self,) + _args, _kwargs)

         return val
         return val

-    def IsEmpty(self):
-        val = miscc.wxRegion_IsEmpty(self.this)
+    def IsEmpty(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_IsEmpty,(self,) + _args, _kwargs)

         return val
         return val

-    def Subtract(self,arg0):
-        val = miscc.wxRegion_Subtract(self.this,arg0.this)
+    def Subtract(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_Subtract,(self,) + _args, _kwargs)

         return val
         return val

-    def Union(self,arg0):
-        val = miscc.wxRegion_Union(self.this,arg0.this)
+    def Union(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_Union,(self,) + _args, _kwargs)

         return val
         return val

-    def Xor(self,arg0):
-        val = miscc.wxRegion_Xor(self.this,arg0.this)
+    def Xor(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_Xor,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxRegion instance>"
+        return "<C wxRegion instance at %s>" % (self.this,)

 class wxRegion(wxRegionPtr):
 class wxRegion(wxRegionPtr):

-    def __init__(self) :
-        self.this = miscc.new_wxRegion()
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(miscc.new_wxRegion,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -409,46 +406,45 @@ class wxRegionIteratorPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self, miscc=miscc):
+    def __del__(self,miscc=miscc):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            miscc.delete_wxRegionIterator(self.this)
-    def GetX(self):
-        val = miscc.wxRegionIterator_GetX(self.this)
+            miscc.delete_wxRegionIterator(self)
+    def GetX(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegionIterator_GetX,(self,) + _args, _kwargs)

         return val
         return val

-    def GetY(self):
-        val = miscc.wxRegionIterator_GetY(self.this)
+    def GetY(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegionIterator_GetY,(self,) + _args, _kwargs)

         return val
         return val

-    def GetW(self):
-        val = miscc.wxRegionIterator_GetW(self.this)
+    def GetW(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegionIterator_GetW,(self,) + _args, _kwargs)

         return val
         return val

-    def GetWidth(self):
-        val = miscc.wxRegionIterator_GetWidth(self.this)
+    def GetWidth(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegionIterator_GetWidth,(self,) + _args, _kwargs)

         return val
         return val

-    def GetH(self):
-        val = miscc.wxRegionIterator_GetH(self.this)
+    def GetH(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegionIterator_GetH,(self,) + _args, _kwargs)

         return val
         return val

-    def GetHeight(self):
-        val = miscc.wxRegionIterator_GetHeight(self.this)
+    def GetHeight(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegionIterator_GetHeight,(self,) + _args, _kwargs)

         return val
         return val

-    def GetRect(self):
-        val = miscc.wxRegionIterator_GetRect(self.this)
-        val = wxRectPtr(val)
-        val.thisown = 1
+    def GetRect(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegionIterator_GetRect,(self,) + _args, _kwargs)
+        if val: val = wxRectPtr(val) ; val.thisown = 1

         return val
         return val

-    def HaveRects(self):
-        val = miscc.wxRegionIterator_HaveRects(self.this)
+    def HaveRects(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegionIterator_HaveRects,(self,) + _args, _kwargs)

         return val
         return val

-    def Reset(self):
-        val = miscc.wxRegionIterator_Reset(self.this)
+    def Reset(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegionIterator_Reset,(self,) + _args, _kwargs)

         return val
         return val

-    def Next(self):
-        val = miscc.wxRegionIterator_Next(self.this)
+    def Next(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegionIterator_Next,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxRegionIterator instance>"
+        return "<C wxRegionIterator instance at %s>" % (self.this,)

 class wxRegionIterator(wxRegionIteratorPtr):
 class wxRegionIterator(wxRegionIteratorPtr):

-    def __init__(self,arg0) :
-        self.this = miscc.new_wxRegionIterator(arg0.this)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(miscc.new_wxRegionIterator,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -458,23 +454,23 @@ class wxAcceleratorEntryPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def Set(self,arg0,arg1,arg2):
-        val = miscc.wxAcceleratorEntry_Set(self.this,arg0,arg1,arg2)
+    def Set(self, *_args, **_kwargs):
+        val = apply(miscc.wxAcceleratorEntry_Set,(self,) + _args, _kwargs)

         return val
         return val

-    def GetFlags(self):
-        val = miscc.wxAcceleratorEntry_GetFlags(self.this)
+    def GetFlags(self, *_args, **_kwargs):
+        val = apply(miscc.wxAcceleratorEntry_GetFlags,(self,) + _args, _kwargs)

         return val
         return val

-    def GetKeyCode(self):
-        val = miscc.wxAcceleratorEntry_GetKeyCode(self.this)
+    def GetKeyCode(self, *_args, **_kwargs):
+        val = apply(miscc.wxAcceleratorEntry_GetKeyCode,(self,) + _args, _kwargs)

         return val
         return val

-    def GetCommand(self):
-        val = miscc.wxAcceleratorEntry_GetCommand(self.this)
+    def GetCommand(self, *_args, **_kwargs):
+        val = apply(miscc.wxAcceleratorEntry_GetCommand,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxAcceleratorEntry instance>"
+        return "<C wxAcceleratorEntry instance at %s>" % (self.this,)

 class wxAcceleratorEntry(wxAcceleratorEntryPtr):
 class wxAcceleratorEntry(wxAcceleratorEntryPtr):

-    def __init__(self,*args) :
-        self.this = apply(miscc.new_wxAcceleratorEntry,()+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(miscc.new_wxAcceleratorEntry,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -485,10 +481,10 @@ class wxAcceleratorTablePtr :
         self.this = this
         self.thisown = 0
     def __repr__(self):
         self.this = this
         self.thisown = 0
     def __repr__(self):

-        return "<C wxAcceleratorTable instance>"
+        return "<C wxAcceleratorTable instance at %s>" % (self.this,)

 class wxAcceleratorTable(wxAcceleratorTablePtr):
 class wxAcceleratorTable(wxAcceleratorTablePtr):

-    def __init__(self,arg0) :
-        self.this = miscc.new_wxAcceleratorTable(arg0.this)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(miscc.new_wxAcceleratorTable,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -498,63 +494,23 @@ class wxAcceleratorTable(wxAcceleratorTablePtr):
 
 #-------------- FUNCTION WRAPPERS ------------------
 
 
 #-------------- FUNCTION WRAPPERS ------------------
 

-def wxFileSelector(arg0,*args):
-    argl = map(None,args)
-    try: argl[5] = argl[5].this
-    except: pass
-    args = tuple(argl)
-    val = apply(miscc.wxFileSelector,(arg0,)+args)
-    return val
+wxFileSelector = miscc.wxFileSelector

 
 

-def wxGetTextFromUser(arg0,*args):
-    argl = map(None,args)
-    try: argl[2] = argl[2].this
-    except: pass
-    args = tuple(argl)
-    val = apply(miscc.wxGetTextFromUser,(arg0,)+args)
-    return val
+wxGetTextFromUser = miscc.wxGetTextFromUser

 
 

-def wxGetSingleChoice(arg0,arg1,arg2,*args):
-    argl = map(None,args)
-    try: argl[0] = argl[0].this
-    except: pass
-    args = tuple(argl)
-    val = apply(miscc.wxGetSingleChoice,(arg0,arg1,arg2,)+args)
-    return val
+wxGetSingleChoice = miscc.wxGetSingleChoice

 
 

-def wxGetSingleChoiceIndex(arg0,arg1,arg2,*args):
-    argl = map(None,args)
-    try: argl[0] = argl[0].this
-    except: pass
-    args = tuple(argl)
-    val = apply(miscc.wxGetSingleChoiceIndex,(arg0,arg1,arg2,)+args)
-    return val
+wxGetSingleChoiceIndex = miscc.wxGetSingleChoiceIndex

 
 

-def wxMessageBox(arg0,*args):
-    argl = map(None,args)
-    try: argl[2] = argl[2].this
-    except: pass
-    args = tuple(argl)
-    val = apply(miscc.wxMessageBox,(arg0,)+args)
-    return val
+wxMessageBox = miscc.wxMessageBox

 
 

-def wxGetNumberFromUser(arg0,arg1,arg2,arg3,*args):
-    argl = map(None,args)
-    try: argl[2] = argl[2].this
-    except: pass
-    try: argl[3] = argl[3].this
-    except: pass
-    args = tuple(argl)
-    val = apply(miscc.wxGetNumberFromUser,(arg0,arg1,arg2,arg3,)+args)
-    return val
+wxGetNumberFromUser = miscc.wxGetNumberFromUser

 
 wxColourDisplay = miscc.wxColourDisplay
 
 wxDisplayDepth = miscc.wxDisplayDepth
 
 
 wxColourDisplay = miscc.wxColourDisplay
 
 wxDisplayDepth = miscc.wxDisplayDepth
 

-def wxSetCursor(arg0):
-    val = miscc.wxSetCursor(arg0.this)
-    return val
+wxSetCursor = miscc.wxSetCursor

 
 wxNewId = miscc.wxNewId
 
 
 wxNewId = miscc.wxNewId
 


@@ -564,13 +520,7 @@ NewId = miscc.NewId
 
 RegisterId = miscc.RegisterId
 
 
 RegisterId = miscc.RegisterId
 

-def wxBeginBusyCursor(*args):
-    argl = map(None,args)
-    try: argl[0] = argl[0].this
-    except: pass
-    args = tuple(argl)
-    val = apply(miscc.wxBeginBusyCursor,()+args)
-    return val
+wxBeginBusyCursor = miscc.wxBeginBusyCursor

 
 wxBell = miscc.wxBell
 
 
 wxBell = miscc.wxBell
 


@@ -580,9 +530,9 @@ wxEndBusyCursor = miscc.wxEndBusyCursor
 
 wxExecute = miscc.wxExecute
 
 
 wxExecute = miscc.wxExecute
 

-def wxGetActiveWindow():
-    val = miscc.wxGetActiveWindow()
-    val = wxWindowPtr(val)
+def wxGetActiveWindow(*_args, **_kwargs):
+    val = apply(miscc.wxGetActiveWindow,_args,_kwargs)
+    if val: val = wxWindowPtr(val)

     return val
 
 wxGetElapsedTime = miscc.wxGetElapsedTime
     return val
 
 wxGetElapsedTime = miscc.wxGetElapsedTime


@@ -615,21 +565,19 @@ wxResourceAddIdentifier = miscc.wxResourceAddIdentifier
 
 wxResourceClear = miscc.wxResourceClear
 
 
 wxResourceClear = miscc.wxResourceClear
 

-def wxResourceCreateBitmap(arg0):
-    val = miscc.wxResourceCreateBitmap(arg0)
-    val = wxBitmapPtr(val)
-    val.thisown = 1
+def wxResourceCreateBitmap(*_args, **_kwargs):
+    val = apply(miscc.wxResourceCreateBitmap,_args,_kwargs)
+    if val: val = wxBitmapPtr(val); val.thisown = 1

     return val
 
     return val
 

-def wxResourceCreateIcon(arg0):
-    val = miscc.wxResourceCreateIcon(arg0)
-    val = wxIconPtr(val)
-    val.thisown = 1
+def wxResourceCreateIcon(*_args, **_kwargs):
+    val = apply(miscc.wxResourceCreateIcon,_args,_kwargs)
+    if val: val = wxIconPtr(val); val.thisown = 1

     return val
 
     return val
 

-def wxResourceCreateMenuBar(arg0):
-    val = miscc.wxResourceCreateMenuBar(arg0)
-    val = wxMenuBarPtr(val)
+def wxResourceCreateMenuBar(*_args, **_kwargs):
+    val = apply(miscc.wxResourceCreateMenuBar,_args,_kwargs)
+    if val: val = wxMenuBarPtr(val)

     return val
 
 wxResourceGetIdentifier = miscc.wxResourceGetIdentifier
     return val
 
 wxResourceGetIdentifier = miscc.wxResourceGetIdentifier


@@ -640,16 +588,14 @@ wxResourceParseFile = miscc.wxResourceParseFile
 
 wxResourceParseString = miscc.wxResourceParseString
 
 
 wxResourceParseString = miscc.wxResourceParseString
 

-def wxSystemSettings_GetSystemColour(arg0):
-    val = miscc.wxSystemSettings_GetSystemColour(arg0)
-    val = wxColourPtr(val)
-    val.thisown = 1
+def wxSystemSettings_GetSystemColour(*_args, **_kwargs):
+    val = apply(miscc.wxSystemSettings_GetSystemColour,_args,_kwargs)
+    if val: val = wxColourPtr(val); val.thisown = 1

     return val
 
     return val
 

-def wxSystemSettings_GetSystemFont(arg0):
-    val = miscc.wxSystemSettings_GetSystemFont(arg0)
-    val = wxFontPtr(val)
-    val.thisown = 1
+def wxSystemSettings_GetSystemFont(*_args, **_kwargs):
+    val = apply(miscc.wxSystemSettings_GetSystemFont,_args,_kwargs)
+    if val: val = wxFontPtr(val); val.thisown = 1

     return val
 
 wxSystemSettings_GetSystemMetric = miscc.wxSystemSettings_GetSystemMetric
     return val
 
 wxSystemSettings_GetSystemMetric = miscc.wxSystemSettings_GetSystemMetric

diff --git a/utils/wxPython/src/msw/misc2.cpp b/utils/wxPython/src/msw/misc2.cpp
index 980c3d904952670297e1ad75251620d38496ed90..7812aef78a6a758006e237c232a252a9ac8cd8ff 100644 (file)
--- a/utils/wxPython/src/msw/misc2.cpp
+++ b/utils/wxPython/src/msw/misc2.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)

- * Version 1.1 (Patch 5)
+ * Version 1.1 (Patch 6)

  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.


@@ -24,16 +24,16 @@
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)

-#      define SWIGEXPORT(a,b) __declspec(dllexport) a b
+#      define SWIGEXPORT(a) __declspec(dllexport) a

 #   else
 #      if defined(__BORLANDC__)
 #   else
 #      if defined(__BORLANDC__)

-#          define SWIGEXPORT(a,b) a _export b
+#          define SWIGEXPORT(a) a _export 

 #      else
 #      else

-#          define SWIGEXPORT(a,b) a b
+#          define SWIGEXPORT(a) a 

 #      endif
 #   endif
 #else
 #      endif
 #   endif
 #else

-#   define SWIGEXPORT(a,b) a b
+#   define SWIGEXPORT(a) a 

 #endif
 
 #ifdef __cplusplus
 #endif
 
 #ifdef __cplusplus


@@ -43,12 +43,12 @@ extern "C" {
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);

+extern char *SWIG_GetPtrObj(PyObject *, void **, char *);

 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif
 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif

-

 #define SWIG_init    initmisc2c
 
 #define SWIG_name    "misc2c"
 #define SWIG_init    initmisc2c
 
 #define SWIG_name    "misc2c"


@@ -59,12 +59,13 @@ extern PyObject *SWIG_newvarlink(void);
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;

-    if (!target) {
+    PyObject*   o3;
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);
         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);


@@ -81,23 +82,23 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
     PyObject*   o3;
 
     PyObject*   o2;
     PyObject*   o3;
 

-    if (!target) {
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }
         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }

-        o3 = PyTuple_New(1);
-        PyTuple_SetItem(o3, 0, o);
+        o3 = PyTuple_New(1);            
+        PyTuple_SetItem(o3, 0, o);      

 
         o2 = target;
 
         o2 = target;

-        target = PySequence_Concat(o2, o3);
-        Py_DECREF(o2);
+        target = PySequence_Concat(o2, o3); 
+        Py_DECREF(o2);                      

         Py_DECREF(o3);
     }
     return target;
         Py_DECREF(o3);
     }
     return target;


@@ -123,17 +124,20 @@ static char* wxStringErrorMsg = "string type is required for parameter";
     void wxToolTip_SetDelay(long milliseconds) {
         wxToolTip::SetDelay(milliseconds);
     }
     void wxToolTip_SetDelay(long milliseconds) {
         wxToolTip::SetDelay(milliseconds);
     }

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

 static PyObject *_wrap_wxFindWindowByLabel(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _result;
     wxString * _arg0;
 static PyObject *_wrap_wxFindWindowByLabel(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _result;
     wxString * _arg0;

-    wxWindow * _arg1 = NULL;
+    wxWindow * _arg1 = (wxWindow *) NULL;

     PyObject * _obj0 = 0;
     PyObject * _obj0 = 0;

-    char * _argc1 = 0;
+    PyObject * _argo1 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"O|s:wxFindWindowByLabel",&_obj0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"O|O:wxFindWindowByLabel",&_obj0,&_argo1)) 

         return NULL;
 {
     if (!PyString_Check(_obj0)) {
         return NULL;
 {
     if (!PyString_Check(_obj0)) {


@@ -142,8 +146,9 @@ static PyObject *_wrap_wxFindWindowByLabel(PyObject *self, PyObject *args) {
     }
     _arg0 = new wxString(PyString_AsString(_obj0), PyString_Size(_obj0));
 }
     }
     _arg0 = new wxString(PyString_AsString(_obj0), PyString_Size(_obj0));
 }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFindWindowByLabel. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFindWindowByLabel. Expected _wxWindow_p.");
         return NULL;
         }


@@ -153,8 +158,13 @@ static PyObject *_wrap_wxFindWindowByLabel(PyObject *self, PyObject *args) {
         _result = (wxWindow *)wxFindWindowByLabel(*_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxWindow *)wxFindWindowByLabel(*_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     if (_obj0)
         delete _arg0;
 {
     if (_obj0)
         delete _arg0;


@@ -166,13 +176,13 @@ static PyObject *_wrap_wxFindWindowByName(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _result;
     wxString * _arg0;
     PyObject * _resultobj;
     wxWindow * _result;
     wxString * _arg0;

-    wxWindow * _arg1 = NULL;
+    wxWindow * _arg1 = (wxWindow *) NULL;

     PyObject * _obj0 = 0;
     PyObject * _obj0 = 0;

-    char * _argc1 = 0;
+    PyObject * _argo1 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"O|s:wxFindWindowByName",&_obj0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"O|O:wxFindWindowByName",&_obj0,&_argo1)) 

         return NULL;
 {
     if (!PyString_Check(_obj0)) {
         return NULL;
 {
     if (!PyString_Check(_obj0)) {


@@ -181,8 +191,9 @@ static PyObject *_wrap_wxFindWindowByName(PyObject *self, PyObject *args) {
     }
     _arg0 = new wxString(PyString_AsString(_obj0), PyString_Size(_obj0));
 }
     }
     _arg0 = new wxString(PyString_AsString(_obj0), PyString_Size(_obj0));
 }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFindWindowByName. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFindWindowByName. Expected _wxWindow_p.");
         return NULL;
         }


@@ -192,8 +203,13 @@ static PyObject *_wrap_wxFindWindowByName(PyObject *self, PyObject *args) {
         _result = (wxWindow *)wxFindWindowByName(*_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxWindow *)wxFindWindowByName(*_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     if (_obj0)
         delete _arg0;
 {
     if (_obj0)
         delete _arg0;


@@ -260,8 +276,13 @@ static PyObject *_wrap_new_wxToolTip(PyObject *self, PyObject *args) {
         _result = (wxToolTip *)new_wxToolTip(*_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxToolTip *)new_wxToolTip(*_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolTip_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolTip_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     if (_obj0)
         delete _arg0;
 {
     if (_obj0)
         delete _arg0;


@@ -274,14 +295,15 @@ static PyObject *_wrap_wxToolTip_SetTip(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxToolTip * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxToolTip * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxToolTip_SetTip",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxToolTip_SetTip",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolTip_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolTip_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolTip_SetTip. Expected _wxToolTip_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolTip_SetTip. Expected _wxToolTip_p.");
         return NULL;
         }


@@ -312,13 +334,14 @@ static PyObject *_wrap_wxToolTip_GetTip(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxToolTip * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxToolTip * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolTip_GetTip",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxToolTip_GetTip",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolTip_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolTip_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolTip_GetTip. Expected _wxToolTip_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolTip_GetTip. Expected _wxToolTip_p.");
         return NULL;
         }


@@ -342,14 +365,15 @@ static PyObject *_wrap_wxToolTip_GetWindow(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _result;
     wxToolTip * _arg0;
     PyObject * _resultobj;
     wxWindow * _result;
     wxToolTip * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolTip_GetWindow",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxToolTip_GetWindow",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolTip_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolTip_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolTip_GetWindow. Expected _wxToolTip_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolTip_GetWindow. Expected _wxToolTip_p.");
         return NULL;
         }


@@ -359,173 +383,188 @@ static PyObject *_wrap_wxToolTip_GetWindow(PyObject *self, PyObject *args) {
         _result = (wxWindow *)wxToolTip_GetWindow(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxWindow *)wxToolTip_GetWindow(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
 static PyMethodDef misc2cMethods[] = {
     return _resultobj;
 }
 
 static PyMethodDef misc2cMethods[] = {

-        { "wxToolTip_GetWindow", _wrap_wxToolTip_GetWindow, 1 },
-        { "wxToolTip_GetTip", _wrap_wxToolTip_GetTip, 1 },
-        { "wxToolTip_SetTip", _wrap_wxToolTip_SetTip, 1 },
-        { "new_wxToolTip", _wrap_new_wxToolTip, 1 },
-        { "wxToolTip_SetDelay", _wrap_wxToolTip_SetDelay, 1 },
-        { "wxToolTip_Enable", _wrap_wxToolTip_Enable, 1 },
-        { "wxFindWindowByName", _wrap_wxFindWindowByName, 1 },
-        { "wxFindWindowByLabel", _wrap_wxFindWindowByLabel, 1 },
+        { "wxToolTip_GetWindow", _wrap_wxToolTip_GetWindow, METH_VARARGS },
+        { "wxToolTip_GetTip", _wrap_wxToolTip_GetTip, METH_VARARGS },
+        { "wxToolTip_SetTip", _wrap_wxToolTip_SetTip, METH_VARARGS },
+        { "new_wxToolTip", _wrap_new_wxToolTip, METH_VARARGS },
+        { "wxToolTip_SetDelay", _wrap_wxToolTip_SetDelay, METH_VARARGS },
+        { "wxToolTip_Enable", _wrap_wxToolTip_Enable, METH_VARARGS },
+        { "wxFindWindowByName", _wrap_wxFindWindowByName, METH_VARARGS },
+        { "wxFindWindowByLabel", _wrap_wxFindWindowByLabel, METH_VARARGS },

         { NULL, NULL }
 };
         { NULL, NULL }
 };

+#ifdef __cplusplus
+}
+#endif
+/*
+ * This table is used by the pointer type-checker
+ */
+static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
+    { "_wxAcceleratorTable","_class_wxAcceleratorTable",0},
+    { "_signed_long","_long",0},
+    { "_wxPrintQuality","_int",0},
+    { "_wxPrintQuality","_signed_int",0},
+    { "_wxPrintQuality","_unsigned_int",0},
+    { "_wxPrintQuality","_wxWindowID",0},
+    { "_wxPrintQuality","_uint",0},
+    { "_wxPrintQuality","_EBool",0},
+    { "_wxPrintQuality","_size_t",0},
+    { "_class_wxRegionIterator","_wxRegionIterator",0},
+    { "_class_wxMenuBar","_wxMenuBar",0},
+    { "_class_wxEvtHandler","_wxEvtHandler",0},
+    { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
+    { "_wxCursor","_class_wxCursor",0},
+    { "_wxMask","_class_wxMask",0},
+    { "_wxToolTip","_class_wxToolTip",0},
+    { "_wxPen","_class_wxPen",0},
+    { "_byte","_unsigned_char",0},
+    { "_long","_wxDash",0},
+    { "_long","_unsigned_long",0},
+    { "_long","_signed_long",0},
+    { "_wxImageList","_class_wxImageList",0},
+    { "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
+    { "_wxDC","_class_wxDC",0},
+    { "_size_t","_wxPrintQuality",0},
+    { "_size_t","_unsigned_int",0},
+    { "_size_t","_int",0},
+    { "_size_t","_wxWindowID",0},
+    { "_size_t","_uint",0},
+    { "_class_wxRealPoint","_wxRealPoint",0},
+    { "_wxPrinterDC","_class_wxPrinterDC",0},
+    { "_class_wxMenuItem","_wxMenuItem",0},
+    { "_wxPanel","_class_wxPanel",0},
+    { "_class_wxMask","_wxMask",0},
+    { "_class_wxToolTip","_wxToolTip",0},
+    { "_wxColour","_class_wxColour",0},
+    { "_class_wxDialog","_wxDialog",0},
+    { "_wxBrush","_class_wxBrush",0},
+    { "_uint","_wxPrintQuality",0},
+    { "_uint","_size_t",0},
+    { "_uint","_unsigned_int",0},
+    { "_uint","_int",0},
+    { "_uint","_wxWindowID",0},
+    { "_wxRect","_class_wxRect",0},
+    { "_wxPoint","_class_wxPoint",0},
+    { "_wxBitmap","_class_wxBitmap",0},
+    { "_wxPyTimer","_class_wxPyTimer",0},
+    { "_wxWindowDC","_class_wxWindowDC",0},
+    { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
+    { "_EBool","_wxPrintQuality",0},
+    { "_EBool","_signed_int",0},
+    { "_EBool","_int",0},
+    { "_EBool","_wxWindowID",0},
+    { "_class_wxRegion","_wxRegion",0},
+    { "_wxFont","_class_wxFont",0},
+    { "_unsigned_long","_wxDash",0},
+    { "_unsigned_long","_long",0},
+    { "_class_wxRect","_wxRect",0},
+    { "_class_wxDC","_wxDC",0},
+    { "_class_wxPyTimer","_wxPyTimer",0},
+    { "_wxAcceleratorEntry","_class_wxAcceleratorEntry",0},
+    { "_class_wxPanel","_wxPanel",0},
+    { "_signed_int","_wxPrintQuality",0},
+    { "_signed_int","_EBool",0},
+    { "_signed_int","_wxWindowID",0},
+    { "_signed_int","_int",0},
+    { "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
+    { "_wxMetaFileDC","_class_wxMetaFileDC",0},
+    { "_wxMenu","_class_wxMenu",0},
+    { "_wxScreenDC","_class_wxScreenDC",0},
+    { "_WXTYPE","_short",0},
+    { "_WXTYPE","_signed_short",0},
+    { "_WXTYPE","_unsigned_short",0},
+    { "_class_wxBrush","_wxBrush",0},
+    { "_unsigned_short","_WXTYPE",0},
+    { "_unsigned_short","_short",0},
+    { "_class_wxWindow","_wxWindow",0},
+    { "_class_wxFont","_wxFont",0},
+    { "_wxClientDC","_class_wxClientDC",0},
+    { "_class_wxPoint","_wxPoint",0},
+    { "_wxRealPoint","_class_wxRealPoint",0},
+    { "_signed_short","_WXTYPE",0},
+    { "_signed_short","_short",0},
+    { "_wxMemoryDC","_class_wxMemoryDC",0},
+    { "_wxPaintDC","_class_wxPaintDC",0},
+    { "_class_wxWindowDC","_wxWindowDC",0},
+    { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
+    { "_class_wxCursor","_wxCursor",0},
+    { "_wxScrolledWindow","_class_wxScrolledWindow",0},
+    { "_unsigned_char","_byte",0},
+    { "_class_wxMetaFileDC","_wxMetaFileDC",0},
+    { "_class_wxMenu","_wxMenu",0},
+    { "_unsigned_int","_wxPrintQuality",0},
+    { "_unsigned_int","_size_t",0},
+    { "_unsigned_int","_uint",0},
+    { "_unsigned_int","_wxWindowID",0},
+    { "_unsigned_int","_int",0},
+    { "_wxIcon","_class_wxIcon",0},
+    { "_wxDialog","_class_wxDialog",0},
+    { "_class_wxPen","_wxPen",0},
+    { "_short","_WXTYPE",0},
+    { "_short","_unsigned_short",0},
+    { "_short","_signed_short",0},
+    { "_class_wxImageList","_wxImageList",0},
+    { "_wxWindowID","_wxPrintQuality",0},
+    { "_wxWindowID","_size_t",0},
+    { "_wxWindowID","_EBool",0},
+    { "_wxWindowID","_uint",0},
+    { "_wxWindowID","_int",0},
+    { "_wxWindowID","_signed_int",0},
+    { "_wxWindowID","_unsigned_int",0},
+    { "_int","_wxPrintQuality",0},
+    { "_int","_size_t",0},
+    { "_int","_EBool",0},
+    { "_int","_uint",0},
+    { "_int","_wxWindowID",0},
+    { "_int","_unsigned_int",0},
+    { "_int","_signed_int",0},
+    { "_wxSize","_class_wxSize",0},
+    { "_wxRegionIterator","_class_wxRegionIterator",0},
+    { "_class_wxPrinterDC","_wxPrinterDC",0},
+    { "_class_wxPaintDC","_wxPaintDC",0},
+    { "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
+    { "_class_wxIcon","_wxIcon",0},
+    { "_class_wxColour","_wxColour",0},
+    { "_class_wxScreenDC","_wxScreenDC",0},
+    { "_wxPalette","_class_wxPalette",0},
+    { "_wxRegion","_class_wxRegion",0},
+    { "_class_wxClientDC","_wxClientDC",0},
+    { "_class_wxSize","_wxSize",0},
+    { "_class_wxBitmap","_wxBitmap",0},
+    { "_class_wxMemoryDC","_wxMemoryDC",0},
+    { "_wxMenuBar","_class_wxMenuBar",0},
+    { "_wxEvtHandler","_class_wxEvtHandler",0},
+    { "_wxMenuItem","_class_wxMenuItem",0},
+    { "_wxDash","_unsigned_long",0},
+    { "_wxDash","_long",0},
+    { "_class_wxScrolledWindow","_wxScrolledWindow",0},
+    { "_class_wxPalette","_wxPalette",0},
+    { "_wxWindow","_class_wxWindow",0},
+{0,0,0}};
+

 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif
 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif

-SWIGEXPORT(void,initmisc2c)() {
+SWIGEXPORT(void) initmisc2c() {

         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("misc2c", misc2cMethods);
         d = PyModule_GetDict(m);
         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("misc2c", misc2cMethods);
         d = PyModule_GetDict(m);

-/*
- * These are the pointer type-equivalency mappings. 
- * (Used by the SWIG pointer type-checker).
- */
-        SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_signed_long","_long",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_signed_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_unsigned_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_wxWindowID",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_uint",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_EBool",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_size_t",0);
-        SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
-        SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxEvtHandler",0);
-        SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
-        SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
-        SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0);
-        SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
-        SWIG_RegisterMapping("_byte","_unsigned_char",0);
-        SWIG_RegisterMapping("_long","_wxDash",0);
-        SWIG_RegisterMapping("_long","_unsigned_long",0);
-        SWIG_RegisterMapping("_long","_signed_long",0);
-        SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
-        SWIG_RegisterMapping("_size_t","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_size_t","_unsigned_int",0);
-        SWIG_RegisterMapping("_size_t","_int",0);
-        SWIG_RegisterMapping("_size_t","_wxWindowID",0);
-        SWIG_RegisterMapping("_size_t","_uint",0);
-        SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
-        SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0);
-        SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0);
-        SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);
-        SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
-        SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0);
-        SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
-        SWIG_RegisterMapping("_class_wxDialog","_wxDialog",0);
-        SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
-        SWIG_RegisterMapping("_uint","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_uint","_size_t",0);
-        SWIG_RegisterMapping("_uint","_unsigned_int",0);
-        SWIG_RegisterMapping("_uint","_int",0);
-        SWIG_RegisterMapping("_uint","_wxWindowID",0);
-        SWIG_RegisterMapping("_wxRect","_class_wxRect",0);
-        SWIG_RegisterMapping("_wxPoint","_class_wxPoint",0);
-        SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
-        SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0);
-        SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_EBool","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_EBool","_signed_int",0);
-        SWIG_RegisterMapping("_EBool","_int",0);
-        SWIG_RegisterMapping("_EBool","_wxWindowID",0);
-        SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
-        SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
-        SWIG_RegisterMapping("_unsigned_long","_wxDash",0);
-        SWIG_RegisterMapping("_unsigned_long","_long",0);
-        SWIG_RegisterMapping("_class_wxRect","_wxRect",0);
-        SWIG_RegisterMapping("_class_wxDC","_wxDC",0);
-        SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxAcceleratorEntry","_class_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_class_wxPanel","_wxPanel",0);
-        SWIG_RegisterMapping("_signed_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_signed_int","_EBool",0);
-        SWIG_RegisterMapping("_signed_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_signed_int","_int",0);
-        SWIG_RegisterMapping("_wxLayoutConstraints","_class_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_wxMetaFileDC","_class_wxMetaFileDC",0);
-        SWIG_RegisterMapping("_wxMenu","_class_wxMenu",0);
-        SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0);
-        SWIG_RegisterMapping("_WXTYPE","_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_signed_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_unsigned_short",0);
-        SWIG_RegisterMapping("_class_wxBrush","_wxBrush",0);
-        SWIG_RegisterMapping("_unsigned_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_unsigned_short","_short",0);
-        SWIG_RegisterMapping("_class_wxWindow","_wxWindow",0);
-        SWIG_RegisterMapping("_class_wxFont","_wxFont",0);
-        SWIG_RegisterMapping("_wxClientDC","_class_wxClientDC",0);
-        SWIG_RegisterMapping("_class_wxPoint","_wxPoint",0);
-        SWIG_RegisterMapping("_wxRealPoint","_class_wxRealPoint",0);
-        SWIG_RegisterMapping("_signed_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_signed_short","_short",0);
-        SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0);
-        SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
-        SWIG_RegisterMapping("_class_wxWindowDC","_wxWindowDC",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
-        SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0);
-        SWIG_RegisterMapping("_unsigned_char","_byte",0);
-        SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0);
-        SWIG_RegisterMapping("_class_wxMenu","_wxMenu",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_unsigned_int","_size_t",0);
-        SWIG_RegisterMapping("_unsigned_int","_uint",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_unsigned_int","_int",0);
-        SWIG_RegisterMapping("_wxIcon","_class_wxIcon",0);
-        SWIG_RegisterMapping("_wxDialog","_class_wxDialog",0);
-        SWIG_RegisterMapping("_class_wxPen","_wxPen",0);
-        SWIG_RegisterMapping("_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_short","_unsigned_short",0);
-        SWIG_RegisterMapping("_short","_signed_short",0);
-        SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0);
-        SWIG_RegisterMapping("_wxWindowID","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_wxWindowID","_size_t",0);
-        SWIG_RegisterMapping("_wxWindowID","_EBool",0);
-        SWIG_RegisterMapping("_wxWindowID","_uint",0);
-        SWIG_RegisterMapping("_wxWindowID","_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_signed_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_int","_size_t",0);
-        SWIG_RegisterMapping("_int","_EBool",0);
-        SWIG_RegisterMapping("_int","_uint",0);
-        SWIG_RegisterMapping("_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_int","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_signed_int",0);
-        SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
-        SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
-        SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
-        SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
-        SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
-        SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
-        SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
-        SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
-        SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
-        SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
-        SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
-        SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0);
-        SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0);
-        SWIG_RegisterMapping("_wxMenuBar","_class_wxMenuBar",0);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxEvtHandler",0);
-        SWIG_RegisterMapping("_wxMenuItem","_class_wxMenuItem",0);
-        SWIG_RegisterMapping("_wxDash","_unsigned_long",0);
-        SWIG_RegisterMapping("_wxDash","_long",0);
-        SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
-        SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
-        SWIG_RegisterMapping("_wxWindow","_class_wxWindow",0);
+{
+   int i;
+   for (i = 0; _swig_mapping[i].n1; i++)
+        SWIG_RegisterMapping(_swig_mapping[i].n1,_swig_mapping[i].n2,_swig_mapping[i].pcnv);
+}

 }
 }

diff --git a/utils/wxPython/src/msw/misc2.py b/utils/wxPython/src/msw/misc2.py
index 26017939a16b66003037d012b6f0e53257c536a7..7ffd3c947f2407675bef9ed25502eb364133c263 100644 (file)
--- a/utils/wxPython/src/msw/misc2.py
+++ b/utils/wxPython/src/msw/misc2.py
@@ -10,21 +10,21 @@ class wxToolTipPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def SetTip(self,arg0):
-        val = misc2c.wxToolTip_SetTip(self.this,arg0)
+    def SetTip(self, *_args, **_kwargs):
+        val = apply(misc2c.wxToolTip_SetTip,(self,) + _args, _kwargs)

         return val
         return val

-    def GetTip(self):
-        val = misc2c.wxToolTip_GetTip(self.this)
+    def GetTip(self, *_args, **_kwargs):
+        val = apply(misc2c.wxToolTip_GetTip,(self,) + _args, _kwargs)

         return val
         return val

-    def GetWindow(self):
-        val = misc2c.wxToolTip_GetWindow(self.this)
-        val = wxWindowPtr(val)
+    def GetWindow(self, *_args, **_kwargs):
+        val = apply(misc2c.wxToolTip_GetWindow,(self,) + _args, _kwargs)
+        if val: val = wxWindowPtr(val) 

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxToolTip instance>"
+        return "<C wxToolTip instance at %s>" % (self.this,)

 class wxToolTip(wxToolTipPtr):
 class wxToolTip(wxToolTipPtr):

-    def __init__(self,arg0) :
-        self.this = misc2c.new_wxToolTip(arg0)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(misc2c.new_wxToolTip,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -34,22 +34,14 @@ class wxToolTip(wxToolTipPtr):
 
 #-------------- FUNCTION WRAPPERS ------------------
 
 
 #-------------- FUNCTION WRAPPERS ------------------
 

-def wxFindWindowByLabel(arg0,*args):
-    argl = map(None,args)
-    try: argl[0] = argl[0].this
-    except: pass
-    args = tuple(argl)
-    val = apply(misc2c.wxFindWindowByLabel,(arg0,)+args)
-    val = wxWindowPtr(val)
+def wxFindWindowByLabel(*_args, **_kwargs):
+    val = apply(misc2c.wxFindWindowByLabel,_args,_kwargs)
+    if val: val = wxWindowPtr(val)

     return val
 
     return val
 

-def wxFindWindowByName(arg0,*args):
-    argl = map(None,args)
-    try: argl[0] = argl[0].this
-    except: pass
-    args = tuple(argl)
-    val = apply(misc2c.wxFindWindowByName,(arg0,)+args)
-    val = wxWindowPtr(val)
+def wxFindWindowByName(*_args, **_kwargs):
+    val = apply(misc2c.wxFindWindowByName,_args,_kwargs)
+    if val: val = wxWindowPtr(val)

     return val
 
 wxToolTip_Enable = misc2c.wxToolTip_Enable
     return val
 
 wxToolTip_Enable = misc2c.wxToolTip_Enable

diff --git a/utils/wxPython/src/msw/printfw.cpp b/utils/wxPython/src/msw/printfw.cpp
index 09b3b96b53cbc0e7a55c1783041e486310394a05..f363d2bb110d7192a04ffb1cc1098786cac8f348 100644 (file)
--- a/utils/wxPython/src/msw/printfw.cpp
+++ b/utils/wxPython/src/msw/printfw.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)

- * Version 1.1 (Patch 5)
+ * Version 1.1 (Patch 6)

  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.


@@ -24,16 +24,16 @@
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)

-#      define SWIGEXPORT(a,b) __declspec(dllexport) a b
+#      define SWIGEXPORT(a) __declspec(dllexport) a

 #   else
 #      if defined(__BORLANDC__)
 #   else
 #      if defined(__BORLANDC__)

-#          define SWIGEXPORT(a,b) a _export b
+#          define SWIGEXPORT(a) a _export 

 #      else
 #      else

-#          define SWIGEXPORT(a,b) a b
+#          define SWIGEXPORT(a) a 

 #      endif
 #   endif
 #else
 #      endif
 #   endif
 #else

-#   define SWIGEXPORT(a,b) a b
+#   define SWIGEXPORT(a) a 

 #endif
 
 #ifdef __cplusplus
 #endif
 
 #ifdef __cplusplus


@@ -43,12 +43,12 @@ extern "C" {
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);

+extern char *SWIG_GetPtrObj(PyObject *, void **, char *);

 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif
 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif

-

 #define SWIG_init    initprintfwc
 
 #define SWIG_name    "printfwc"
 #define SWIG_init    initprintfwc
 
 #define SWIG_name    "printfwc"


@@ -59,12 +59,13 @@ extern PyObject *SWIG_newvarlink(void);
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;

-    if (!target) {
+    PyObject*   o3;
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);
         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);


@@ -81,23 +82,23 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
     PyObject*   o3;
 
     PyObject*   o2;
     PyObject*   o3;
 

-    if (!target) {
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }
         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }

-        o3 = PyTuple_New(1);
-        PyTuple_SetItem(o3, 0, o);
+        o3 = PyTuple_New(1);            
+        PyTuple_SetItem(o3, 0, o);      

 
         o2 = target;
 
         o2 = target;

-        target = PySequence_Concat(o2, o3);
-        Py_DECREF(o2);
+        target = PySequence_Concat(o2, o3); 
+        Py_DECREF(o2);                      

         Py_DECREF(o3);
     }
     return target;
         Py_DECREF(o3);
     }
     return target;


@@ -175,6 +176,9 @@ public:
 
     PYPRIVATE;
 };
 
     PYPRIVATE;
 };

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

 #define new_wxPrintData() (new wxPrintData())
 static PyObject *_wrap_new_wxPrintData(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define new_wxPrintData() (new wxPrintData())
 static PyObject *_wrap_new_wxPrintData(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -189,8 +193,13 @@ static PyObject *_wrap_new_wxPrintData(PyObject *self, PyObject *args) {
         _result = (wxPrintData *)new_wxPrintData();
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxPrintData *)new_wxPrintData();
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrintData_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrintData_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -198,13 +207,14 @@ static PyObject *_wrap_new_wxPrintData(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxPrintData(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPrintData * _arg0;
 static PyObject *_wrap_delete_wxPrintData(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPrintData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:delete_wxPrintData",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxPrintData",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPrintData. Expected _wxPrintData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPrintData. Expected _wxPrintData_p.");
         return NULL;
         }


@@ -224,13 +234,14 @@ static PyObject *_wrap_wxPrintData_GetNoCopies(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxPrintData * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxPrintData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintData_GetNoCopies",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintData_GetNoCopies",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_GetNoCopies. Expected _wxPrintData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_GetNoCopies. Expected _wxPrintData_p.");
         return NULL;
         }


@@ -249,13 +260,14 @@ static PyObject *_wrap_wxPrintData_GetCollate(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxPrintData * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxPrintData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintData_GetCollate",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintData_GetCollate",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_GetCollate. Expected _wxPrintData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_GetCollate. Expected _wxPrintData_p.");
         return NULL;
         }


@@ -274,13 +286,14 @@ static PyObject *_wrap_wxPrintData_GetOrientation(PyObject *self, PyObject *args
     PyObject * _resultobj;
     int  _result;
     wxPrintData * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxPrintData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintData_GetOrientation",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintData_GetOrientation",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_GetOrientation. Expected _wxPrintData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_GetOrientation. Expected _wxPrintData_p.");
         return NULL;
         }


@@ -299,13 +312,14 @@ static PyObject *_wrap_wxPrintData_GetPrinterName(PyObject *self, PyObject *args
     PyObject * _resultobj;
     wxString * _result;
     wxPrintData * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxPrintData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintData_GetPrinterName",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintData_GetPrinterName",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_GetPrinterName. Expected _wxPrintData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_GetPrinterName. Expected _wxPrintData_p.");
         return NULL;
         }


@@ -327,13 +341,14 @@ static PyObject *_wrap_wxPrintData_GetColour(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxPrintData * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxPrintData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintData_GetColour",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintData_GetColour",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_GetColour. Expected _wxPrintData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_GetColour. Expected _wxPrintData_p.");
         return NULL;
         }


@@ -352,13 +367,14 @@ static PyObject *_wrap_wxPrintData_GetDuplex(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDuplexMode  _result;
     wxPrintData * _arg0;
     PyObject * _resultobj;
     wxDuplexMode  _result;
     wxPrintData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintData_GetDuplex",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintData_GetDuplex",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_GetDuplex. Expected _wxPrintData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_GetDuplex. Expected _wxPrintData_p.");
         return NULL;
         }


@@ -377,13 +393,14 @@ static PyObject *_wrap_wxPrintData_GetPaperId(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPaperSize  _result;
     wxPrintData * _arg0;
     PyObject * _resultobj;
     wxPaperSize  _result;
     wxPrintData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintData_GetPaperId",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintData_GetPaperId",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_GetPaperId. Expected _wxPrintData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_GetPaperId. Expected _wxPrintData_p.");
         return NULL;
         }


@@ -402,14 +419,15 @@ static PyObject *_wrap_wxPrintData_GetPaperSize(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxSize * _result;
     wxPrintData * _arg0;
     PyObject * _resultobj;
     wxSize * _result;
     wxPrintData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintData_GetPaperSize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintData_GetPaperSize",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_GetPaperSize. Expected _wxPrintData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_GetPaperSize. Expected _wxPrintData_p.");
         return NULL;
         }


@@ -420,8 +438,13 @@ static PyObject *_wrap_wxPrintData_GetPaperSize(PyObject *self, PyObject *args)
     _result = (wxSize *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxSize *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxSize_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxSize_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -430,13 +453,14 @@ static PyObject *_wrap_wxPrintData_GetQuality(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPrintQuality  _result;
     wxPrintData * _arg0;
     PyObject * _resultobj;
     wxPrintQuality  _result;
     wxPrintData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintData_GetQuality",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintData_GetQuality",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_GetQuality. Expected _wxPrintData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_GetQuality. Expected _wxPrintData_p.");
         return NULL;
         }


@@ -455,13 +479,14 @@ static PyObject *_wrap_wxPrintData_SetNoCopies(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPrintData * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxPrintData * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPrintData_SetNoCopies",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPrintData_SetNoCopies",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_SetNoCopies. Expected _wxPrintData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_SetNoCopies. Expected _wxPrintData_p.");
         return NULL;
         }


@@ -481,14 +506,15 @@ static PyObject *_wrap_wxPrintData_SetCollate(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPrintData * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxPrintData * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPrintData_SetCollate",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPrintData_SetCollate",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_SetCollate. Expected _wxPrintData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_SetCollate. Expected _wxPrintData_p.");
         return NULL;
         }


@@ -509,13 +535,14 @@ static PyObject *_wrap_wxPrintData_SetOrientation(PyObject *self, PyObject *args
     PyObject * _resultobj;
     wxPrintData * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxPrintData * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPrintData_SetOrientation",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPrintData_SetOrientation",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_SetOrientation. Expected _wxPrintData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_SetOrientation. Expected _wxPrintData_p.");
         return NULL;
         }


@@ -535,14 +562,15 @@ static PyObject *_wrap_wxPrintData_SetPrinterName(PyObject *self, PyObject *args
     PyObject * _resultobj;
     wxPrintData * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxPrintData * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxPrintData_SetPrinterName",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxPrintData_SetPrinterName",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_SetPrinterName. Expected _wxPrintData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_SetPrinterName. Expected _wxPrintData_p.");
         return NULL;
         }


@@ -573,14 +601,15 @@ static PyObject *_wrap_wxPrintData_SetColour(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPrintData * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxPrintData * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPrintData_SetColour",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPrintData_SetColour",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_SetColour. Expected _wxPrintData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_SetColour. Expected _wxPrintData_p.");
         return NULL;
         }


@@ -601,13 +630,14 @@ static PyObject *_wrap_wxPrintData_SetDuplex(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPrintData * _arg0;
     wxDuplexMode  _arg1;
     PyObject * _resultobj;
     wxPrintData * _arg0;
     wxDuplexMode  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPrintData_SetDuplex",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPrintData_SetDuplex",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_SetDuplex. Expected _wxPrintData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_SetDuplex. Expected _wxPrintData_p.");
         return NULL;
         }


@@ -627,13 +657,14 @@ static PyObject *_wrap_wxPrintData_SetPaperId(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPrintData * _arg0;
     wxPaperSize  _arg1;
     PyObject * _resultobj;
     wxPrintData * _arg0;
     wxPaperSize  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPrintData_SetPaperId",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPrintData_SetPaperId",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_SetPaperId. Expected _wxPrintData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_SetPaperId. Expected _wxPrintData_p.");
         return NULL;
         }


@@ -653,20 +684,22 @@ static PyObject *_wrap_wxPrintData_SetPaperSize(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxPrintData * _arg0;
     wxSize * _arg1;
     PyObject * _resultobj;
     wxPrintData * _arg0;
     wxSize * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxPrintData_SetPaperSize",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxPrintData_SetPaperSize",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_SetPaperSize. Expected _wxPrintData_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_SetPaperSize. Expected _wxPrintData_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxSize_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrintData_SetPaperSize. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrintData_SetPaperSize. Expected _wxSize_p.");
         return NULL;
         }


@@ -686,13 +719,14 @@ static PyObject *_wrap_wxPrintData_SetQuality(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPrintData * _arg0;
     wxPrintQuality  _arg1;
     PyObject * _resultobj;
     wxPrintData * _arg0;
     wxPrintQuality  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPrintData_SetQuality",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPrintData_SetQuality",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_SetQuality. Expected _wxPrintData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_SetQuality. Expected _wxPrintData_p.");
         return NULL;
         }


@@ -721,8 +755,13 @@ static PyObject *_wrap_new_wxPageSetupDialogData(PyObject *self, PyObject *args)
         _result = (wxPageSetupDialogData *)new_wxPageSetupDialogData();
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxPageSetupDialogData *)new_wxPageSetupDialogData();
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPageSetupDialogData_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPageSetupDialogData_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -730,13 +769,14 @@ static PyObject *_wrap_new_wxPageSetupDialogData(PyObject *self, PyObject *args)
 static PyObject *_wrap_delete_wxPageSetupDialogData(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
 static PyObject *_wrap_delete_wxPageSetupDialogData(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:delete_wxPageSetupDialogData",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxPageSetupDialogData",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPageSetupDialogData. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPageSetupDialogData. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }


@@ -756,14 +796,15 @@ static PyObject *_wrap_wxPageSetupDialogData_EnableHelp(PyObject *self, PyObject
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPageSetupDialogData_EnableHelp",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPageSetupDialogData_EnableHelp",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_EnableHelp. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_EnableHelp. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }


@@ -784,14 +825,15 @@ static PyObject *_wrap_wxPageSetupDialogData_EnableMargins(PyObject *self, PyObj
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPageSetupDialogData_EnableMargins",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPageSetupDialogData_EnableMargins",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_EnableMargins. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_EnableMargins. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }


@@ -812,14 +854,15 @@ static PyObject *_wrap_wxPageSetupDialogData_EnableOrientation(PyObject *self, P
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPageSetupDialogData_EnableOrientation",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPageSetupDialogData_EnableOrientation",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_EnableOrientation. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_EnableOrientation. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }


@@ -840,14 +883,15 @@ static PyObject *_wrap_wxPageSetupDialogData_EnablePaper(PyObject *self, PyObjec
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPageSetupDialogData_EnablePaper",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPageSetupDialogData_EnablePaper",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_EnablePaper. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_EnablePaper. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }


@@ -868,14 +912,15 @@ static PyObject *_wrap_wxPageSetupDialogData_EnablePrinter(PyObject *self, PyObj
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPageSetupDialogData_EnablePrinter",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPageSetupDialogData_EnablePrinter",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_EnablePrinter. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_EnablePrinter. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }


@@ -896,13 +941,14 @@ static PyObject *_wrap_wxPageSetupDialogData_GetDefaultMinMargins(PyObject *self
     PyObject * _resultobj;
     bool  _result;
     wxPageSetupDialogData * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxPageSetupDialogData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPageSetupDialogData_GetDefaultMinMargins",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPageSetupDialogData_GetDefaultMinMargins",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_GetDefaultMinMargins. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_GetDefaultMinMargins. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }


@@ -921,13 +967,14 @@ static PyObject *_wrap_wxPageSetupDialogData_GetEnableMargins(PyObject *self, Py
     PyObject * _resultobj;
     bool  _result;
     wxPageSetupDialogData * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxPageSetupDialogData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPageSetupDialogData_GetEnableMargins",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPageSetupDialogData_GetEnableMargins",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_GetEnableMargins. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_GetEnableMargins. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }


@@ -946,13 +993,14 @@ static PyObject *_wrap_wxPageSetupDialogData_GetEnableOrientation(PyObject *self
     PyObject * _resultobj;
     bool  _result;
     wxPageSetupDialogData * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxPageSetupDialogData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPageSetupDialogData_GetEnableOrientation",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPageSetupDialogData_GetEnableOrientation",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_GetEnableOrientation. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_GetEnableOrientation. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }


@@ -971,13 +1019,14 @@ static PyObject *_wrap_wxPageSetupDialogData_GetEnablePaper(PyObject *self, PyOb
     PyObject * _resultobj;
     bool  _result;
     wxPageSetupDialogData * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxPageSetupDialogData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPageSetupDialogData_GetEnablePaper",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPageSetupDialogData_GetEnablePaper",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_GetEnablePaper. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_GetEnablePaper. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }


@@ -996,13 +1045,14 @@ static PyObject *_wrap_wxPageSetupDialogData_GetEnablePrinter(PyObject *self, Py
     PyObject * _resultobj;
     bool  _result;
     wxPageSetupDialogData * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxPageSetupDialogData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPageSetupDialogData_GetEnablePrinter",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPageSetupDialogData_GetEnablePrinter",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_GetEnablePrinter. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_GetEnablePrinter. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }


@@ -1021,13 +1071,14 @@ static PyObject *_wrap_wxPageSetupDialogData_GetEnableHelp(PyObject *self, PyObj
     PyObject * _resultobj;
     bool  _result;
     wxPageSetupDialogData * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxPageSetupDialogData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPageSetupDialogData_GetEnableHelp",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPageSetupDialogData_GetEnableHelp",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_GetEnableHelp. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_GetEnableHelp. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }


@@ -1046,13 +1097,14 @@ static PyObject *_wrap_wxPageSetupDialogData_GetDefaultInfo(PyObject *self, PyOb
     PyObject * _resultobj;
     bool  _result;
     wxPageSetupDialogData * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxPageSetupDialogData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPageSetupDialogData_GetDefaultInfo",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPageSetupDialogData_GetDefaultInfo",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_GetDefaultInfo. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_GetDefaultInfo. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }


@@ -1071,14 +1123,15 @@ static PyObject *_wrap_wxPageSetupDialogData_GetMarginTopLeft(PyObject *self, Py
     PyObject * _resultobj;
     wxPoint * _result;
     wxPageSetupDialogData * _arg0;
     PyObject * _resultobj;
     wxPoint * _result;
     wxPageSetupDialogData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPageSetupDialogData_GetMarginTopLeft",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPageSetupDialogData_GetMarginTopLeft",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_GetMarginTopLeft. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_GetMarginTopLeft. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }


@@ -1098,14 +1151,15 @@ static PyObject *_wrap_wxPageSetupDialogData_GetMarginBottomRight(PyObject *self
     PyObject * _resultobj;
     wxPoint * _result;
     wxPageSetupDialogData * _arg0;
     PyObject * _resultobj;
     wxPoint * _result;
     wxPageSetupDialogData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPageSetupDialogData_GetMarginBottomRight",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPageSetupDialogData_GetMarginBottomRight",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_GetMarginBottomRight. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_GetMarginBottomRight. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }


@@ -1125,14 +1179,15 @@ static PyObject *_wrap_wxPageSetupDialogData_GetMinMarginTopLeft(PyObject *self,
     PyObject * _resultobj;
     wxPoint * _result;
     wxPageSetupDialogData * _arg0;
     PyObject * _resultobj;
     wxPoint * _result;
     wxPageSetupDialogData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPageSetupDialogData_GetMinMarginTopLeft",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPageSetupDialogData_GetMinMarginTopLeft",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_GetMinMarginTopLeft. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_GetMinMarginTopLeft. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }


@@ -1152,14 +1207,15 @@ static PyObject *_wrap_wxPageSetupDialogData_GetMinMarginBottomRight(PyObject *s
     PyObject * _resultobj;
     wxPoint * _result;
     wxPageSetupDialogData * _arg0;
     PyObject * _resultobj;
     wxPoint * _result;
     wxPageSetupDialogData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPageSetupDialogData_GetMinMarginBottomRight",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPageSetupDialogData_GetMinMarginBottomRight",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_GetMinMarginBottomRight. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_GetMinMarginBottomRight. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }


@@ -1179,13 +1235,14 @@ static PyObject *_wrap_wxPageSetupDialogData_GetPaperId(PyObject *self, PyObject
     PyObject * _resultobj;
     wxPaperSize  _result;
     wxPageSetupDialogData * _arg0;
     PyObject * _resultobj;
     wxPaperSize  _result;
     wxPageSetupDialogData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPageSetupDialogData_GetPaperId",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPageSetupDialogData_GetPaperId",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_GetPaperId. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_GetPaperId. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }


@@ -1204,14 +1261,15 @@ static PyObject *_wrap_wxPageSetupDialogData_GetPaperSize(PyObject *self, PyObje
     PyObject * _resultobj;
     wxSize * _result;
     wxPageSetupDialogData * _arg0;
     PyObject * _resultobj;
     wxSize * _result;
     wxPageSetupDialogData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPageSetupDialogData_GetPaperSize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPageSetupDialogData_GetPaperSize",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_GetPaperSize. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_GetPaperSize. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }


@@ -1233,14 +1291,15 @@ static PyObject *_wrap_wxPageSetupDialogData_GetPrintData(PyObject *self, PyObje
     PyObject * _resultobj;
     wxPrintData * _result;
     wxPageSetupDialogData * _arg0;
     PyObject * _resultobj;
     wxPrintData * _result;
     wxPageSetupDialogData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPageSetupDialogData_GetPrintData",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPageSetupDialogData_GetPrintData",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_GetPrintData. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_GetPrintData. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }


@@ -1250,8 +1309,13 @@ static PyObject *_wrap_wxPageSetupDialogData_GetPrintData(PyObject *self, PyObje
         _result = (wxPrintData *)wxPageSetupDialogData_GetPrintData(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxPrintData *)wxPageSetupDialogData_GetPrintData(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrintData_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrintData_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1260,14 +1324,15 @@ static PyObject *_wrap_wxPageSetupDialogData_SetDefaultInfo(PyObject *self, PyOb
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPageSetupDialogData_SetDefaultInfo",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPageSetupDialogData_SetDefaultInfo",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_SetDefaultInfo. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_SetDefaultInfo. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }


@@ -1288,14 +1353,15 @@ static PyObject *_wrap_wxPageSetupDialogData_SetDefaultMinMargins(PyObject *self
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPageSetupDialogData_SetDefaultMinMargins",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPageSetupDialogData_SetDefaultMinMargins",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_SetDefaultMinMargins. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_SetDefaultMinMargins. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }


@@ -1316,20 +1382,22 @@ static PyObject *_wrap_wxPageSetupDialogData_SetMarginTopLeft(PyObject *self, Py
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     wxPoint * _arg1;
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     wxPoint * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxPageSetupDialogData_SetMarginTopLeft",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxPageSetupDialogData_SetMarginTopLeft",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_SetMarginTopLeft. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_SetMarginTopLeft. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPoint_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPageSetupDialogData_SetMarginTopLeft. Expected _wxPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPageSetupDialogData_SetMarginTopLeft. Expected _wxPoint_p.");
         return NULL;
         }


@@ -1349,20 +1417,22 @@ static PyObject *_wrap_wxPageSetupDialogData_SetMarginBottomRight(PyObject *self
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     wxPoint * _arg1;
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     wxPoint * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxPageSetupDialogData_SetMarginBottomRight",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxPageSetupDialogData_SetMarginBottomRight",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_SetMarginBottomRight. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_SetMarginBottomRight. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPoint_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPageSetupDialogData_SetMarginBottomRight. Expected _wxPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPageSetupDialogData_SetMarginBottomRight. Expected _wxPoint_p.");
         return NULL;
         }


@@ -1382,20 +1452,22 @@ static PyObject *_wrap_wxPageSetupDialogData_SetMinMarginTopLeft(PyObject *self,
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     wxPoint * _arg1;
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     wxPoint * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxPageSetupDialogData_SetMinMarginTopLeft",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxPageSetupDialogData_SetMinMarginTopLeft",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_SetMinMarginTopLeft. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_SetMinMarginTopLeft. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPoint_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPageSetupDialogData_SetMinMarginTopLeft. Expected _wxPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPageSetupDialogData_SetMinMarginTopLeft. Expected _wxPoint_p.");
         return NULL;
         }


@@ -1415,20 +1487,22 @@ static PyObject *_wrap_wxPageSetupDialogData_SetMinMarginBottomRight(PyObject *s
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     wxPoint * _arg1;
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     wxPoint * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxPageSetupDialogData_SetMinMarginBottomRight",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxPageSetupDialogData_SetMinMarginBottomRight",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_SetMinMarginBottomRight. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_SetMinMarginBottomRight. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPoint_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPageSetupDialogData_SetMinMarginBottomRight. Expected _wxPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPageSetupDialogData_SetMinMarginBottomRight. Expected _wxPoint_p.");
         return NULL;
         }


@@ -1448,20 +1522,22 @@ static PyObject *_wrap_wxPageSetupDialogData_SetPaperId(PyObject *self, PyObject
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     wxPaperSize * _arg1;
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     wxPaperSize * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxPageSetupDialogData_SetPaperId",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxPageSetupDialogData_SetPaperId",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_SetPaperId. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_SetPaperId. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPaperSize_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPaperSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPageSetupDialogData_SetPaperId. Expected _wxPaperSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPageSetupDialogData_SetPaperId. Expected _wxPaperSize_p.");
         return NULL;
         }


@@ -1481,20 +1557,22 @@ static PyObject *_wrap_wxPageSetupDialogData_SetPaperSize(PyObject *self, PyObje
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     wxSize * _arg1;
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     wxSize * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxPageSetupDialogData_SetPaperSize",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxPageSetupDialogData_SetPaperSize",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_SetPaperSize. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_SetPaperSize. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxSize_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPageSetupDialogData_SetPaperSize. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPageSetupDialogData_SetPaperSize. Expected _wxSize_p.");
         return NULL;
         }


@@ -1514,20 +1592,22 @@ static PyObject *_wrap_wxPageSetupDialogData_SetPrintData(PyObject *self, PyObje
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     wxPrintData * _arg1;
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     wxPrintData * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxPageSetupDialogData_SetPrintData",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxPageSetupDialogData_SetPrintData",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPageSetupDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_SetPrintData. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialogData_SetPrintData. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPrintData_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPrintData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPageSetupDialogData_SetPrintData. Expected _wxPrintData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPageSetupDialogData_SetPrintData. Expected _wxPrintData_p.");
         return NULL;
         }


@@ -1579,22 +1659,24 @@ static PyObject *_wrap_new_wxPageSetupDialog(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPageSetupDialog * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxPageSetupDialog * _result;
     wxWindow * _arg0;

-    wxPageSetupDialogData * _arg1 = NULL;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    wxPageSetupDialogData * _arg1 = (wxPageSetupDialogData *) NULL;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|s:new_wxPageSetupDialog",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"O|O:new_wxPageSetupDialog",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPageSetupDialog. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPageSetupDialog. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPageSetupDialogData_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPageSetupDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of new_wxPageSetupDialog. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of new_wxPageSetupDialog. Expected _wxPageSetupDialogData_p.");
         return NULL;
         }


@@ -1604,8 +1686,13 @@ static PyObject *_wrap_new_wxPageSetupDialog(PyObject *self, PyObject *args) {
         _result = (wxPageSetupDialog *)new_wxPageSetupDialog(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxPageSetupDialog *)new_wxPageSetupDialog(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPageSetupDialog_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPageSetupDialog_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1614,14 +1701,15 @@ static PyObject *_wrap_wxPageSetupDialog_GetPageSetupData(PyObject *self, PyObje
     PyObject * _resultobj;
     wxPageSetupDialogData * _result;
     wxPageSetupDialog * _arg0;
     PyObject * _resultobj;
     wxPageSetupDialogData * _result;
     wxPageSetupDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPageSetupDialog_GetPageSetupData",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPageSetupDialog_GetPageSetupData",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPageSetupDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPageSetupDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialog_GetPageSetupData. Expected _wxPageSetupDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialog_GetPageSetupData. Expected _wxPageSetupDialog_p.");
         return NULL;
         }


@@ -1632,8 +1720,13 @@ static PyObject *_wrap_wxPageSetupDialog_GetPageSetupData(PyObject *self, PyObje
     _result = (wxPageSetupDialogData *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxPageSetupDialogData *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPageSetupDialogData_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPageSetupDialogData_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1642,13 +1735,14 @@ static PyObject *_wrap_wxPageSetupDialog_ShowModal(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     int  _result;
     wxPageSetupDialog * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxPageSetupDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPageSetupDialog_ShowModal",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPageSetupDialog_ShowModal",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPageSetupDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPageSetupDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialog_ShowModal. Expected _wxPageSetupDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPageSetupDialog_ShowModal. Expected _wxPageSetupDialog_p.");
         return NULL;
         }


@@ -1676,8 +1770,13 @@ static PyObject *_wrap_new_wxPrintDialogData(PyObject *self, PyObject *args) {
         _result = (wxPrintDialogData *)new_wxPrintDialogData();
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxPrintDialogData *)new_wxPrintDialogData();
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrintDialogData_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrintDialogData_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1685,13 +1784,14 @@ static PyObject *_wrap_new_wxPrintDialogData(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxPrintDialogData(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
 static PyObject *_wrap_delete_wxPrintDialogData(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:delete_wxPrintDialogData",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxPrintDialogData",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPrintDialogData. Expected _wxPrintDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPrintDialogData. Expected _wxPrintDialogData_p.");
         return NULL;
         }


@@ -1711,14 +1811,15 @@ static PyObject *_wrap_wxPrintDialogData_EnableHelp(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPrintDialogData_EnableHelp",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPrintDialogData_EnableHelp",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_EnableHelp. Expected _wxPrintDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_EnableHelp. Expected _wxPrintDialogData_p.");
         return NULL;
         }


@@ -1739,14 +1840,15 @@ static PyObject *_wrap_wxPrintDialogData_EnablePageNumbers(PyObject *self, PyObj
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPrintDialogData_EnablePageNumbers",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPrintDialogData_EnablePageNumbers",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_EnablePageNumbers. Expected _wxPrintDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_EnablePageNumbers. Expected _wxPrintDialogData_p.");
         return NULL;
         }


@@ -1767,14 +1869,15 @@ static PyObject *_wrap_wxPrintDialogData_EnablePrintToFile(PyObject *self, PyObj
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPrintDialogData_EnablePrintToFile",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPrintDialogData_EnablePrintToFile",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_EnablePrintToFile. Expected _wxPrintDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_EnablePrintToFile. Expected _wxPrintDialogData_p.");
         return NULL;
         }


@@ -1795,14 +1898,15 @@ static PyObject *_wrap_wxPrintDialogData_EnableSelection(PyObject *self, PyObjec
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPrintDialogData_EnableSelection",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPrintDialogData_EnableSelection",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_EnableSelection. Expected _wxPrintDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_EnableSelection. Expected _wxPrintDialogData_p.");
         return NULL;
         }


@@ -1823,13 +1927,14 @@ static PyObject *_wrap_wxPrintDialogData_GetAllPages(PyObject *self, PyObject *a
     PyObject * _resultobj;
     bool  _result;
     wxPrintDialogData * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxPrintDialogData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintDialogData_GetAllPages",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintDialogData_GetAllPages",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetAllPages. Expected _wxPrintDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetAllPages. Expected _wxPrintDialogData_p.");
         return NULL;
         }


@@ -1848,13 +1953,14 @@ static PyObject *_wrap_wxPrintDialogData_GetCollate(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     bool  _result;
     wxPrintDialogData * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxPrintDialogData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintDialogData_GetCollate",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintDialogData_GetCollate",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetCollate. Expected _wxPrintDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetCollate. Expected _wxPrintDialogData_p.");
         return NULL;
         }


@@ -1873,13 +1979,14 @@ static PyObject *_wrap_wxPrintDialogData_GetFromPage(PyObject *self, PyObject *a
     PyObject * _resultobj;
     int  _result;
     wxPrintDialogData * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxPrintDialogData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintDialogData_GetFromPage",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintDialogData_GetFromPage",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetFromPage. Expected _wxPrintDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetFromPage. Expected _wxPrintDialogData_p.");
         return NULL;
         }


@@ -1898,13 +2005,14 @@ static PyObject *_wrap_wxPrintDialogData_GetMaxPage(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     int  _result;
     wxPrintDialogData * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxPrintDialogData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintDialogData_GetMaxPage",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintDialogData_GetMaxPage",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetMaxPage. Expected _wxPrintDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetMaxPage. Expected _wxPrintDialogData_p.");
         return NULL;
         }


@@ -1923,13 +2031,14 @@ static PyObject *_wrap_wxPrintDialogData_GetMinPage(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     int  _result;
     wxPrintDialogData * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxPrintDialogData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintDialogData_GetMinPage",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintDialogData_GetMinPage",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetMinPage. Expected _wxPrintDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetMinPage. Expected _wxPrintDialogData_p.");
         return NULL;
         }


@@ -1948,13 +2057,14 @@ static PyObject *_wrap_wxPrintDialogData_GetNoCopies(PyObject *self, PyObject *a
     PyObject * _resultobj;
     int  _result;
     wxPrintDialogData * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxPrintDialogData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintDialogData_GetNoCopies",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintDialogData_GetNoCopies",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetNoCopies. Expected _wxPrintDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetNoCopies. Expected _wxPrintDialogData_p.");
         return NULL;
         }


@@ -1975,14 +2085,15 @@ static PyObject *_wrap_wxPrintDialogData_GetPrintData(PyObject *self, PyObject *
     PyObject * _resultobj;
     wxPrintData * _result;
     wxPrintDialogData * _arg0;
     PyObject * _resultobj;
     wxPrintData * _result;
     wxPrintDialogData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintDialogData_GetPrintData",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintDialogData_GetPrintData",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetPrintData. Expected _wxPrintDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetPrintData. Expected _wxPrintDialogData_p.");
         return NULL;
         }


@@ -1992,8 +2103,13 @@ static PyObject *_wrap_wxPrintDialogData_GetPrintData(PyObject *self, PyObject *
         _result = (wxPrintData *)wxPrintDialogData_GetPrintData(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxPrintData *)wxPrintDialogData_GetPrintData(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrintData_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrintData_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -2002,13 +2118,14 @@ static PyObject *_wrap_wxPrintDialogData_GetPrintToFile(PyObject *self, PyObject
     PyObject * _resultobj;
     bool  _result;
     wxPrintDialogData * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxPrintDialogData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintDialogData_GetPrintToFile",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintDialogData_GetPrintToFile",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetPrintToFile. Expected _wxPrintDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetPrintToFile. Expected _wxPrintDialogData_p.");
         return NULL;
         }


@@ -2027,13 +2144,14 @@ static PyObject *_wrap_wxPrintDialogData_GetToPage(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     int  _result;
     wxPrintDialogData * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxPrintDialogData * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintDialogData_GetToPage",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintDialogData_GetToPage",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetToPage. Expected _wxPrintDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetToPage. Expected _wxPrintDialogData_p.");
         return NULL;
         }


@@ -2052,14 +2170,15 @@ static PyObject *_wrap_wxPrintDialogData_SetCollate(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPrintDialogData_SetCollate",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPrintDialogData_SetCollate",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetCollate. Expected _wxPrintDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetCollate. Expected _wxPrintDialogData_p.");
         return NULL;
         }


@@ -2080,13 +2199,14 @@ static PyObject *_wrap_wxPrintDialogData_SetFromPage(PyObject *self, PyObject *a
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPrintDialogData_SetFromPage",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPrintDialogData_SetFromPage",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetFromPage. Expected _wxPrintDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetFromPage. Expected _wxPrintDialogData_p.");
         return NULL;
         }


@@ -2106,13 +2226,14 @@ static PyObject *_wrap_wxPrintDialogData_SetMaxPage(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPrintDialogData_SetMaxPage",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPrintDialogData_SetMaxPage",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetMaxPage. Expected _wxPrintDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetMaxPage. Expected _wxPrintDialogData_p.");
         return NULL;
         }


@@ -2132,13 +2253,14 @@ static PyObject *_wrap_wxPrintDialogData_SetMinPage(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPrintDialogData_SetMinPage",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPrintDialogData_SetMinPage",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetMinPage. Expected _wxPrintDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetMinPage. Expected _wxPrintDialogData_p.");
         return NULL;
         }


@@ -2158,13 +2280,14 @@ static PyObject *_wrap_wxPrintDialogData_SetNoCopies(PyObject *self, PyObject *a
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPrintDialogData_SetNoCopies",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPrintDialogData_SetNoCopies",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetNoCopies. Expected _wxPrintDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetNoCopies. Expected _wxPrintDialogData_p.");
         return NULL;
         }


@@ -2184,20 +2307,22 @@ static PyObject *_wrap_wxPrintDialogData_SetPrintData(PyObject *self, PyObject *
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     wxPrintData * _arg1;
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     wxPrintData * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxPrintDialogData_SetPrintData",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxPrintDialogData_SetPrintData",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetPrintData. Expected _wxPrintDialogData_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetPrintData. Expected _wxPrintDialogData_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPrintData_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPrintData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrintDialogData_SetPrintData. Expected _wxPrintData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrintDialogData_SetPrintData. Expected _wxPrintData_p.");
         return NULL;
         }


@@ -2217,14 +2342,15 @@ static PyObject *_wrap_wxPrintDialogData_SetPrintToFile(PyObject *self, PyObject
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPrintDialogData_SetPrintToFile",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPrintDialogData_SetPrintToFile",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetPrintToFile. Expected _wxPrintDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetPrintToFile. Expected _wxPrintDialogData_p.");
         return NULL;
         }


@@ -2245,14 +2371,15 @@ static PyObject *_wrap_wxPrintDialogData_SetSetupDialog(PyObject *self, PyObject
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPrintDialogData_SetSetupDialog",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPrintDialogData_SetSetupDialog",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetSetupDialog. Expected _wxPrintDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetSetupDialog. Expected _wxPrintDialogData_p.");
         return NULL;
         }


@@ -2273,13 +2400,14 @@ static PyObject *_wrap_wxPrintDialogData_SetToPage(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPrintDialogData_SetToPage",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPrintDialogData_SetToPage",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetToPage. Expected _wxPrintDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetToPage. Expected _wxPrintDialogData_p.");
         return NULL;
         }


@@ -2331,22 +2459,24 @@ static PyObject *_wrap_new_wxPrintDialog(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPrintDialog * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxPrintDialog * _result;
     wxWindow * _arg0;

-    wxPrintDialogData * _arg1 = NULL;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    wxPrintDialogData * _arg1 = (wxPrintDialogData *) NULL;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|s:new_wxPrintDialog",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"O|O:new_wxPrintDialog",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPrintDialog. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPrintDialog. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPrintDialogData_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPrintDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of new_wxPrintDialog. Expected _wxPrintDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of new_wxPrintDialog. Expected _wxPrintDialogData_p.");
         return NULL;
         }


@@ -2356,8 +2486,13 @@ static PyObject *_wrap_new_wxPrintDialog(PyObject *self, PyObject *args) {
         _result = (wxPrintDialog *)new_wxPrintDialog(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxPrintDialog *)new_wxPrintDialog(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrintDialog_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrintDialog_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -2366,14 +2501,15 @@ static PyObject *_wrap_wxPrintDialog_GetPrintDialogData(PyObject *self, PyObject
     PyObject * _resultobj;
     wxPrintDialogData * _result;
     wxPrintDialog * _arg0;
     PyObject * _resultobj;
     wxPrintDialogData * _result;
     wxPrintDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintDialog_GetPrintDialogData",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintDialog_GetPrintDialogData",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialog_GetPrintDialogData. Expected _wxPrintDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialog_GetPrintDialogData. Expected _wxPrintDialog_p.");
         return NULL;
         }


@@ -2384,8 +2520,13 @@ static PyObject *_wrap_wxPrintDialog_GetPrintDialogData(PyObject *self, PyObject
     _result = (wxPrintDialogData *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxPrintDialogData *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrintDialogData_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrintDialogData_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -2394,14 +2535,15 @@ static PyObject *_wrap_wxPrintDialog_GetPrintDC(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxDC * _result;
     wxPrintDialog * _arg0;
     PyObject * _resultobj;
     wxDC * _result;
     wxPrintDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintDialog_GetPrintDC",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintDialog_GetPrintDC",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialog_GetPrintDC. Expected _wxPrintDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialog_GetPrintDC. Expected _wxPrintDialog_p.");
         return NULL;
         }


@@ -2411,8 +2553,13 @@ static PyObject *_wrap_wxPrintDialog_GetPrintDC(PyObject *self, PyObject *args)
         _result = (wxDC *)wxPrintDialog_GetPrintDC(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxDC *)wxPrintDialog_GetPrintDC(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxDC_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxDC_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -2421,13 +2568,14 @@ static PyObject *_wrap_wxPrintDialog_ShowModal(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxPrintDialog * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxPrintDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintDialog_ShowModal",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintDialog_ShowModal",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialog_ShowModal. Expected _wxPrintDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialog_ShowModal. Expected _wxPrintDialog_p.");
         return NULL;
         }


@@ -2445,7 +2593,7 @@ static PyObject *_wrap_wxPrintDialog_ShowModal(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_wxPrintout(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyPrintout * _result;
 static PyObject *_wrap_new_wxPrintout(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyPrintout * _result;

-    char * _arg0 = "Printout";
+    char * _arg0 = (char *) "Printout";

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;


@@ -2456,8 +2604,13 @@ static PyObject *_wrap_new_wxPrintout(PyObject *self, PyObject *args) {
         _result = (wxPyPrintout *)new_wxPrintout(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxPyPrintout *)new_wxPrintout(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyPrintout_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyPrintout_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -2466,14 +2619,15 @@ static PyObject *_wrap_wxPrintout__setSelf(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyPrintout * _arg0;
     PyObject * _arg1;
     PyObject * _resultobj;
     wxPyPrintout * _arg0;
     PyObject * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxPrintout__setSelf",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxPrintout__setSelf",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyPrintout_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout__setSelf. Expected _wxPyPrintout_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout__setSelf. Expected _wxPyPrintout_p.");
         return NULL;
         }


@@ -2497,13 +2651,14 @@ static void  wxPyPrintout_Destroy(wxPyPrintout *self) {
 static PyObject *_wrap_wxPrintout_Destroy(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyPrintout * _arg0;
 static PyObject *_wrap_wxPrintout_Destroy(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyPrintout * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintout_Destroy",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintout_Destroy",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyPrintout_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_Destroy. Expected _wxPyPrintout_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_Destroy. Expected _wxPyPrintout_p.");
         return NULL;
         }


@@ -2523,14 +2678,15 @@ static PyObject *_wrap_wxPrintout_GetDC(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _result;
     wxPyPrintout * _arg0;
     PyObject * _resultobj;
     wxDC * _result;
     wxPyPrintout * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintout_GetDC",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintout_GetDC",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyPrintout_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_GetDC. Expected _wxPyPrintout_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_GetDC. Expected _wxPyPrintout_p.");
         return NULL;
         }


@@ -2540,8 +2696,13 @@ static PyObject *_wrap_wxPrintout_GetDC(PyObject *self, PyObject *args) {
         _result = (wxDC *)wxPrintout_GetDC(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxDC *)wxPrintout_GetDC(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxDC_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxDC_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -2553,7 +2714,7 @@ static PyObject *_wrap_wxPrintout_GetPageSizeMM(PyObject *self, PyObject *args)
     int  temp;
     int * _arg2;
     int  temp0;
     int  temp;
     int * _arg2;
     int  temp0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 {
 
     self = self;
 {


@@ -2562,10 +2723,11 @@ static PyObject *_wrap_wxPrintout_GetPageSizeMM(PyObject *self, PyObject *args)
 {
   _arg2 = &temp0;
 }
 {
   _arg2 = &temp0;
 }

-    if(!PyArg_ParseTuple(args,"s:wxPrintout_GetPageSizeMM",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintout_GetPageSizeMM",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyPrintout_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_GetPageSizeMM. Expected _wxPyPrintout_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_GetPageSizeMM. Expected _wxPyPrintout_p.");
         return NULL;
         }


@@ -2598,7 +2760,7 @@ static PyObject *_wrap_wxPrintout_GetPageSizePixels(PyObject *self, PyObject *ar
     int  temp;
     int * _arg2;
     int  temp0;
     int  temp;
     int * _arg2;
     int  temp0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 {
 
     self = self;
 {


@@ -2607,10 +2769,11 @@ static PyObject *_wrap_wxPrintout_GetPageSizePixels(PyObject *self, PyObject *ar
 {
   _arg2 = &temp0;
 }
 {
   _arg2 = &temp0;
 }

-    if(!PyArg_ParseTuple(args,"s:wxPrintout_GetPageSizePixels",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintout_GetPageSizePixels",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyPrintout_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_GetPageSizePixels. Expected _wxPyPrintout_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_GetPageSizePixels. Expected _wxPyPrintout_p.");
         return NULL;
         }


@@ -2643,7 +2806,7 @@ static PyObject *_wrap_wxPrintout_GetPPIPrinter(PyObject *self, PyObject *args)
     int  temp;
     int * _arg2;
     int  temp0;
     int  temp;
     int * _arg2;
     int  temp0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 {
 
     self = self;
 {


@@ -2652,10 +2815,11 @@ static PyObject *_wrap_wxPrintout_GetPPIPrinter(PyObject *self, PyObject *args)
 {
   _arg2 = &temp0;
 }
 {
   _arg2 = &temp0;
 }

-    if(!PyArg_ParseTuple(args,"s:wxPrintout_GetPPIPrinter",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintout_GetPPIPrinter",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyPrintout_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_GetPPIPrinter. Expected _wxPyPrintout_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_GetPPIPrinter. Expected _wxPyPrintout_p.");
         return NULL;
         }


@@ -2688,7 +2852,7 @@ static PyObject *_wrap_wxPrintout_GetPPIScreen(PyObject *self, PyObject *args) {
     int  temp;
     int * _arg2;
     int  temp0;
     int  temp;
     int * _arg2;
     int  temp0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 {
 
     self = self;
 {


@@ -2697,10 +2861,11 @@ static PyObject *_wrap_wxPrintout_GetPPIScreen(PyObject *self, PyObject *args) {
 {
   _arg2 = &temp0;
 }
 {
   _arg2 = &temp0;
 }

-    if(!PyArg_ParseTuple(args,"s:wxPrintout_GetPPIScreen",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintout_GetPPIScreen",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyPrintout_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_GetPPIScreen. Expected _wxPyPrintout_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_GetPPIScreen. Expected _wxPyPrintout_p.");
         return NULL;
         }


@@ -2730,13 +2895,14 @@ static PyObject *_wrap_wxPrintout_IsPreview(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxPyPrintout * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxPyPrintout * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintout_IsPreview",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintout_IsPreview",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyPrintout_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_IsPreview. Expected _wxPyPrintout_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_IsPreview. Expected _wxPyPrintout_p.");
         return NULL;
         }


@@ -2757,13 +2923,14 @@ static PyObject *_wrap_wxPrintout_base_OnBeginDocument(PyObject *self, PyObject
     wxPyPrintout * _arg0;
     int  _arg1;
     int  _arg2;
     wxPyPrintout * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxPrintout_base_OnBeginDocument",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxPrintout_base_OnBeginDocument",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyPrintout_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_base_OnBeginDocument. Expected _wxPyPrintout_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_base_OnBeginDocument. Expected _wxPyPrintout_p.");
         return NULL;
         }


@@ -2781,13 +2948,14 @@ static PyObject *_wrap_wxPrintout_base_OnBeginDocument(PyObject *self, PyObject
 static PyObject *_wrap_wxPrintout_base_OnEndDocument(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyPrintout * _arg0;
 static PyObject *_wrap_wxPrintout_base_OnEndDocument(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyPrintout * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintout_base_OnEndDocument",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintout_base_OnEndDocument",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyPrintout_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_base_OnEndDocument. Expected _wxPyPrintout_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_base_OnEndDocument. Expected _wxPyPrintout_p.");
         return NULL;
         }


@@ -2806,13 +2974,14 @@ static PyObject *_wrap_wxPrintout_base_OnEndDocument(PyObject *self, PyObject *a
 static PyObject *_wrap_wxPrintout_base_OnBeginPrinting(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyPrintout * _arg0;
 static PyObject *_wrap_wxPrintout_base_OnBeginPrinting(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyPrintout * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintout_base_OnBeginPrinting",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintout_base_OnBeginPrinting",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyPrintout_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_base_OnBeginPrinting. Expected _wxPyPrintout_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_base_OnBeginPrinting. Expected _wxPyPrintout_p.");
         return NULL;
         }


@@ -2831,13 +3000,14 @@ static PyObject *_wrap_wxPrintout_base_OnBeginPrinting(PyObject *self, PyObject
 static PyObject *_wrap_wxPrintout_base_OnEndPrinting(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyPrintout * _arg0;
 static PyObject *_wrap_wxPrintout_base_OnEndPrinting(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyPrintout * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintout_base_OnEndPrinting",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintout_base_OnEndPrinting",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyPrintout_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_base_OnEndPrinting. Expected _wxPyPrintout_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_base_OnEndPrinting. Expected _wxPyPrintout_p.");
         return NULL;
         }


@@ -2856,13 +3026,14 @@ static PyObject *_wrap_wxPrintout_base_OnEndPrinting(PyObject *self, PyObject *a
 static PyObject *_wrap_wxPrintout_base_OnPreparePrinting(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyPrintout * _arg0;
 static PyObject *_wrap_wxPrintout_base_OnPreparePrinting(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyPrintout * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintout_base_OnPreparePrinting",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintout_base_OnPreparePrinting",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyPrintout_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_base_OnPreparePrinting. Expected _wxPyPrintout_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_base_OnPreparePrinting. Expected _wxPyPrintout_p.");
         return NULL;
         }


@@ -2889,7 +3060,7 @@ static PyObject *_wrap_wxPrintout_base_GetPageInfo(PyObject *self, PyObject *arg
     int  temp1;
     int * _arg4;
     int  temp2;
     int  temp1;
     int * _arg4;
     int  temp2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 {
 
     self = self;
 {


@@ -2904,10 +3075,11 @@ static PyObject *_wrap_wxPrintout_base_GetPageInfo(PyObject *self, PyObject *arg
 {
   _arg4 = &temp2;
 }
 {
   _arg4 = &temp2;
 }

-    if(!PyArg_ParseTuple(args,"s:wxPrintout_base_GetPageInfo",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintout_base_GetPageInfo",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyPrintout_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_base_GetPageInfo. Expected _wxPyPrintout_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_base_GetPageInfo. Expected _wxPyPrintout_p.");
         return NULL;
         }


@@ -2948,13 +3120,14 @@ static PyObject *_wrap_wxPrintout_base_HasPage(PyObject *self, PyObject *args) {
     bool  _result;
     wxPyPrintout * _arg0;
     int  _arg1;
     bool  _result;
     wxPyPrintout * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPrintout_base_HasPage",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPrintout_base_HasPage",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyPrintout_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_base_HasPage. Expected _wxPyPrintout_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_base_HasPage. Expected _wxPyPrintout_p.");
         return NULL;
         }


@@ -2972,15 +3145,16 @@ static PyObject *_wrap_wxPrintout_base_HasPage(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_wxPrinter(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPrinter * _result;
 static PyObject *_wrap_new_wxPrinter(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPrinter * _result;

-    wxPrintDialogData * _arg0 = NULL;
-    char * _argc0 = 0;
+    wxPrintDialogData * _arg0 = (wxPrintDialogData *) NULL;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"|s:new_wxPrinter",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"|O:new_wxPrinter",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintDialogData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPrinter. Expected _wxPrintDialogData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPrinter. Expected _wxPrintDialogData_p.");
         return NULL;
         }


@@ -2990,8 +3164,13 @@ static PyObject *_wrap_new_wxPrinter(PyObject *self, PyObject *args) {
         _result = (wxPrinter *)new_wxPrinter(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxPrinter *)new_wxPrinter(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrinter_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrinter_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -2999,13 +3178,14 @@ static PyObject *_wrap_new_wxPrinter(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxPrinter(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPrinter * _arg0;
 static PyObject *_wrap_delete_wxPrinter(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPrinter * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:delete_wxPrinter",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxPrinter",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrinter_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrinter_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPrinter. Expected _wxPrinter_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPrinter. Expected _wxPrinter_p.");
         return NULL;
         }


@@ -3026,27 +3206,30 @@ static PyObject *_wrap_wxPrinter_CreateAbortWindow(PyObject *self, PyObject *arg
     wxPrinter * _arg0;
     wxWindow * _arg1;
     wxPyPrintout * _arg2;
     wxPrinter * _arg0;
     wxWindow * _arg1;
     wxPyPrintout * _arg2;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
-    char * _argc2 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sss:wxPrinter_CreateAbortWindow",&_argc0,&_argc1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"OOO:wxPrinter_CreateAbortWindow",&_argo0,&_argo1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrinter_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrinter_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrinter_CreateAbortWindow. Expected _wxPrinter_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrinter_CreateAbortWindow. Expected _wxPrinter_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrinter_CreateAbortWindow. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrinter_CreateAbortWindow. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPyPrintout_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPyPrintout_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPrinter_CreateAbortWindow. Expected _wxPyPrintout_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPrinter_CreateAbortWindow. Expected _wxPyPrintout_p.");
         return NULL;
         }


@@ -3066,14 +3249,15 @@ static PyObject *_wrap_wxPrinter_GetPrintDialogData(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     wxPrintDialogData * _result;
     wxPrinter * _arg0;
     PyObject * _resultobj;
     wxPrintDialogData * _result;
     wxPrinter * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrinter_GetPrintDialogData",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrinter_GetPrintDialogData",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrinter_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrinter_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrinter_GetPrintDialogData. Expected _wxPrinter_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrinter_GetPrintDialogData. Expected _wxPrinter_p.");
         return NULL;
         }


@@ -3084,8 +3268,13 @@ static PyObject *_wrap_wxPrinter_GetPrintDialogData(PyObject *self, PyObject *ar
     _result = (wxPrintDialogData *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxPrintDialogData *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrintDialogData_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrintDialogData_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3096,28 +3285,31 @@ static PyObject *_wrap_wxPrinter_Print(PyObject *self, PyObject *args) {
     wxPrinter * _arg0;
     wxWindow * _arg1;
     wxPyPrintout * _arg2;
     wxPrinter * _arg0;
     wxWindow * _arg1;
     wxPyPrintout * _arg2;

-    int  _arg3 = (1);
-    char * _argc0 = 0;
-    char * _argc1 = 0;
-    char * _argc2 = 0;
+    int  _arg3 = (int ) TRUE;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sss|i:wxPrinter_Print",&_argc0,&_argc1,&_argc2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"OOO|i:wxPrinter_Print",&_argo0,&_argo1,&_argo2,&_arg3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrinter_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrinter_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrinter_Print. Expected _wxPrinter_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrinter_Print. Expected _wxPrinter_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrinter_Print. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrinter_Print. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPyPrintout_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPyPrintout_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPrinter_Print. Expected _wxPyPrintout_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPrinter_Print. Expected _wxPyPrintout_p.");
         return NULL;
         }


@@ -3137,21 +3329,23 @@ static PyObject *_wrap_wxPrinter_PrintDialog(PyObject *self, PyObject *args) {
     wxDC * _result;
     wxPrinter * _arg0;
     wxWindow * _arg1;
     wxDC * _result;
     wxPrinter * _arg0;
     wxWindow * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxPrinter_PrintDialog",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxPrinter_PrintDialog",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrinter_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrinter_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrinter_PrintDialog. Expected _wxPrinter_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrinter_PrintDialog. Expected _wxPrinter_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrinter_PrintDialog. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrinter_PrintDialog. Expected _wxWindow_p.");
         return NULL;
         }


@@ -3161,8 +3355,13 @@ static PyObject *_wrap_wxPrinter_PrintDialog(PyObject *self, PyObject *args) {
         _result = (wxDC *)wxPrinter_PrintDialog(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxDC *)wxPrinter_PrintDialog(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxDC_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxDC_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3173,27 +3372,30 @@ static PyObject *_wrap_wxPrinter_ReportError(PyObject *self, PyObject *args) {
     wxWindow * _arg1;
     wxPyPrintout * _arg2;
     char * _arg3;
     wxWindow * _arg1;
     wxPyPrintout * _arg2;
     char * _arg3;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
-    char * _argc2 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ssss:wxPrinter_ReportError",&_argc0,&_argc1,&_argc2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"OOOs:wxPrinter_ReportError",&_argo0,&_argo1,&_argo2,&_arg3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrinter_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrinter_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrinter_ReportError. Expected _wxPrinter_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrinter_ReportError. Expected _wxPrinter_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrinter_ReportError. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrinter_ReportError. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPyPrintout_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPyPrintout_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPrinter_ReportError. Expected _wxPyPrintout_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPrinter_ReportError. Expected _wxPyPrintout_p.");
         return NULL;
         }


@@ -3214,20 +3416,22 @@ static PyObject *_wrap_wxPrinter_Setup(PyObject *self, PyObject *args) {
     bool  _result;
     wxPrinter * _arg0;
     wxWindow * _arg1;
     bool  _result;
     wxPrinter * _arg0;
     wxWindow * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxPrinter_Setup",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxPrinter_Setup",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrinter_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrinter_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrinter_Setup. Expected _wxPrinter_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrinter_Setup. Expected _wxPrinter_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrinter_Setup. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrinter_Setup. Expected _wxWindow_p.");
         return NULL;
         }


@@ -3247,29 +3451,32 @@ static PyObject *_wrap_new_wxPrintPreview(PyObject *self, PyObject *args) {
     wxPrintPreview * _result;
     wxPyPrintout * _arg0;
     wxPyPrintout * _arg1;
     wxPrintPreview * _result;
     wxPyPrintout * _arg0;
     wxPyPrintout * _arg1;

-    wxPrintData * _arg2 = NULL;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
-    char * _argc2 = 0;
+    wxPrintData * _arg2 = (wxPrintData *) NULL;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    PyObject * _argo2 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss|s:new_wxPrintPreview",&_argc0,&_argc1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"OO|O:new_wxPrintPreview",&_argo0,&_argo1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyPrintout_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPrintPreview. Expected _wxPyPrintout_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPrintPreview. Expected _wxPyPrintout_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPyPrintout_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyPrintout_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of new_wxPrintPreview. Expected _wxPyPrintout_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of new_wxPrintPreview. Expected _wxPyPrintout_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPrintData_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPrintData_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxPrintPreview. Expected _wxPrintData_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxPrintPreview. Expected _wxPrintData_p.");
         return NULL;
         }


@@ -3279,8 +3486,13 @@ static PyObject *_wrap_new_wxPrintPreview(PyObject *self, PyObject *args) {
         _result = (wxPrintPreview *)new_wxPrintPreview(_arg0,_arg1,_arg2);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxPrintPreview *)new_wxPrintPreview(_arg0,_arg1,_arg2);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrintPreview_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrintPreview_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3289,14 +3501,15 @@ static PyObject *_wrap_wxPrintPreview_GetCanvas(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxWindow * _result;
     wxPrintPreview * _arg0;
     PyObject * _resultobj;
     wxWindow * _result;
     wxPrintPreview * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintPreview_GetCanvas",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintPreview_GetCanvas",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintPreview_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetCanvas. Expected _wxPrintPreview_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetCanvas. Expected _wxPrintPreview_p.");
         return NULL;
         }


@@ -3306,8 +3519,13 @@ static PyObject *_wrap_wxPrintPreview_GetCanvas(PyObject *self, PyObject *args)
         _result = (wxWindow *)wxPrintPreview_GetCanvas(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxWindow *)wxPrintPreview_GetCanvas(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3316,13 +3534,14 @@ static PyObject *_wrap_wxPrintPreview_GetCurrentPage(PyObject *self, PyObject *a
     PyObject * _resultobj;
     int  _result;
     wxPrintPreview * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxPrintPreview * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintPreview_GetCurrentPage",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintPreview_GetCurrentPage",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintPreview_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetCurrentPage. Expected _wxPrintPreview_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetCurrentPage. Expected _wxPrintPreview_p.");
         return NULL;
         }


@@ -3341,14 +3560,15 @@ static PyObject *_wrap_wxPrintPreview_GetFrame(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFrame * _result;
     wxPrintPreview * _arg0;
     PyObject * _resultobj;
     wxFrame * _result;
     wxPrintPreview * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintPreview_GetFrame",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintPreview_GetFrame",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintPreview_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetFrame. Expected _wxPrintPreview_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetFrame. Expected _wxPrintPreview_p.");
         return NULL;
         }


@@ -3358,8 +3578,13 @@ static PyObject *_wrap_wxPrintPreview_GetFrame(PyObject *self, PyObject *args) {
         _result = (wxFrame *)wxPrintPreview_GetFrame(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxFrame *)wxPrintPreview_GetFrame(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxFrame_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxFrame_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3368,13 +3593,14 @@ static PyObject *_wrap_wxPrintPreview_GetMaxPage(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     int  _result;
     wxPrintPreview * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxPrintPreview * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintPreview_GetMaxPage",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintPreview_GetMaxPage",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintPreview_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetMaxPage. Expected _wxPrintPreview_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetMaxPage. Expected _wxPrintPreview_p.");
         return NULL;
         }


@@ -3393,13 +3619,14 @@ static PyObject *_wrap_wxPrintPreview_GetMinPage(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     int  _result;
     wxPrintPreview * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxPrintPreview * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintPreview_GetMinPage",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintPreview_GetMinPage",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintPreview_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetMinPage. Expected _wxPrintPreview_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetMinPage. Expected _wxPrintPreview_p.");
         return NULL;
         }


@@ -3418,14 +3645,15 @@ static PyObject *_wrap_wxPrintPreview_GetPrintDialogData(PyObject *self, PyObjec
     PyObject * _resultobj;
     wxPrintDialogData * _result;
     wxPrintPreview * _arg0;
     PyObject * _resultobj;
     wxPrintDialogData * _result;
     wxPrintPreview * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintPreview_GetPrintDialogData",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintPreview_GetPrintDialogData",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintPreview_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetPrintDialogData. Expected _wxPrintPreview_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetPrintDialogData. Expected _wxPrintPreview_p.");
         return NULL;
         }


@@ -3436,8 +3664,13 @@ static PyObject *_wrap_wxPrintPreview_GetPrintDialogData(PyObject *self, PyObjec
     _result = (wxPrintDialogData *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxPrintDialogData *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrintDialogData_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrintDialogData_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3446,14 +3679,15 @@ static PyObject *_wrap_wxPrintPreview_GetPrintout(PyObject *self, PyObject *args
     PyObject * _resultobj;
     wxPyPrintout * _result;
     wxPrintPreview * _arg0;
     PyObject * _resultobj;
     wxPyPrintout * _result;
     wxPrintPreview * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintPreview_GetPrintout",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintPreview_GetPrintout",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintPreview_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetPrintout. Expected _wxPrintPreview_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetPrintout. Expected _wxPrintPreview_p.");
         return NULL;
         }


@@ -3463,8 +3697,13 @@ static PyObject *_wrap_wxPrintPreview_GetPrintout(PyObject *self, PyObject *args
         _result = (wxPyPrintout *)wxPrintPreview_GetPrintout(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxPyPrintout *)wxPrintPreview_GetPrintout(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyPrintout_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyPrintout_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3473,14 +3712,15 @@ static PyObject *_wrap_wxPrintPreview_GetPrintoutForPrinting(PyObject *self, PyO
     PyObject * _resultobj;
     wxPyPrintout * _result;
     wxPrintPreview * _arg0;
     PyObject * _resultobj;
     wxPyPrintout * _result;
     wxPrintPreview * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintPreview_GetPrintoutForPrinting",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintPreview_GetPrintoutForPrinting",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintPreview_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetPrintoutForPrinting. Expected _wxPrintPreview_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetPrintoutForPrinting. Expected _wxPrintPreview_p.");
         return NULL;
         }


@@ -3490,8 +3730,13 @@ static PyObject *_wrap_wxPrintPreview_GetPrintoutForPrinting(PyObject *self, PyO
         _result = (wxPyPrintout *)wxPrintPreview_GetPrintoutForPrinting(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxPyPrintout *)wxPrintPreview_GetPrintoutForPrinting(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyPrintout_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyPrintout_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3500,13 +3745,14 @@ static PyObject *_wrap_wxPrintPreview_GetZoom(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxPrintPreview * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxPrintPreview * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintPreview_GetZoom",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintPreview_GetZoom",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintPreview_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetZoom. Expected _wxPrintPreview_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetZoom. Expected _wxPrintPreview_p.");
         return NULL;
         }


@@ -3525,13 +3771,14 @@ static PyObject *_wrap_wxPrintPreview_Ok(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxPrintPreview * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxPrintPreview * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPrintPreview_Ok",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPrintPreview_Ok",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintPreview_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_Ok. Expected _wxPrintPreview_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_Ok. Expected _wxPrintPreview_p.");
         return NULL;
         }


@@ -3551,14 +3798,15 @@ static PyObject *_wrap_wxPrintPreview_Print(PyObject *self, PyObject *args) {
     bool  _result;
     wxPrintPreview * _arg0;
     bool  _arg1;
     bool  _result;
     wxPrintPreview * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPrintPreview_Print",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPrintPreview_Print",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintPreview_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_Print. Expected _wxPrintPreview_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_Print. Expected _wxPrintPreview_p.");
         return NULL;
         }


@@ -3578,20 +3826,22 @@ static PyObject *_wrap_wxPrintPreview_SetCanvas(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxPrintPreview * _arg0;
     wxWindow * _arg1;
     PyObject * _resultobj;
     wxPrintPreview * _arg0;
     wxWindow * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxPrintPreview_SetCanvas",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxPrintPreview_SetCanvas",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintPreview_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_SetCanvas. Expected _wxPrintPreview_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_SetCanvas. Expected _wxPrintPreview_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrintPreview_SetCanvas. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrintPreview_SetCanvas. Expected _wxWindow_p.");
         return NULL;
         }


@@ -3611,13 +3861,14 @@ static PyObject *_wrap_wxPrintPreview_SetCurrentPage(PyObject *self, PyObject *a
     PyObject * _resultobj;
     wxPrintPreview * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxPrintPreview * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPrintPreview_SetCurrentPage",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPrintPreview_SetCurrentPage",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintPreview_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_SetCurrentPage. Expected _wxPrintPreview_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_SetCurrentPage. Expected _wxPrintPreview_p.");
         return NULL;
         }


@@ -3637,20 +3888,22 @@ static PyObject *_wrap_wxPrintPreview_SetFrame(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPrintPreview * _arg0;
     wxFrame * _arg1;
     PyObject * _resultobj;
     wxPrintPreview * _arg0;
     wxFrame * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxPrintPreview_SetFrame",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxPrintPreview_SetFrame",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintPreview_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_SetFrame. Expected _wxPrintPreview_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_SetFrame. Expected _wxPrintPreview_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxFrame_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrintPreview_SetFrame. Expected _wxFrame_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrintPreview_SetFrame. Expected _wxFrame_p.");
         return NULL;
         }


@@ -3670,20 +3923,22 @@ static PyObject *_wrap_wxPrintPreview_SetPrintout(PyObject *self, PyObject *args
     PyObject * _resultobj;
     wxPrintPreview * _arg0;
     wxPyPrintout * _arg1;
     PyObject * _resultobj;
     wxPrintPreview * _arg0;
     wxPyPrintout * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxPrintPreview_SetPrintout",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxPrintPreview_SetPrintout",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintPreview_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_SetPrintout. Expected _wxPrintPreview_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_SetPrintout. Expected _wxPrintPreview_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPyPrintout_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyPrintout_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrintPreview_SetPrintout. Expected _wxPyPrintout_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrintPreview_SetPrintout. Expected _wxPyPrintout_p.");
         return NULL;
         }


@@ -3703,13 +3958,14 @@ static PyObject *_wrap_wxPrintPreview_SetZoom(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPrintPreview * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxPrintPreview * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPrintPreview_SetZoom",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPrintPreview_SetZoom",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintPreview_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_SetZoom. Expected _wxPrintPreview_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_SetZoom. Expected _wxPrintPreview_p.");
         return NULL;
         }


@@ -3755,28 +4011,30 @@ static PyObject *_wrap_new_wxPreviewFrame(PyObject *self, PyObject *args) {
     wxPrintPreview * _arg0;
     wxFrame * _arg1;
     wxString * _arg2;
     wxPrintPreview * _arg0;
     wxFrame * _arg1;
     wxString * _arg2;

-    wxPoint * _arg3 = &wxPyDefaultPosition;
-    wxSize * _arg4 = &wxPyDefaultSize;
-    long  _arg5 = (wxDEFAULT_FRAME_STYLE);
-    char * _arg6 = "frame";
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    long  _arg5 = (long ) wxDEFAULT_FRAME_STYLE;
+    char * _arg6 = (char *) "frame";
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     PyObject * _obj2 = 0;
     PyObject * _obj2 = 0;

-    char * _argc3 = 0;
-    char * _argc4 = 0;
+    PyObject * _argo3 = 0;
+    PyObject * _argo4 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ssO|ssls:new_wxPreviewFrame",&_argc0,&_argc1,&_obj2,&_argc3,&_argc4,&_arg5,&_arg6)) 
+    if(!PyArg_ParseTuple(args,"OOO|OOls:new_wxPreviewFrame",&_argo0,&_argo1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPrintPreview_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPreviewFrame. Expected _wxPrintPreview_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPreviewFrame. Expected _wxPrintPreview_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxFrame_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of new_wxPreviewFrame. Expected _wxFrame_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of new_wxPreviewFrame. Expected _wxFrame_p.");
         return NULL;
         }


@@ -3788,14 +4046,16 @@ static PyObject *_wrap_new_wxPreviewFrame(PyObject *self, PyObject *args) {
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxPoint_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxPreviewFrame. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxPreviewFrame. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_wxSize_p")) {
+    if (_argo4) {
+        if (_argo4 == Py_None) { _arg4 = NULL; }
+        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxPreviewFrame. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxPreviewFrame. Expected _wxSize_p.");
         return NULL;
         }


@@ -3805,8 +4065,13 @@ static PyObject *_wrap_new_wxPreviewFrame(PyObject *self, PyObject *args) {
         _result = (wxPreviewFrame *)new_wxPreviewFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxPreviewFrame *)new_wxPreviewFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPreviewFrame_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPreviewFrame_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     if (_obj2)
         delete _arg2;
 {
     if (_obj2)
         delete _arg2;


@@ -3818,13 +4083,14 @@ static PyObject *_wrap_new_wxPreviewFrame(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxPreviewFrame_Initialize(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPreviewFrame * _arg0;
 static PyObject *_wrap_wxPreviewFrame_Initialize(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPreviewFrame * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPreviewFrame_Initialize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPreviewFrame_Initialize",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPreviewFrame_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPreviewFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPreviewFrame_Initialize. Expected _wxPreviewFrame_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPreviewFrame_Initialize. Expected _wxPreviewFrame_p.");
         return NULL;
         }


@@ -3840,461 +4106,471 @@ static PyObject *_wrap_wxPreviewFrame_Initialize(PyObject *self, PyObject *args)
 }
 
 static PyMethodDef printfwcMethods[] = {
 }
 
 static PyMethodDef printfwcMethods[] = {

-        { "wxPreviewFrame_Initialize", _wrap_wxPreviewFrame_Initialize, 1 },
-        { "new_wxPreviewFrame", _wrap_new_wxPreviewFrame, 1 },
-        { "wxPrintPreview_SetZoom", _wrap_wxPrintPreview_SetZoom, 1 },
-        { "wxPrintPreview_SetPrintout", _wrap_wxPrintPreview_SetPrintout, 1 },
-        { "wxPrintPreview_SetFrame", _wrap_wxPrintPreview_SetFrame, 1 },
-        { "wxPrintPreview_SetCurrentPage", _wrap_wxPrintPreview_SetCurrentPage, 1 },
-        { "wxPrintPreview_SetCanvas", _wrap_wxPrintPreview_SetCanvas, 1 },
-        { "wxPrintPreview_Print", _wrap_wxPrintPreview_Print, 1 },
-        { "wxPrintPreview_Ok", _wrap_wxPrintPreview_Ok, 1 },
-        { "wxPrintPreview_GetZoom", _wrap_wxPrintPreview_GetZoom, 1 },
-        { "wxPrintPreview_GetPrintoutForPrinting", _wrap_wxPrintPreview_GetPrintoutForPrinting, 1 },
-        { "wxPrintPreview_GetPrintout", _wrap_wxPrintPreview_GetPrintout, 1 },
-        { "wxPrintPreview_GetPrintDialogData", _wrap_wxPrintPreview_GetPrintDialogData, 1 },
-        { "wxPrintPreview_GetMinPage", _wrap_wxPrintPreview_GetMinPage, 1 },
-        { "wxPrintPreview_GetMaxPage", _wrap_wxPrintPreview_GetMaxPage, 1 },
-        { "wxPrintPreview_GetFrame", _wrap_wxPrintPreview_GetFrame, 1 },
-        { "wxPrintPreview_GetCurrentPage", _wrap_wxPrintPreview_GetCurrentPage, 1 },
-        { "wxPrintPreview_GetCanvas", _wrap_wxPrintPreview_GetCanvas, 1 },
-        { "new_wxPrintPreview", _wrap_new_wxPrintPreview, 1 },
-        { "wxPrinter_Setup", _wrap_wxPrinter_Setup, 1 },
-        { "wxPrinter_ReportError", _wrap_wxPrinter_ReportError, 1 },
-        { "wxPrinter_PrintDialog", _wrap_wxPrinter_PrintDialog, 1 },
-        { "wxPrinter_Print", _wrap_wxPrinter_Print, 1 },
-        { "wxPrinter_GetPrintDialogData", _wrap_wxPrinter_GetPrintDialogData, 1 },
-        { "wxPrinter_CreateAbortWindow", _wrap_wxPrinter_CreateAbortWindow, 1 },
-        { "delete_wxPrinter", _wrap_delete_wxPrinter, 1 },
-        { "new_wxPrinter", _wrap_new_wxPrinter, 1 },
-        { "wxPrintout_base_HasPage", _wrap_wxPrintout_base_HasPage, 1 },
-        { "wxPrintout_base_GetPageInfo", _wrap_wxPrintout_base_GetPageInfo, 1 },
-        { "wxPrintout_base_OnPreparePrinting", _wrap_wxPrintout_base_OnPreparePrinting, 1 },
-        { "wxPrintout_base_OnEndPrinting", _wrap_wxPrintout_base_OnEndPrinting, 1 },
-        { "wxPrintout_base_OnBeginPrinting", _wrap_wxPrintout_base_OnBeginPrinting, 1 },
-        { "wxPrintout_base_OnEndDocument", _wrap_wxPrintout_base_OnEndDocument, 1 },
-        { "wxPrintout_base_OnBeginDocument", _wrap_wxPrintout_base_OnBeginDocument, 1 },
-        { "wxPrintout_IsPreview", _wrap_wxPrintout_IsPreview, 1 },
-        { "wxPrintout_GetPPIScreen", _wrap_wxPrintout_GetPPIScreen, 1 },
-        { "wxPrintout_GetPPIPrinter", _wrap_wxPrintout_GetPPIPrinter, 1 },
-        { "wxPrintout_GetPageSizePixels", _wrap_wxPrintout_GetPageSizePixels, 1 },
-        { "wxPrintout_GetPageSizeMM", _wrap_wxPrintout_GetPageSizeMM, 1 },
-        { "wxPrintout_GetDC", _wrap_wxPrintout_GetDC, 1 },
-        { "wxPrintout_Destroy", _wrap_wxPrintout_Destroy, 1 },
-        { "wxPrintout__setSelf", _wrap_wxPrintout__setSelf, 1 },
-        { "new_wxPrintout", _wrap_new_wxPrintout, 1 },
-        { "wxPrintDialog_ShowModal", _wrap_wxPrintDialog_ShowModal, 1 },
-        { "wxPrintDialog_GetPrintDC", _wrap_wxPrintDialog_GetPrintDC, 1 },
-        { "wxPrintDialog_GetPrintDialogData", _wrap_wxPrintDialog_GetPrintDialogData, 1 },
-        { "new_wxPrintDialog", _wrap_new_wxPrintDialog, 1 },
-        { "wxPrintDialogData_SetToPage", _wrap_wxPrintDialogData_SetToPage, 1 },
-        { "wxPrintDialogData_SetSetupDialog", _wrap_wxPrintDialogData_SetSetupDialog, 1 },
-        { "wxPrintDialogData_SetPrintToFile", _wrap_wxPrintDialogData_SetPrintToFile, 1 },
-        { "wxPrintDialogData_SetPrintData", _wrap_wxPrintDialogData_SetPrintData, 1 },
-        { "wxPrintDialogData_SetNoCopies", _wrap_wxPrintDialogData_SetNoCopies, 1 },
-        { "wxPrintDialogData_SetMinPage", _wrap_wxPrintDialogData_SetMinPage, 1 },
-        { "wxPrintDialogData_SetMaxPage", _wrap_wxPrintDialogData_SetMaxPage, 1 },
-        { "wxPrintDialogData_SetFromPage", _wrap_wxPrintDialogData_SetFromPage, 1 },
-        { "wxPrintDialogData_SetCollate", _wrap_wxPrintDialogData_SetCollate, 1 },
-        { "wxPrintDialogData_GetToPage", _wrap_wxPrintDialogData_GetToPage, 1 },
-        { "wxPrintDialogData_GetPrintToFile", _wrap_wxPrintDialogData_GetPrintToFile, 1 },
-        { "wxPrintDialogData_GetPrintData", _wrap_wxPrintDialogData_GetPrintData, 1 },
-        { "wxPrintDialogData_GetNoCopies", _wrap_wxPrintDialogData_GetNoCopies, 1 },
-        { "wxPrintDialogData_GetMinPage", _wrap_wxPrintDialogData_GetMinPage, 1 },
-        { "wxPrintDialogData_GetMaxPage", _wrap_wxPrintDialogData_GetMaxPage, 1 },
-        { "wxPrintDialogData_GetFromPage", _wrap_wxPrintDialogData_GetFromPage, 1 },
-        { "wxPrintDialogData_GetCollate", _wrap_wxPrintDialogData_GetCollate, 1 },
-        { "wxPrintDialogData_GetAllPages", _wrap_wxPrintDialogData_GetAllPages, 1 },
-        { "wxPrintDialogData_EnableSelection", _wrap_wxPrintDialogData_EnableSelection, 1 },
-        { "wxPrintDialogData_EnablePrintToFile", _wrap_wxPrintDialogData_EnablePrintToFile, 1 },
-        { "wxPrintDialogData_EnablePageNumbers", _wrap_wxPrintDialogData_EnablePageNumbers, 1 },
-        { "wxPrintDialogData_EnableHelp", _wrap_wxPrintDialogData_EnableHelp, 1 },
-        { "delete_wxPrintDialogData", _wrap_delete_wxPrintDialogData, 1 },
-        { "new_wxPrintDialogData", _wrap_new_wxPrintDialogData, 1 },
-        { "wxPageSetupDialog_ShowModal", _wrap_wxPageSetupDialog_ShowModal, 1 },
-        { "wxPageSetupDialog_GetPageSetupData", _wrap_wxPageSetupDialog_GetPageSetupData, 1 },
-        { "new_wxPageSetupDialog", _wrap_new_wxPageSetupDialog, 1 },
-        { "wxPageSetupDialogData_SetPrintData", _wrap_wxPageSetupDialogData_SetPrintData, 1 },
-        { "wxPageSetupDialogData_SetPaperSize", _wrap_wxPageSetupDialogData_SetPaperSize, 1 },
-        { "wxPageSetupDialogData_SetPaperId", _wrap_wxPageSetupDialogData_SetPaperId, 1 },
-        { "wxPageSetupDialogData_SetMinMarginBottomRight", _wrap_wxPageSetupDialogData_SetMinMarginBottomRight, 1 },
-        { "wxPageSetupDialogData_SetMinMarginTopLeft", _wrap_wxPageSetupDialogData_SetMinMarginTopLeft, 1 },
-        { "wxPageSetupDialogData_SetMarginBottomRight", _wrap_wxPageSetupDialogData_SetMarginBottomRight, 1 },
-        { "wxPageSetupDialogData_SetMarginTopLeft", _wrap_wxPageSetupDialogData_SetMarginTopLeft, 1 },
-        { "wxPageSetupDialogData_SetDefaultMinMargins", _wrap_wxPageSetupDialogData_SetDefaultMinMargins, 1 },
-        { "wxPageSetupDialogData_SetDefaultInfo", _wrap_wxPageSetupDialogData_SetDefaultInfo, 1 },
-        { "wxPageSetupDialogData_GetPrintData", _wrap_wxPageSetupDialogData_GetPrintData, 1 },
-        { "wxPageSetupDialogData_GetPaperSize", _wrap_wxPageSetupDialogData_GetPaperSize, 1 },
-        { "wxPageSetupDialogData_GetPaperId", _wrap_wxPageSetupDialogData_GetPaperId, 1 },
-        { "wxPageSetupDialogData_GetMinMarginBottomRight", _wrap_wxPageSetupDialogData_GetMinMarginBottomRight, 1 },
-        { "wxPageSetupDialogData_GetMinMarginTopLeft", _wrap_wxPageSetupDialogData_GetMinMarginTopLeft, 1 },
-        { "wxPageSetupDialogData_GetMarginBottomRight", _wrap_wxPageSetupDialogData_GetMarginBottomRight, 1 },
-        { "wxPageSetupDialogData_GetMarginTopLeft", _wrap_wxPageSetupDialogData_GetMarginTopLeft, 1 },
-        { "wxPageSetupDialogData_GetDefaultInfo", _wrap_wxPageSetupDialogData_GetDefaultInfo, 1 },
-        { "wxPageSetupDialogData_GetEnableHelp", _wrap_wxPageSetupDialogData_GetEnableHelp, 1 },
-        { "wxPageSetupDialogData_GetEnablePrinter", _wrap_wxPageSetupDialogData_GetEnablePrinter, 1 },
-        { "wxPageSetupDialogData_GetEnablePaper", _wrap_wxPageSetupDialogData_GetEnablePaper, 1 },
-        { "wxPageSetupDialogData_GetEnableOrientation", _wrap_wxPageSetupDialogData_GetEnableOrientation, 1 },
-        { "wxPageSetupDialogData_GetEnableMargins", _wrap_wxPageSetupDialogData_GetEnableMargins, 1 },
-        { "wxPageSetupDialogData_GetDefaultMinMargins", _wrap_wxPageSetupDialogData_GetDefaultMinMargins, 1 },
-        { "wxPageSetupDialogData_EnablePrinter", _wrap_wxPageSetupDialogData_EnablePrinter, 1 },
-        { "wxPageSetupDialogData_EnablePaper", _wrap_wxPageSetupDialogData_EnablePaper, 1 },
-        { "wxPageSetupDialogData_EnableOrientation", _wrap_wxPageSetupDialogData_EnableOrientation, 1 },
-        { "wxPageSetupDialogData_EnableMargins", _wrap_wxPageSetupDialogData_EnableMargins, 1 },
-        { "wxPageSetupDialogData_EnableHelp", _wrap_wxPageSetupDialogData_EnableHelp, 1 },
-        { "delete_wxPageSetupDialogData", _wrap_delete_wxPageSetupDialogData, 1 },
-        { "new_wxPageSetupDialogData", _wrap_new_wxPageSetupDialogData, 1 },
-        { "wxPrintData_SetQuality", _wrap_wxPrintData_SetQuality, 1 },
-        { "wxPrintData_SetPaperSize", _wrap_wxPrintData_SetPaperSize, 1 },
-        { "wxPrintData_SetPaperId", _wrap_wxPrintData_SetPaperId, 1 },
-        { "wxPrintData_SetDuplex", _wrap_wxPrintData_SetDuplex, 1 },
-        { "wxPrintData_SetColour", _wrap_wxPrintData_SetColour, 1 },
-        { "wxPrintData_SetPrinterName", _wrap_wxPrintData_SetPrinterName, 1 },
-        { "wxPrintData_SetOrientation", _wrap_wxPrintData_SetOrientation, 1 },
-        { "wxPrintData_SetCollate", _wrap_wxPrintData_SetCollate, 1 },
-        { "wxPrintData_SetNoCopies", _wrap_wxPrintData_SetNoCopies, 1 },
-        { "wxPrintData_GetQuality", _wrap_wxPrintData_GetQuality, 1 },
-        { "wxPrintData_GetPaperSize", _wrap_wxPrintData_GetPaperSize, 1 },
-        { "wxPrintData_GetPaperId", _wrap_wxPrintData_GetPaperId, 1 },
-        { "wxPrintData_GetDuplex", _wrap_wxPrintData_GetDuplex, 1 },
-        { "wxPrintData_GetColour", _wrap_wxPrintData_GetColour, 1 },
-        { "wxPrintData_GetPrinterName", _wrap_wxPrintData_GetPrinterName, 1 },
-        { "wxPrintData_GetOrientation", _wrap_wxPrintData_GetOrientation, 1 },
-        { "wxPrintData_GetCollate", _wrap_wxPrintData_GetCollate, 1 },
-        { "wxPrintData_GetNoCopies", _wrap_wxPrintData_GetNoCopies, 1 },
-        { "delete_wxPrintData", _wrap_delete_wxPrintData, 1 },
-        { "new_wxPrintData", _wrap_new_wxPrintData, 1 },
+        { "wxPreviewFrame_Initialize", _wrap_wxPreviewFrame_Initialize, METH_VARARGS },
+        { "new_wxPreviewFrame", _wrap_new_wxPreviewFrame, METH_VARARGS },
+        { "wxPrintPreview_SetZoom", _wrap_wxPrintPreview_SetZoom, METH_VARARGS },
+        { "wxPrintPreview_SetPrintout", _wrap_wxPrintPreview_SetPrintout, METH_VARARGS },
+        { "wxPrintPreview_SetFrame", _wrap_wxPrintPreview_SetFrame, METH_VARARGS },
+        { "wxPrintPreview_SetCurrentPage", _wrap_wxPrintPreview_SetCurrentPage, METH_VARARGS },
+        { "wxPrintPreview_SetCanvas", _wrap_wxPrintPreview_SetCanvas, METH_VARARGS },
+        { "wxPrintPreview_Print", _wrap_wxPrintPreview_Print, METH_VARARGS },
+        { "wxPrintPreview_Ok", _wrap_wxPrintPreview_Ok, METH_VARARGS },
+        { "wxPrintPreview_GetZoom", _wrap_wxPrintPreview_GetZoom, METH_VARARGS },
+        { "wxPrintPreview_GetPrintoutForPrinting", _wrap_wxPrintPreview_GetPrintoutForPrinting, METH_VARARGS },
+        { "wxPrintPreview_GetPrintout", _wrap_wxPrintPreview_GetPrintout, METH_VARARGS },
+        { "wxPrintPreview_GetPrintDialogData", _wrap_wxPrintPreview_GetPrintDialogData, METH_VARARGS },
+        { "wxPrintPreview_GetMinPage", _wrap_wxPrintPreview_GetMinPage, METH_VARARGS },
+        { "wxPrintPreview_GetMaxPage", _wrap_wxPrintPreview_GetMaxPage, METH_VARARGS },
+        { "wxPrintPreview_GetFrame", _wrap_wxPrintPreview_GetFrame, METH_VARARGS },
+        { "wxPrintPreview_GetCurrentPage", _wrap_wxPrintPreview_GetCurrentPage, METH_VARARGS },
+        { "wxPrintPreview_GetCanvas", _wrap_wxPrintPreview_GetCanvas, METH_VARARGS },
+        { "new_wxPrintPreview", _wrap_new_wxPrintPreview, METH_VARARGS },
+        { "wxPrinter_Setup", _wrap_wxPrinter_Setup, METH_VARARGS },
+        { "wxPrinter_ReportError", _wrap_wxPrinter_ReportError, METH_VARARGS },
+        { "wxPrinter_PrintDialog", _wrap_wxPrinter_PrintDialog, METH_VARARGS },
+        { "wxPrinter_Print", _wrap_wxPrinter_Print, METH_VARARGS },
+        { "wxPrinter_GetPrintDialogData", _wrap_wxPrinter_GetPrintDialogData, METH_VARARGS },
+        { "wxPrinter_CreateAbortWindow", _wrap_wxPrinter_CreateAbortWindow, METH_VARARGS },
+        { "delete_wxPrinter", _wrap_delete_wxPrinter, METH_VARARGS },
+        { "new_wxPrinter", _wrap_new_wxPrinter, METH_VARARGS },
+        { "wxPrintout_base_HasPage", _wrap_wxPrintout_base_HasPage, METH_VARARGS },
+        { "wxPrintout_base_GetPageInfo", _wrap_wxPrintout_base_GetPageInfo, METH_VARARGS },
+        { "wxPrintout_base_OnPreparePrinting", _wrap_wxPrintout_base_OnPreparePrinting, METH_VARARGS },
+        { "wxPrintout_base_OnEndPrinting", _wrap_wxPrintout_base_OnEndPrinting, METH_VARARGS },
+        { "wxPrintout_base_OnBeginPrinting", _wrap_wxPrintout_base_OnBeginPrinting, METH_VARARGS },
+        { "wxPrintout_base_OnEndDocument", _wrap_wxPrintout_base_OnEndDocument, METH_VARARGS },
+        { "wxPrintout_base_OnBeginDocument", _wrap_wxPrintout_base_OnBeginDocument, METH_VARARGS },
+        { "wxPrintout_IsPreview", _wrap_wxPrintout_IsPreview, METH_VARARGS },
+        { "wxPrintout_GetPPIScreen", _wrap_wxPrintout_GetPPIScreen, METH_VARARGS },
+        { "wxPrintout_GetPPIPrinter", _wrap_wxPrintout_GetPPIPrinter, METH_VARARGS },
+        { "wxPrintout_GetPageSizePixels", _wrap_wxPrintout_GetPageSizePixels, METH_VARARGS },
+        { "wxPrintout_GetPageSizeMM", _wrap_wxPrintout_GetPageSizeMM, METH_VARARGS },
+        { "wxPrintout_GetDC", _wrap_wxPrintout_GetDC, METH_VARARGS },
+        { "wxPrintout_Destroy", _wrap_wxPrintout_Destroy, METH_VARARGS },
+        { "wxPrintout__setSelf", _wrap_wxPrintout__setSelf, METH_VARARGS },
+        { "new_wxPrintout", _wrap_new_wxPrintout, METH_VARARGS },
+        { "wxPrintDialog_ShowModal", _wrap_wxPrintDialog_ShowModal, METH_VARARGS },
+        { "wxPrintDialog_GetPrintDC", _wrap_wxPrintDialog_GetPrintDC, METH_VARARGS },
+        { "wxPrintDialog_GetPrintDialogData", _wrap_wxPrintDialog_GetPrintDialogData, METH_VARARGS },
+        { "new_wxPrintDialog", _wrap_new_wxPrintDialog, METH_VARARGS },
+        { "wxPrintDialogData_SetToPage", _wrap_wxPrintDialogData_SetToPage, METH_VARARGS },
+        { "wxPrintDialogData_SetSetupDialog", _wrap_wxPrintDialogData_SetSetupDialog, METH_VARARGS },
+        { "wxPrintDialogData_SetPrintToFile", _wrap_wxPrintDialogData_SetPrintToFile, METH_VARARGS },
+        { "wxPrintDialogData_SetPrintData", _wrap_wxPrintDialogData_SetPrintData, METH_VARARGS },
+        { "wxPrintDialogData_SetNoCopies", _wrap_wxPrintDialogData_SetNoCopies, METH_VARARGS },
+        { "wxPrintDialogData_SetMinPage", _wrap_wxPrintDialogData_SetMinPage, METH_VARARGS },
+        { "wxPrintDialogData_SetMaxPage", _wrap_wxPrintDialogData_SetMaxPage, METH_VARARGS },
+        { "wxPrintDialogData_SetFromPage", _wrap_wxPrintDialogData_SetFromPage, METH_VARARGS },
+        { "wxPrintDialogData_SetCollate", _wrap_wxPrintDialogData_SetCollate, METH_VARARGS },
+        { "wxPrintDialogData_GetToPage", _wrap_wxPrintDialogData_GetToPage, METH_VARARGS },
+        { "wxPrintDialogData_GetPrintToFile", _wrap_wxPrintDialogData_GetPrintToFile, METH_VARARGS },
+        { "wxPrintDialogData_GetPrintData", _wrap_wxPrintDialogData_GetPrintData, METH_VARARGS },
+        { "wxPrintDialogData_GetNoCopies", _wrap_wxPrintDialogData_GetNoCopies, METH_VARARGS },
+        { "wxPrintDialogData_GetMinPage", _wrap_wxPrintDialogData_GetMinPage, METH_VARARGS },
+        { "wxPrintDialogData_GetMaxPage", _wrap_wxPrintDialogData_GetMaxPage, METH_VARARGS },
+        { "wxPrintDialogData_GetFromPage", _wrap_wxPrintDialogData_GetFromPage, METH_VARARGS },
+        { "wxPrintDialogData_GetCollate", _wrap_wxPrintDialogData_GetCollate, METH_VARARGS },
+        { "wxPrintDialogData_GetAllPages", _wrap_wxPrintDialogData_GetAllPages, METH_VARARGS },
+        { "wxPrintDialogData_EnableSelection", _wrap_wxPrintDialogData_EnableSelection, METH_VARARGS },
+        { "wxPrintDialogData_EnablePrintToFile", _wrap_wxPrintDialogData_EnablePrintToFile, METH_VARARGS },
+        { "wxPrintDialogData_EnablePageNumbers", _wrap_wxPrintDialogData_EnablePageNumbers, METH_VARARGS },
+        { "wxPrintDialogData_EnableHelp", _wrap_wxPrintDialogData_EnableHelp, METH_VARARGS },
+        { "delete_wxPrintDialogData", _wrap_delete_wxPrintDialogData, METH_VARARGS },
+        { "new_wxPrintDialogData", _wrap_new_wxPrintDialogData, METH_VARARGS },
+        { "wxPageSetupDialog_ShowModal", _wrap_wxPageSetupDialog_ShowModal, METH_VARARGS },
+        { "wxPageSetupDialog_GetPageSetupData", _wrap_wxPageSetupDialog_GetPageSetupData, METH_VARARGS },
+        { "new_wxPageSetupDialog", _wrap_new_wxPageSetupDialog, METH_VARARGS },
+        { "wxPageSetupDialogData_SetPrintData", _wrap_wxPageSetupDialogData_SetPrintData, METH_VARARGS },
+        { "wxPageSetupDialogData_SetPaperSize", _wrap_wxPageSetupDialogData_SetPaperSize, METH_VARARGS },
+        { "wxPageSetupDialogData_SetPaperId", _wrap_wxPageSetupDialogData_SetPaperId, METH_VARARGS },
+        { "wxPageSetupDialogData_SetMinMarginBottomRight", _wrap_wxPageSetupDialogData_SetMinMarginBottomRight, METH_VARARGS },
+        { "wxPageSetupDialogData_SetMinMarginTopLeft", _wrap_wxPageSetupDialogData_SetMinMarginTopLeft, METH_VARARGS },
+        { "wxPageSetupDialogData_SetMarginBottomRight", _wrap_wxPageSetupDialogData_SetMarginBottomRight, METH_VARARGS },
+        { "wxPageSetupDialogData_SetMarginTopLeft", _wrap_wxPageSetupDialogData_SetMarginTopLeft, METH_VARARGS },
+        { "wxPageSetupDialogData_SetDefaultMinMargins", _wrap_wxPageSetupDialogData_SetDefaultMinMargins, METH_VARARGS },
+        { "wxPageSetupDialogData_SetDefaultInfo", _wrap_wxPageSetupDialogData_SetDefaultInfo, METH_VARARGS },
+        { "wxPageSetupDialogData_GetPrintData", _wrap_wxPageSetupDialogData_GetPrintData, METH_VARARGS },
+        { "wxPageSetupDialogData_GetPaperSize", _wrap_wxPageSetupDialogData_GetPaperSize, METH_VARARGS },
+        { "wxPageSetupDialogData_GetPaperId", _wrap_wxPageSetupDialogData_GetPaperId, METH_VARARGS },
+        { "wxPageSetupDialogData_GetMinMarginBottomRight", _wrap_wxPageSetupDialogData_GetMinMarginBottomRight, METH_VARARGS },
+        { "wxPageSetupDialogData_GetMinMarginTopLeft", _wrap_wxPageSetupDialogData_GetMinMarginTopLeft, METH_VARARGS },
+        { "wxPageSetupDialogData_GetMarginBottomRight", _wrap_wxPageSetupDialogData_GetMarginBottomRight, METH_VARARGS },
+        { "wxPageSetupDialogData_GetMarginTopLeft", _wrap_wxPageSetupDialogData_GetMarginTopLeft, METH_VARARGS },
+        { "wxPageSetupDialogData_GetDefaultInfo", _wrap_wxPageSetupDialogData_GetDefaultInfo, METH_VARARGS },
+        { "wxPageSetupDialogData_GetEnableHelp", _wrap_wxPageSetupDialogData_GetEnableHelp, METH_VARARGS },
+        { "wxPageSetupDialogData_GetEnablePrinter", _wrap_wxPageSetupDialogData_GetEnablePrinter, METH_VARARGS },
+        { "wxPageSetupDialogData_GetEnablePaper", _wrap_wxPageSetupDialogData_GetEnablePaper, METH_VARARGS },
+        { "wxPageSetupDialogData_GetEnableOrientation", _wrap_wxPageSetupDialogData_GetEnableOrientation, METH_VARARGS },
+        { "wxPageSetupDialogData_GetEnableMargins", _wrap_wxPageSetupDialogData_GetEnableMargins, METH_VARARGS },
+        { "wxPageSetupDialogData_GetDefaultMinMargins", _wrap_wxPageSetupDialogData_GetDefaultMinMargins, METH_VARARGS },
+        { "wxPageSetupDialogData_EnablePrinter", _wrap_wxPageSetupDialogData_EnablePrinter, METH_VARARGS },
+        { "wxPageSetupDialogData_EnablePaper", _wrap_wxPageSetupDialogData_EnablePaper, METH_VARARGS },
+        { "wxPageSetupDialogData_EnableOrientation", _wrap_wxPageSetupDialogData_EnableOrientation, METH_VARARGS },
+        { "wxPageSetupDialogData_EnableMargins", _wrap_wxPageSetupDialogData_EnableMargins, METH_VARARGS },
+        { "wxPageSetupDialogData_EnableHelp", _wrap_wxPageSetupDialogData_EnableHelp, METH_VARARGS },
+        { "delete_wxPageSetupDialogData", _wrap_delete_wxPageSetupDialogData, METH_VARARGS },
+        { "new_wxPageSetupDialogData", _wrap_new_wxPageSetupDialogData, METH_VARARGS },
+        { "wxPrintData_SetQuality", _wrap_wxPrintData_SetQuality, METH_VARARGS },
+        { "wxPrintData_SetPaperSize", _wrap_wxPrintData_SetPaperSize, METH_VARARGS },
+        { "wxPrintData_SetPaperId", _wrap_wxPrintData_SetPaperId, METH_VARARGS },
+        { "wxPrintData_SetDuplex", _wrap_wxPrintData_SetDuplex, METH_VARARGS },
+        { "wxPrintData_SetColour", _wrap_wxPrintData_SetColour, METH_VARARGS },
+        { "wxPrintData_SetPrinterName", _wrap_wxPrintData_SetPrinterName, METH_VARARGS },
+        { "wxPrintData_SetOrientation", _wrap_wxPrintData_SetOrientation, METH_VARARGS },
+        { "wxPrintData_SetCollate", _wrap_wxPrintData_SetCollate, METH_VARARGS },
+        { "wxPrintData_SetNoCopies", _wrap_wxPrintData_SetNoCopies, METH_VARARGS },
+        { "wxPrintData_GetQuality", _wrap_wxPrintData_GetQuality, METH_VARARGS },
+        { "wxPrintData_GetPaperSize", _wrap_wxPrintData_GetPaperSize, METH_VARARGS },
+        { "wxPrintData_GetPaperId", _wrap_wxPrintData_GetPaperId, METH_VARARGS },
+        { "wxPrintData_GetDuplex", _wrap_wxPrintData_GetDuplex, METH_VARARGS },
+        { "wxPrintData_GetColour", _wrap_wxPrintData_GetColour, METH_VARARGS },
+        { "wxPrintData_GetPrinterName", _wrap_wxPrintData_GetPrinterName, METH_VARARGS },
+        { "wxPrintData_GetOrientation", _wrap_wxPrintData_GetOrientation, METH_VARARGS },
+        { "wxPrintData_GetCollate", _wrap_wxPrintData_GetCollate, METH_VARARGS },
+        { "wxPrintData_GetNoCopies", _wrap_wxPrintData_GetNoCopies, METH_VARARGS },
+        { "delete_wxPrintData", _wrap_delete_wxPrintData, METH_VARARGS },
+        { "new_wxPrintData", _wrap_new_wxPrintData, METH_VARARGS },

         { NULL, NULL }
 };
         { NULL, NULL }
 };

+#ifdef __cplusplus
+}
+#endif
+/*
+ * This table is used by the pointer type-checker
+ */
+static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
+    { "_wxAcceleratorTable","_class_wxAcceleratorTable",0},
+    { "_wxEvent","_class_wxEvent",0},
+    { "_class_wxActivateEvent","_wxActivateEvent",0},
+    { "_signed_long","_long",0},
+    { "_wxMenuEvent","_class_wxMenuEvent",0},
+    { "_wxPrintQuality","_int",0},
+    { "_wxPrintQuality","_signed_int",0},
+    { "_wxPrintQuality","_unsigned_int",0},
+    { "_wxPrintQuality","_wxWindowID",0},
+    { "_wxPrintQuality","_uint",0},
+    { "_wxPrintQuality","_EBool",0},
+    { "_wxPrintQuality","_size_t",0},
+    { "_wxFontData","_class_wxFontData",0},
+    { "_class_wxRegionIterator","_wxRegionIterator",0},
+    { "_class_wxMenuBar","_wxMenuBar",0},
+    { "_class_wxEvtHandler","_class_wxPreviewFrame",SwigwxPreviewFrameTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxPreviewFrame",SwigwxPreviewFrameTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxPrintDialog",SwigwxPrintDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxPrintDialog",SwigwxPrintDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxPageSetupDialog",SwigwxPageSetupDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxEvtHandler",0},
+    { "_wxPaintEvent","_class_wxPaintEvent",0},
+    { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
+    { "_wxCursor","_class_wxCursor",0},
+    { "_wxNotifyEvent","_class_wxNotifyEvent",0},
+    { "_wxMask","_class_wxMask",0},
+    { "_class_wxColourData","_wxColourData",0},
+    { "_class_wxPageSetupDialogData","_wxPageSetupDialogData",0},
+    { "_wxPrinter","_class_wxPrinter",0},
+    { "_wxPen","_class_wxPen",0},
+    { "_wxUpdateUIEvent","_class_wxUpdateUIEvent",0},
+    { "_byte","_unsigned_char",0},
+    { "_wxStaticBox","_class_wxStaticBox",0},
+    { "_wxChoice","_class_wxChoice",0},
+    { "_wxSlider","_class_wxSlider",0},
+    { "_wxPyPrintout","_class_wxPyPrintout",0},
+    { "_long","_wxDash",0},
+    { "_long","_unsigned_long",0},
+    { "_long","_signed_long",0},
+    { "_wxImageList","_class_wxImageList",0},
+    { "_wxDropFilesEvent","_class_wxDropFilesEvent",0},
+    { "_wxBitmapButton","_class_wxBitmapButton",0},
+    { "_class_wxPrintDialogData","_wxPrintDialogData",0},
+    { "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
+    { "_class_wxGauge","_wxGauge",0},
+    { "_wxDC","_class_wxDC",0},
+    { "_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0},
+    { "_wxProgressDialog","_class_wxProgressDialog",0},
+    { "_wxPrintPreview","_class_wxPrintPreview",0},
+    { "_wxSpinEvent","_class_wxSpinEvent",0},
+    { "_size_t","_wxPrintQuality",0},
+    { "_size_t","_unsigned_int",0},
+    { "_size_t","_int",0},
+    { "_size_t","_wxWindowID",0},
+    { "_size_t","_uint",0},
+    { "_class_wxRealPoint","_wxRealPoint",0},
+    { "_wxPrinterDC","_class_wxPrinterDC",0},
+    { "_class_wxMenuItem","_wxMenuItem",0},
+    { "_class_wxPaintEvent","_wxPaintEvent",0},
+    { "_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0},
+    { "_class_wxStatusBar","_wxStatusBar",0},
+    { "_wxPanel","_class_wxPrintDialog",SwigwxPrintDialogTowxPanel},
+    { "_wxPanel","_wxPrintDialog",SwigwxPrintDialogTowxPanel},
+    { "_wxPanel","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxPanel},
+    { "_wxPanel","_wxPageSetupDialog",SwigwxPageSetupDialogTowxPanel},
+    { "_wxPanel","_class_wxPanel",0},
+    { "_wxInitDialogEvent","_class_wxInitDialogEvent",0},
+    { "_wxCheckBox","_class_wxCheckBox",0},
+    { "_wxPyEvent","_class_wxPyEvent",0},
+    { "_wxTextCtrl","_class_wxTextCtrl",0},
+    { "_class_wxMask","_wxMask",0},
+    { "_class_wxKeyEvent","_wxKeyEvent",0},
+    { "_wxColour","_class_wxColour",0},
+    { "_class_wxDialog","_class_wxPrintDialog",SwigwxPrintDialogTowxDialog},
+    { "_class_wxDialog","_wxPrintDialog",SwigwxPrintDialogTowxDialog},
+    { "_class_wxDialog","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxDialog},
+    { "_class_wxDialog","_wxPageSetupDialog",SwigwxPageSetupDialogTowxDialog},
+    { "_class_wxDialog","_wxDialog",0},
+    { "_wxPageSetupDialog","_class_wxPageSetupDialog",0},
+    { "_class_wxPrinter","_wxPrinter",0},
+    { "_wxIdleEvent","_class_wxIdleEvent",0},
+    { "_class_wxUpdateUIEvent","_wxUpdateUIEvent",0},
+    { "_wxToolBar","_class_wxToolBar",0},
+    { "_wxStaticLine","_class_wxStaticLine",0},
+    { "_wxBrush","_class_wxBrush",0},
+    { "_wxMiniFrame","_class_wxMiniFrame",0},
+    { "_class_wxPyPrintout","_wxPyPrintout",0},
+    { "_wxShowEvent","_class_wxShowEvent",0},
+    { "_uint","_wxPrintQuality",0},
+    { "_uint","_size_t",0},
+    { "_uint","_unsigned_int",0},
+    { "_uint","_int",0},
+    { "_uint","_wxWindowID",0},
+    { "_class_wxEvent","_wxEvent",0},
+    { "_wxCheckListBox","_class_wxCheckListBox",0},
+    { "_wxRect","_class_wxRect",0},
+    { "_wxCommandEvent","_class_wxCommandEvent",0},
+    { "_wxSizeEvent","_class_wxSizeEvent",0},
+    { "_wxPoint","_class_wxPoint",0},
+    { "_class_wxButton","_wxButton",0},
+    { "_wxRadioBox","_class_wxRadioBox",0},
+    { "_class_wxFontData","_wxFontData",0},
+    { "_wxBitmap","_class_wxBitmap",0},
+    { "_wxPrintDialog","_class_wxPrintDialog",0},
+    { "_wxPyTimer","_class_wxPyTimer",0},
+    { "_wxWindowDC","_class_wxWindowDC",0},
+    { "_wxScrollBar","_class_wxScrollBar",0},
+    { "_wxSpinButton","_class_wxSpinButton",0},
+    { "_wxToolBarTool","_class_wxToolBarTool",0},
+    { "_wxColourDialog","_class_wxColourDialog",0},
+    { "_wxPrintData","_class_wxPrintData",0},
+    { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
+    { "_class_wxNotifyEvent","_wxNotifyEvent",0},
+    { "_wxMessageDialog","_class_wxMessageDialog",0},
+    { "_class_wxPyEvent","_wxPyEvent",0},
+    { "_wxTextEntryDialog","_class_wxTextEntryDialog",0},
+    { "_class_wxIconizeEvent","_wxIconizeEvent",0},
+    { "_class_wxStaticBitmap","_wxStaticBitmap",0},
+    { "_class_wxToolBar","_wxToolBar",0},
+    { "_class_wxStaticLine","_wxStaticLine",0},
+    { "_wxScrollEvent","_class_wxScrollEvent",0},
+    { "_EBool","_wxPrintQuality",0},
+    { "_EBool","_signed_int",0},
+    { "_EBool","_int",0},
+    { "_EBool","_wxWindowID",0},
+    { "_class_wxRegion","_wxRegion",0},
+    { "_class_wxDropFilesEvent","_wxDropFilesEvent",0},
+    { "_class_wxPreviewFrame","_wxPreviewFrame",0},
+    { "_wxStaticText","_class_wxStaticText",0},
+    { "_wxFont","_class_wxFont",0},
+    { "_wxCloseEvent","_class_wxCloseEvent",0},
+    { "_unsigned_long","_wxDash",0},
+    { "_unsigned_long","_long",0},
+    { "_class_wxRect","_wxRect",0},
+    { "_class_wxDC","_wxDC",0},
+    { "_class_wxProgressDialog","_wxProgressDialog",0},
+    { "_class_wxDirDialog","_wxDirDialog",0},
+    { "_class_wxPyTimer","_wxPyTimer",0},
+    { "_wxFocusEvent","_class_wxFocusEvent",0},
+    { "_wxMaximizeEvent","_class_wxMaximizeEvent",0},
+    { "_class_wxSpinButton","_wxSpinButton",0},
+    { "_wxAcceleratorEntry","_class_wxAcceleratorEntry",0},
+    { "_class_wxPanel","_class_wxPrintDialog",SwigwxPrintDialogTowxPanel},
+    { "_class_wxPanel","_wxPrintDialog",SwigwxPrintDialogTowxPanel},
+    { "_class_wxPanel","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxPanel},
+    { "_class_wxPanel","_wxPageSetupDialog",SwigwxPageSetupDialogTowxPanel},
+    { "_class_wxPanel","_wxPanel",0},
+    { "_class_wxCheckBox","_wxCheckBox",0},
+    { "_wxComboBox","_class_wxComboBox",0},
+    { "_wxRadioButton","_class_wxRadioButton",0},
+    { "_class_wxMessageDialog","_wxMessageDialog",0},
+    { "_signed_int","_wxPrintQuality",0},
+    { "_signed_int","_EBool",0},
+    { "_signed_int","_wxWindowID",0},
+    { "_signed_int","_int",0},
+    { "_class_wxTextCtrl","_wxTextCtrl",0},
+    { "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
+    { "_wxMetaFileDC","_class_wxMetaFileDC",0},
+    { "_wxMenu","_class_wxMenu",0},
+    { "_class_wxMoveEvent","_wxMoveEvent",0},
+    { "_wxListBox","_class_wxListBox",0},
+    { "_wxScreenDC","_class_wxScreenDC",0},
+    { "_WXTYPE","_short",0},
+    { "_WXTYPE","_signed_short",0},
+    { "_WXTYPE","_unsigned_short",0},
+    { "_wxFileDialog","_class_wxFileDialog",0},
+    { "_class_wxBrush","_wxBrush",0},
+    { "_unsigned_short","_WXTYPE",0},
+    { "_unsigned_short","_short",0},
+    { "_class_wxWindow","_class_wxPreviewFrame",SwigwxPreviewFrameTowxWindow},
+    { "_class_wxWindow","_wxPreviewFrame",SwigwxPreviewFrameTowxWindow},
+    { "_class_wxWindow","_class_wxPrintDialog",SwigwxPrintDialogTowxWindow},
+    { "_class_wxWindow","_wxPrintDialog",SwigwxPrintDialogTowxWindow},
+    { "_class_wxWindow","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxWindow},
+    { "_class_wxWindow","_wxPageSetupDialog",SwigwxPageSetupDialogTowxWindow},
+    { "_class_wxWindow","_wxWindow",0},
+    { "_class_wxStaticText","_wxStaticText",0},
+    { "_wxPrintDialogData","_class_wxPrintDialogData",0},
+    { "_class_wxFont","_wxFont",0},
+    { "_class_wxCloseEvent","_wxCloseEvent",0},
+    { "_class_wxMenuEvent","_wxMenuEvent",0},
+    { "_wxClientDC","_class_wxClientDC",0},
+    { "_wxMouseEvent","_class_wxMouseEvent",0},
+    { "_wxSingleChoiceDialog","_class_wxSingleChoiceDialog",0},
+    { "_class_wxPoint","_wxPoint",0},
+    { "_wxRealPoint","_class_wxRealPoint",0},
+    { "_class_wxRadioBox","_wxRadioBox",0},
+    { "_signed_short","_WXTYPE",0},
+    { "_signed_short","_short",0},
+    { "_wxMemoryDC","_class_wxMemoryDC",0},
+    { "_class_wxPrintDialog","_wxPrintDialog",0},
+    { "_wxPaintDC","_class_wxPaintDC",0},
+    { "_class_wxWindowDC","_wxWindowDC",0},
+    { "_class_wxFocusEvent","_wxFocusEvent",0},
+    { "_class_wxMaximizeEvent","_wxMaximizeEvent",0},
+    { "_wxStatusBar","_class_wxStatusBar",0},
+    { "_class_wxToolBarTool","_wxToolBarTool",0},
+    { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
+    { "_class_wxCursor","_wxCursor",0},
+    { "_wxScrolledWindow","_class_wxScrolledWindow",0},
+    { "_unsigned_char","_byte",0},
+    { "_class_wxMetaFileDC","_wxMetaFileDC",0},
+    { "_class_wxMenu","_wxMenu",0},
+    { "_wxControl","_class_wxControl",0},
+    { "_class_wxListBox","_wxListBox",0},
+    { "_unsigned_int","_wxPrintQuality",0},
+    { "_unsigned_int","_size_t",0},
+    { "_unsigned_int","_uint",0},
+    { "_unsigned_int","_wxWindowID",0},
+    { "_unsigned_int","_int",0},
+    { "_wxIcon","_class_wxIcon",0},
+    { "_wxDialog","_class_wxPrintDialog",SwigwxPrintDialogTowxDialog},
+    { "_wxDialog","_wxPrintDialog",SwigwxPrintDialogTowxDialog},
+    { "_wxDialog","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxDialog},
+    { "_wxDialog","_wxPageSetupDialog",SwigwxPageSetupDialogTowxDialog},
+    { "_wxDialog","_class_wxDialog",0},
+    { "_class_wxPen","_wxPen",0},
+    { "_class_wxFileDialog","_wxFileDialog",0},
+    { "_short","_WXTYPE",0},
+    { "_short","_unsigned_short",0},
+    { "_short","_signed_short",0},
+    { "_class_wxStaticBox","_wxStaticBox",0},
+    { "_class_wxScrollEvent","_wxScrollEvent",0},
+    { "_wxJoystickEvent","_class_wxJoystickEvent",0},
+    { "_class_wxChoice","_wxChoice",0},
+    { "_class_wxSlider","_wxSlider",0},
+    { "_class_wxImageList","_wxImageList",0},
+    { "_class_wxBitmapButton","_wxBitmapButton",0},
+    { "_wxFrame","_class_wxPreviewFrame",SwigwxPreviewFrameTowxFrame},
+    { "_wxFrame","_wxPreviewFrame",SwigwxPreviewFrameTowxFrame},
+    { "_wxFrame","_class_wxFrame",0},
+    { "_wxWindowID","_wxPrintQuality",0},
+    { "_wxWindowID","_size_t",0},
+    { "_wxWindowID","_EBool",0},
+    { "_wxWindowID","_uint",0},
+    { "_wxWindowID","_int",0},
+    { "_wxWindowID","_signed_int",0},
+    { "_wxWindowID","_unsigned_int",0},
+    { "_int","_wxPrintQuality",0},
+    { "_int","_size_t",0},
+    { "_int","_EBool",0},
+    { "_int","_uint",0},
+    { "_int","_wxWindowID",0},
+    { "_int","_unsigned_int",0},
+    { "_int","_signed_int",0},
+    { "_class_wxMouseEvent","_wxMouseEvent",0},
+    { "_class_wxPrintPreview","_wxPrintPreview",0},
+    { "_class_wxSpinEvent","_wxSpinEvent",0},
+    { "_wxButton","_class_wxButton",0},
+    { "_wxSize","_class_wxSize",0},
+    { "_wxRegionIterator","_class_wxRegionIterator",0},
+    { "_class_wxPrinterDC","_wxPrinterDC",0},
+    { "_class_wxPaintDC","_wxPaintDC",0},
+    { "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0},
+    { "_class_wxInitDialogEvent","_wxInitDialogEvent",0},
+    { "_class_wxComboBox","_wxComboBox",0},
+    { "_class_wxRadioButton","_wxRadioButton",0},
+    { "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
+    { "_wxIconizeEvent","_class_wxIconizeEvent",0},
+    { "_class_wxControl","_wxControl",0},
+    { "_wxStaticBitmap","_class_wxStaticBitmap",0},
+    { "_class_wxIcon","_wxIcon",0},
+    { "_class_wxColour","_wxColour",0},
+    { "_class_wxScreenDC","_wxScreenDC",0},
+    { "_class_wxPageSetupDialog","_wxPageSetupDialog",0},
+    { "_wxPalette","_class_wxPalette",0},
+    { "_class_wxIdleEvent","_wxIdleEvent",0},
+    { "_wxEraseEvent","_class_wxEraseEvent",0},
+    { "_class_wxJoystickEvent","_wxJoystickEvent",0},
+    { "_class_wxMiniFrame","_wxMiniFrame",0},
+    { "_wxFontDialog","_class_wxFontDialog",0},
+    { "_wxRegion","_class_wxRegion",0},
+    { "_wxPreviewFrame","_class_wxPreviewFrame",0},
+    { "_class_wxShowEvent","_wxShowEvent",0},
+    { "_wxActivateEvent","_class_wxActivateEvent",0},
+    { "_wxGauge","_class_wxGauge",0},
+    { "_class_wxCheckListBox","_wxCheckListBox",0},
+    { "_class_wxCommandEvent","_wxCommandEvent",0},
+    { "_class_wxClientDC","_wxClientDC",0},
+    { "_class_wxSizeEvent","_wxSizeEvent",0},
+    { "_class_wxSize","_wxSize",0},
+    { "_class_wxBitmap","_wxBitmap",0},
+    { "_class_wxMemoryDC","_wxMemoryDC",0},
+    { "_wxMenuBar","_class_wxMenuBar",0},
+    { "_wxDirDialog","_class_wxDirDialog",0},
+    { "_wxEvtHandler","_class_wxPreviewFrame",SwigwxPreviewFrameTowxEvtHandler},
+    { "_wxEvtHandler","_wxPreviewFrame",SwigwxPreviewFrameTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxPrintDialog",SwigwxPrintDialogTowxEvtHandler},
+    { "_wxEvtHandler","_wxPrintDialog",SwigwxPrintDialogTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxEvtHandler},
+    { "_wxEvtHandler","_wxPageSetupDialog",SwigwxPageSetupDialogTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxEvtHandler",0},
+    { "_wxMenuItem","_class_wxMenuItem",0},
+    { "_class_wxScrollBar","_wxScrollBar",0},
+    { "_class_wxColourDialog","_wxColourDialog",0},
+    { "_class_wxPrintData","_wxPrintData",0},
+    { "_wxDash","_unsigned_long",0},
+    { "_wxDash","_long",0},
+    { "_class_wxScrolledWindow","_wxScrolledWindow",0},
+    { "_class_wxTextEntryDialog","_wxTextEntryDialog",0},
+    { "_wxKeyEvent","_class_wxKeyEvent",0},
+    { "_wxMoveEvent","_class_wxMoveEvent",0},
+    { "_wxColourData","_class_wxColourData",0},
+    { "_wxPageSetupDialogData","_class_wxPageSetupDialogData",0},
+    { "_class_wxPalette","_wxPalette",0},
+    { "_class_wxEraseEvent","_wxEraseEvent",0},
+    { "_class_wxFontDialog","_wxFontDialog",0},
+    { "_wxWindow","_class_wxPreviewFrame",SwigwxPreviewFrameTowxWindow},
+    { "_wxWindow","_wxPreviewFrame",SwigwxPreviewFrameTowxWindow},
+    { "_wxWindow","_class_wxPrintDialog",SwigwxPrintDialogTowxWindow},
+    { "_wxWindow","_wxPrintDialog",SwigwxPrintDialogTowxWindow},
+    { "_wxWindow","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxWindow},
+    { "_wxWindow","_wxPageSetupDialog",SwigwxPageSetupDialogTowxWindow},
+    { "_wxWindow","_class_wxWindow",0},
+    { "_class_wxFrame","_class_wxPreviewFrame",SwigwxPreviewFrameTowxFrame},
+    { "_class_wxFrame","_wxPreviewFrame",SwigwxPreviewFrameTowxFrame},
+    { "_class_wxFrame","_wxFrame",0},
+{0,0,0}};
+

 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif
 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif

-SWIGEXPORT(void,initprintfwc)() {
+SWIGEXPORT(void) initprintfwc() {

         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("printfwc", printfwcMethods);
         d = PyModule_GetDict(m);
         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("printfwc", printfwcMethods);
         d = PyModule_GetDict(m);

-/*
- * These are the pointer type-equivalency mappings. 
- * (Used by the SWIG pointer type-checker).
- */
-        SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_wxEvent","_class_wxEvent",0);
-        SWIG_RegisterMapping("_class_wxActivateEvent","_wxActivateEvent",0);
-        SWIG_RegisterMapping("_signed_long","_long",0);
-        SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_signed_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_unsigned_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_wxWindowID",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_uint",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_EBool",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_size_t",0);
-        SWIG_RegisterMapping("_wxFontData","_class_wxFontData",0);
-        SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
-        SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxPreviewFrame",SwigwxPreviewFrameTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxPreviewFrame",SwigwxPreviewFrameTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxPrintDialog",SwigwxPrintDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxPrintDialog",SwigwxPrintDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxPageSetupDialog",SwigwxPageSetupDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxEvtHandler",0);
-        SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
-        SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
-        SWIG_RegisterMapping("_wxNotifyEvent","_class_wxNotifyEvent",0);
-        SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
-        SWIG_RegisterMapping("_class_wxColourData","_wxColourData",0);
-        SWIG_RegisterMapping("_class_wxPageSetupDialogData","_wxPageSetupDialogData",0);
-        SWIG_RegisterMapping("_wxPrinter","_class_wxPrinter",0);
-        SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
-        SWIG_RegisterMapping("_wxUpdateUIEvent","_class_wxUpdateUIEvent",0);
-        SWIG_RegisterMapping("_byte","_unsigned_char",0);
-        SWIG_RegisterMapping("_wxStaticBox","_class_wxStaticBox",0);
-        SWIG_RegisterMapping("_wxChoice","_class_wxChoice",0);
-        SWIG_RegisterMapping("_wxSlider","_class_wxSlider",0);
-        SWIG_RegisterMapping("_wxPyPrintout","_class_wxPyPrintout",0);
-        SWIG_RegisterMapping("_long","_wxDash",0);
-        SWIG_RegisterMapping("_long","_unsigned_long",0);
-        SWIG_RegisterMapping("_long","_signed_long",0);
-        SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0);
-        SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0);
-        SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0);
-        SWIG_RegisterMapping("_class_wxPrintDialogData","_wxPrintDialogData",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_class_wxGauge","_wxGauge",0);
-        SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
-        SWIG_RegisterMapping("_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0);
-        SWIG_RegisterMapping("_wxProgressDialog","_class_wxProgressDialog",0);
-        SWIG_RegisterMapping("_wxPrintPreview","_class_wxPrintPreview",0);
-        SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0);
-        SWIG_RegisterMapping("_size_t","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_size_t","_unsigned_int",0);
-        SWIG_RegisterMapping("_size_t","_int",0);
-        SWIG_RegisterMapping("_size_t","_wxWindowID",0);
-        SWIG_RegisterMapping("_size_t","_uint",0);
-        SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
-        SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0);
-        SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0);
-        SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0);
-        SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0);
-        SWIG_RegisterMapping("_class_wxStatusBar","_wxStatusBar",0);
-        SWIG_RegisterMapping("_wxPanel","_class_wxPrintDialog",SwigwxPrintDialogTowxPanel);
-        SWIG_RegisterMapping("_wxPanel","_wxPrintDialog",SwigwxPrintDialogTowxPanel);
-        SWIG_RegisterMapping("_wxPanel","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxPanel);
-        SWIG_RegisterMapping("_wxPanel","_wxPageSetupDialog",SwigwxPageSetupDialogTowxPanel);
-        SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);
-        SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
-        SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
-        SWIG_RegisterMapping("_wxPyEvent","_class_wxPyEvent",0);
-        SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);
-        SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
-        SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0);
-        SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
-        SWIG_RegisterMapping("_class_wxDialog","_class_wxPrintDialog",SwigwxPrintDialogTowxDialog);
-        SWIG_RegisterMapping("_class_wxDialog","_wxPrintDialog",SwigwxPrintDialogTowxDialog);
-        SWIG_RegisterMapping("_class_wxDialog","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxDialog);
-        SWIG_RegisterMapping("_class_wxDialog","_wxPageSetupDialog",SwigwxPageSetupDialogTowxDialog);
-        SWIG_RegisterMapping("_class_wxDialog","_wxDialog",0);
-        SWIG_RegisterMapping("_wxPageSetupDialog","_class_wxPageSetupDialog",0);
-        SWIG_RegisterMapping("_class_wxPrinter","_wxPrinter",0);
-        SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0);
-        SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0);
-        SWIG_RegisterMapping("_wxToolBar","_class_wxToolBar",0);
-        SWIG_RegisterMapping("_wxStaticLine","_class_wxStaticLine",0);
-        SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
-        SWIG_RegisterMapping("_wxMiniFrame","_class_wxMiniFrame",0);
-        SWIG_RegisterMapping("_class_wxPyPrintout","_wxPyPrintout",0);
-        SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0);
-        SWIG_RegisterMapping("_uint","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_uint","_size_t",0);
-        SWIG_RegisterMapping("_uint","_unsigned_int",0);
-        SWIG_RegisterMapping("_uint","_int",0);
-        SWIG_RegisterMapping("_uint","_wxWindowID",0);
-        SWIG_RegisterMapping("_class_wxEvent","_wxEvent",0);
-        SWIG_RegisterMapping("_wxCheckListBox","_class_wxCheckListBox",0);
-        SWIG_RegisterMapping("_wxRect","_class_wxRect",0);
-        SWIG_RegisterMapping("_wxCommandEvent","_class_wxCommandEvent",0);
-        SWIG_RegisterMapping("_wxSizeEvent","_class_wxSizeEvent",0);
-        SWIG_RegisterMapping("_wxPoint","_class_wxPoint",0);
-        SWIG_RegisterMapping("_class_wxButton","_wxButton",0);
-        SWIG_RegisterMapping("_wxRadioBox","_class_wxRadioBox",0);
-        SWIG_RegisterMapping("_class_wxFontData","_wxFontData",0);
-        SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
-        SWIG_RegisterMapping("_wxPrintDialog","_class_wxPrintDialog",0);
-        SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0);
-        SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0);
-        SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0);
-        SWIG_RegisterMapping("_wxToolBarTool","_class_wxToolBarTool",0);
-        SWIG_RegisterMapping("_wxColourDialog","_class_wxColourDialog",0);
-        SWIG_RegisterMapping("_wxPrintData","_class_wxPrintData",0);
-        SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_class_wxNotifyEvent","_wxNotifyEvent",0);
-        SWIG_RegisterMapping("_wxMessageDialog","_class_wxMessageDialog",0);
-        SWIG_RegisterMapping("_class_wxPyEvent","_wxPyEvent",0);
-        SWIG_RegisterMapping("_wxTextEntryDialog","_class_wxTextEntryDialog",0);
-        SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
-        SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
-        SWIG_RegisterMapping("_class_wxToolBar","_wxToolBar",0);
-        SWIG_RegisterMapping("_class_wxStaticLine","_wxStaticLine",0);
-        SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0);
-        SWIG_RegisterMapping("_EBool","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_EBool","_signed_int",0);
-        SWIG_RegisterMapping("_EBool","_int",0);
-        SWIG_RegisterMapping("_EBool","_wxWindowID",0);
-        SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
-        SWIG_RegisterMapping("_class_wxDropFilesEvent","_wxDropFilesEvent",0);
-        SWIG_RegisterMapping("_class_wxPreviewFrame","_wxPreviewFrame",0);
-        SWIG_RegisterMapping("_wxStaticText","_class_wxStaticText",0);
-        SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
-        SWIG_RegisterMapping("_wxCloseEvent","_class_wxCloseEvent",0);
-        SWIG_RegisterMapping("_unsigned_long","_wxDash",0);
-        SWIG_RegisterMapping("_unsigned_long","_long",0);
-        SWIG_RegisterMapping("_class_wxRect","_wxRect",0);
-        SWIG_RegisterMapping("_class_wxDC","_wxDC",0);
-        SWIG_RegisterMapping("_class_wxProgressDialog","_wxProgressDialog",0);
-        SWIG_RegisterMapping("_class_wxDirDialog","_wxDirDialog",0);
-        SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxFocusEvent","_class_wxFocusEvent",0);
-        SWIG_RegisterMapping("_wxMaximizeEvent","_class_wxMaximizeEvent",0);
-        SWIG_RegisterMapping("_class_wxSpinButton","_wxSpinButton",0);
-        SWIG_RegisterMapping("_wxAcceleratorEntry","_class_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_class_wxPanel","_class_wxPrintDialog",SwigwxPrintDialogTowxPanel);
-        SWIG_RegisterMapping("_class_wxPanel","_wxPrintDialog",SwigwxPrintDialogTowxPanel);
-        SWIG_RegisterMapping("_class_wxPanel","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxPanel);
-        SWIG_RegisterMapping("_class_wxPanel","_wxPageSetupDialog",SwigwxPageSetupDialogTowxPanel);
-        SWIG_RegisterMapping("_class_wxPanel","_wxPanel",0);
-        SWIG_RegisterMapping("_class_wxCheckBox","_wxCheckBox",0);
-        SWIG_RegisterMapping("_wxComboBox","_class_wxComboBox",0);
-        SWIG_RegisterMapping("_wxRadioButton","_class_wxRadioButton",0);
-        SWIG_RegisterMapping("_class_wxMessageDialog","_wxMessageDialog",0);
-        SWIG_RegisterMapping("_signed_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_signed_int","_EBool",0);
-        SWIG_RegisterMapping("_signed_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_signed_int","_int",0);
-        SWIG_RegisterMapping("_class_wxTextCtrl","_wxTextCtrl",0);
-        SWIG_RegisterMapping("_wxLayoutConstraints","_class_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_wxMetaFileDC","_class_wxMetaFileDC",0);
-        SWIG_RegisterMapping("_wxMenu","_class_wxMenu",0);
-        SWIG_RegisterMapping("_class_wxMoveEvent","_wxMoveEvent",0);
-        SWIG_RegisterMapping("_wxListBox","_class_wxListBox",0);
-        SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0);
-        SWIG_RegisterMapping("_WXTYPE","_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_signed_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_unsigned_short",0);
-        SWIG_RegisterMapping("_wxFileDialog","_class_wxFileDialog",0);
-        SWIG_RegisterMapping("_class_wxBrush","_wxBrush",0);
-        SWIG_RegisterMapping("_unsigned_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_unsigned_short","_short",0);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxPreviewFrame",SwigwxPreviewFrameTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxPreviewFrame",SwigwxPreviewFrameTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxPrintDialog",SwigwxPrintDialogTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxPrintDialog",SwigwxPrintDialogTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxPageSetupDialog",SwigwxPageSetupDialogTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxWindow",0);
-        SWIG_RegisterMapping("_class_wxStaticText","_wxStaticText",0);
-        SWIG_RegisterMapping("_wxPrintDialogData","_class_wxPrintDialogData",0);
-        SWIG_RegisterMapping("_class_wxFont","_wxFont",0);
-        SWIG_RegisterMapping("_class_wxCloseEvent","_wxCloseEvent",0);
-        SWIG_RegisterMapping("_class_wxMenuEvent","_wxMenuEvent",0);
-        SWIG_RegisterMapping("_wxClientDC","_class_wxClientDC",0);
-        SWIG_RegisterMapping("_wxMouseEvent","_class_wxMouseEvent",0);
-        SWIG_RegisterMapping("_wxSingleChoiceDialog","_class_wxSingleChoiceDialog",0);
-        SWIG_RegisterMapping("_class_wxPoint","_wxPoint",0);
-        SWIG_RegisterMapping("_wxRealPoint","_class_wxRealPoint",0);
-        SWIG_RegisterMapping("_class_wxRadioBox","_wxRadioBox",0);
-        SWIG_RegisterMapping("_signed_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_signed_short","_short",0);
-        SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0);
-        SWIG_RegisterMapping("_class_wxPrintDialog","_wxPrintDialog",0);
-        SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
-        SWIG_RegisterMapping("_class_wxWindowDC","_wxWindowDC",0);
-        SWIG_RegisterMapping("_class_wxFocusEvent","_wxFocusEvent",0);
-        SWIG_RegisterMapping("_class_wxMaximizeEvent","_wxMaximizeEvent",0);
-        SWIG_RegisterMapping("_wxStatusBar","_class_wxStatusBar",0);
-        SWIG_RegisterMapping("_class_wxToolBarTool","_wxToolBarTool",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
-        SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0);
-        SWIG_RegisterMapping("_unsigned_char","_byte",0);
-        SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0);
-        SWIG_RegisterMapping("_class_wxMenu","_wxMenu",0);
-        SWIG_RegisterMapping("_wxControl","_class_wxControl",0);
-        SWIG_RegisterMapping("_class_wxListBox","_wxListBox",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_unsigned_int","_size_t",0);
-        SWIG_RegisterMapping("_unsigned_int","_uint",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_unsigned_int","_int",0);
-        SWIG_RegisterMapping("_wxIcon","_class_wxIcon",0);
-        SWIG_RegisterMapping("_wxDialog","_class_wxPrintDialog",SwigwxPrintDialogTowxDialog);
-        SWIG_RegisterMapping("_wxDialog","_wxPrintDialog",SwigwxPrintDialogTowxDialog);
-        SWIG_RegisterMapping("_wxDialog","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxDialog);
-        SWIG_RegisterMapping("_wxDialog","_wxPageSetupDialog",SwigwxPageSetupDialogTowxDialog);
-        SWIG_RegisterMapping("_wxDialog","_class_wxDialog",0);
-        SWIG_RegisterMapping("_class_wxPen","_wxPen",0);
-        SWIG_RegisterMapping("_class_wxFileDialog","_wxFileDialog",0);
-        SWIG_RegisterMapping("_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_short","_unsigned_short",0);
-        SWIG_RegisterMapping("_short","_signed_short",0);
-        SWIG_RegisterMapping("_class_wxStaticBox","_wxStaticBox",0);
-        SWIG_RegisterMapping("_class_wxScrollEvent","_wxScrollEvent",0);
-        SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0);
-        SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
-        SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);
-        SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0);
-        SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
-        SWIG_RegisterMapping("_wxFrame","_class_wxPreviewFrame",SwigwxPreviewFrameTowxFrame);
-        SWIG_RegisterMapping("_wxFrame","_wxPreviewFrame",SwigwxPreviewFrameTowxFrame);
-        SWIG_RegisterMapping("_wxFrame","_class_wxFrame",0);
-        SWIG_RegisterMapping("_wxWindowID","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_wxWindowID","_size_t",0);
-        SWIG_RegisterMapping("_wxWindowID","_EBool",0);
-        SWIG_RegisterMapping("_wxWindowID","_uint",0);
-        SWIG_RegisterMapping("_wxWindowID","_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_signed_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_int","_size_t",0);
-        SWIG_RegisterMapping("_int","_EBool",0);
-        SWIG_RegisterMapping("_int","_uint",0);
-        SWIG_RegisterMapping("_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_int","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_signed_int",0);
-        SWIG_RegisterMapping("_class_wxMouseEvent","_wxMouseEvent",0);
-        SWIG_RegisterMapping("_class_wxPrintPreview","_wxPrintPreview",0);
-        SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0);
-        SWIG_RegisterMapping("_wxButton","_class_wxButton",0);
-        SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
-        SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
-        SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
-        SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
-        SWIG_RegisterMapping("_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0);
-        SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0);
-        SWIG_RegisterMapping("_class_wxComboBox","_wxComboBox",0);
-        SWIG_RegisterMapping("_class_wxRadioButton","_wxRadioButton",0);
-        SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_wxIconizeEvent","_class_wxIconizeEvent",0);
-        SWIG_RegisterMapping("_class_wxControl","_wxControl",0);
-        SWIG_RegisterMapping("_wxStaticBitmap","_class_wxStaticBitmap",0);
-        SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
-        SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
-        SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
-        SWIG_RegisterMapping("_class_wxPageSetupDialog","_wxPageSetupDialog",0);
-        SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
-        SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0);
-        SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
-        SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
-        SWIG_RegisterMapping("_class_wxMiniFrame","_wxMiniFrame",0);
-        SWIG_RegisterMapping("_wxFontDialog","_class_wxFontDialog",0);
-        SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
-        SWIG_RegisterMapping("_wxPreviewFrame","_class_wxPreviewFrame",0);
-        SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
-        SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
-        SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0);
-        SWIG_RegisterMapping("_class_wxCheckListBox","_wxCheckListBox",0);
-        SWIG_RegisterMapping("_class_wxCommandEvent","_wxCommandEvent",0);
-        SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
-        SWIG_RegisterMapping("_class_wxSizeEvent","_wxSizeEvent",0);
-        SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
-        SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0);
-        SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0);
-        SWIG_RegisterMapping("_wxMenuBar","_class_wxMenuBar",0);
-        SWIG_RegisterMapping("_wxDirDialog","_class_wxDirDialog",0);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxPreviewFrame",SwigwxPreviewFrameTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxPreviewFrame",SwigwxPreviewFrameTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxPrintDialog",SwigwxPrintDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxPrintDialog",SwigwxPrintDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxPageSetupDialog",SwigwxPageSetupDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxEvtHandler",0);
-        SWIG_RegisterMapping("_wxMenuItem","_class_wxMenuItem",0);
-        SWIG_RegisterMapping("_class_wxScrollBar","_wxScrollBar",0);
-        SWIG_RegisterMapping("_class_wxColourDialog","_wxColourDialog",0);
-        SWIG_RegisterMapping("_class_wxPrintData","_wxPrintData",0);
-        SWIG_RegisterMapping("_wxDash","_unsigned_long",0);
-        SWIG_RegisterMapping("_wxDash","_long",0);
-        SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
-        SWIG_RegisterMapping("_class_wxTextEntryDialog","_wxTextEntryDialog",0);
-        SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0);
-        SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0);
-        SWIG_RegisterMapping("_wxColourData","_class_wxColourData",0);
-        SWIG_RegisterMapping("_wxPageSetupDialogData","_class_wxPageSetupDialogData",0);
-        SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
-        SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0);
-        SWIG_RegisterMapping("_class_wxFontDialog","_wxFontDialog",0);
-        SWIG_RegisterMapping("_wxWindow","_class_wxPreviewFrame",SwigwxPreviewFrameTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxPreviewFrame",SwigwxPreviewFrameTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxPrintDialog",SwigwxPrintDialogTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxPrintDialog",SwigwxPrintDialogTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxPageSetupDialog",SwigwxPageSetupDialogTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxWindow",0);
-        SWIG_RegisterMapping("_class_wxFrame","_class_wxPreviewFrame",SwigwxPreviewFrameTowxFrame);
-        SWIG_RegisterMapping("_class_wxFrame","_wxPreviewFrame",SwigwxPreviewFrameTowxFrame);
-        SWIG_RegisterMapping("_class_wxFrame","_wxFrame",0);
+{
+   int i;
+   for (i = 0; _swig_mapping[i].n1; i++)
+        SWIG_RegisterMapping(_swig_mapping[i].n1,_swig_mapping[i].n2,_swig_mapping[i].pcnv);
+}

 }
 }

diff --git a/utils/wxPython/src/msw/printfw.py b/utils/wxPython/src/msw/printfw.py
index ad4d201aacec54609015aa5687241a5db5507de0..df3356033f75b847bccb7490d469a0426b9199d3 100644 (file)
--- a/utils/wxPython/src/msw/printfw.py
+++ b/utils/wxPython/src/msw/printfw.py
@@ -21,69 +21,69 @@ class wxPrintDataPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self, printfwc=printfwc):
+    def __del__(self,printfwc=printfwc):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            printfwc.delete_wxPrintData(self.this)
-    def GetNoCopies(self):
-        val = printfwc.wxPrintData_GetNoCopies(self.this)
+            printfwc.delete_wxPrintData(self)
+    def GetNoCopies(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintData_GetNoCopies,(self,) + _args, _kwargs)

         return val
         return val

-    def GetCollate(self):
-        val = printfwc.wxPrintData_GetCollate(self.this)
+    def GetCollate(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintData_GetCollate,(self,) + _args, _kwargs)

         return val
         return val

-    def GetOrientation(self):
-        val = printfwc.wxPrintData_GetOrientation(self.this)
+    def GetOrientation(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintData_GetOrientation,(self,) + _args, _kwargs)

         return val
         return val

-    def GetPrinterName(self):
-        val = printfwc.wxPrintData_GetPrinterName(self.this)
+    def GetPrinterName(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintData_GetPrinterName,(self,) + _args, _kwargs)

         return val
         return val

-    def GetColour(self):
-        val = printfwc.wxPrintData_GetColour(self.this)
+    def GetColour(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintData_GetColour,(self,) + _args, _kwargs)

         return val
         return val

-    def GetDuplex(self):
-        val = printfwc.wxPrintData_GetDuplex(self.this)
+    def GetDuplex(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintData_GetDuplex,(self,) + _args, _kwargs)

         return val
         return val

-    def GetPaperId(self):
-        val = printfwc.wxPrintData_GetPaperId(self.this)
+    def GetPaperId(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintData_GetPaperId,(self,) + _args, _kwargs)

         return val
         return val

-    def GetPaperSize(self):
-        val = printfwc.wxPrintData_GetPaperSize(self.this)
-        val = wxSizePtr(val)
+    def GetPaperSize(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintData_GetPaperSize,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) 

         return val
         return val

-    def GetQuality(self):
-        val = printfwc.wxPrintData_GetQuality(self.this)
+    def GetQuality(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintData_GetQuality,(self,) + _args, _kwargs)

         return val
         return val

-    def SetNoCopies(self,arg0):
-        val = printfwc.wxPrintData_SetNoCopies(self.this,arg0)
+    def SetNoCopies(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintData_SetNoCopies,(self,) + _args, _kwargs)

         return val
         return val

-    def SetCollate(self,arg0):
-        val = printfwc.wxPrintData_SetCollate(self.this,arg0)
+    def SetCollate(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintData_SetCollate,(self,) + _args, _kwargs)

         return val
         return val

-    def SetOrientation(self,arg0):
-        val = printfwc.wxPrintData_SetOrientation(self.this,arg0)
+    def SetOrientation(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintData_SetOrientation,(self,) + _args, _kwargs)

         return val
         return val

-    def SetPrinterName(self,arg0):
-        val = printfwc.wxPrintData_SetPrinterName(self.this,arg0)
+    def SetPrinterName(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintData_SetPrinterName,(self,) + _args, _kwargs)

         return val
         return val

-    def SetColour(self,arg0):
-        val = printfwc.wxPrintData_SetColour(self.this,arg0)
+    def SetColour(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintData_SetColour,(self,) + _args, _kwargs)

         return val
         return val

-    def SetDuplex(self,arg0):
-        val = printfwc.wxPrintData_SetDuplex(self.this,arg0)
+    def SetDuplex(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintData_SetDuplex,(self,) + _args, _kwargs)

         return val
         return val

-    def SetPaperId(self,arg0):
-        val = printfwc.wxPrintData_SetPaperId(self.this,arg0)
+    def SetPaperId(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintData_SetPaperId,(self,) + _args, _kwargs)

         return val
         return val

-    def SetPaperSize(self,arg0):
-        val = printfwc.wxPrintData_SetPaperSize(self.this,arg0.this)
+    def SetPaperSize(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintData_SetPaperSize,(self,) + _args, _kwargs)

         return val
         return val

-    def SetQuality(self,arg0):
-        val = printfwc.wxPrintData_SetQuality(self.this,arg0)
+    def SetQuality(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintData_SetQuality,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxPrintData instance>"
+        return "<C wxPrintData instance at %s>" % (self.this,)

 class wxPrintData(wxPrintDataPtr):
 class wxPrintData(wxPrintDataPtr):

-    def __init__(self) :
-        self.this = printfwc.new_wxPrintData()
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(printfwc.new_wxPrintData,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -93,110 +93,104 @@ class wxPageSetupDialogDataPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self, printfwc=printfwc):
+    def __del__(self,printfwc=printfwc):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            printfwc.delete_wxPageSetupDialogData(self.this)
-    def EnableHelp(self,arg0):
-        val = printfwc.wxPageSetupDialogData_EnableHelp(self.this,arg0)
+            printfwc.delete_wxPageSetupDialogData(self)
+    def EnableHelp(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPageSetupDialogData_EnableHelp,(self,) + _args, _kwargs)

         return val
         return val

-    def EnableMargins(self,arg0):
-        val = printfwc.wxPageSetupDialogData_EnableMargins(self.this,arg0)
+    def EnableMargins(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPageSetupDialogData_EnableMargins,(self,) + _args, _kwargs)

         return val
         return val

-    def EnableOrientation(self,arg0):
-        val = printfwc.wxPageSetupDialogData_EnableOrientation(self.this,arg0)
+    def EnableOrientation(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPageSetupDialogData_EnableOrientation,(self,) + _args, _kwargs)

         return val
         return val

-    def EnablePaper(self,arg0):
-        val = printfwc.wxPageSetupDialogData_EnablePaper(self.this,arg0)
+    def EnablePaper(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPageSetupDialogData_EnablePaper,(self,) + _args, _kwargs)

         return val
         return val

-    def EnablePrinter(self,arg0):
-        val = printfwc.wxPageSetupDialogData_EnablePrinter(self.this,arg0)
+    def EnablePrinter(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPageSetupDialogData_EnablePrinter,(self,) + _args, _kwargs)

         return val
         return val

-    def GetDefaultMinMargins(self):
-        val = printfwc.wxPageSetupDialogData_GetDefaultMinMargins(self.this)
+    def GetDefaultMinMargins(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPageSetupDialogData_GetDefaultMinMargins,(self,) + _args, _kwargs)

         return val
         return val

-    def GetEnableMargins(self):
-        val = printfwc.wxPageSetupDialogData_GetEnableMargins(self.this)
+    def GetEnableMargins(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPageSetupDialogData_GetEnableMargins,(self,) + _args, _kwargs)

         return val
         return val

-    def GetEnableOrientation(self):
-        val = printfwc.wxPageSetupDialogData_GetEnableOrientation(self.this)
+    def GetEnableOrientation(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPageSetupDialogData_GetEnableOrientation,(self,) + _args, _kwargs)

         return val
         return val

-    def GetEnablePaper(self):
-        val = printfwc.wxPageSetupDialogData_GetEnablePaper(self.this)
+    def GetEnablePaper(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPageSetupDialogData_GetEnablePaper,(self,) + _args, _kwargs)

         return val
         return val

-    def GetEnablePrinter(self):
-        val = printfwc.wxPageSetupDialogData_GetEnablePrinter(self.this)
+    def GetEnablePrinter(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPageSetupDialogData_GetEnablePrinter,(self,) + _args, _kwargs)

         return val
         return val

-    def GetEnableHelp(self):
-        val = printfwc.wxPageSetupDialogData_GetEnableHelp(self.this)
+    def GetEnableHelp(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPageSetupDialogData_GetEnableHelp,(self,) + _args, _kwargs)

         return val
         return val

-    def GetDefaultInfo(self):
-        val = printfwc.wxPageSetupDialogData_GetDefaultInfo(self.this)
+    def GetDefaultInfo(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPageSetupDialogData_GetDefaultInfo,(self,) + _args, _kwargs)

         return val
         return val

-    def GetMarginTopLeft(self):
-        val = printfwc.wxPageSetupDialogData_GetMarginTopLeft(self.this)
-        val = wxPointPtr(val)
-        val.thisown = 1
+    def GetMarginTopLeft(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPageSetupDialogData_GetMarginTopLeft,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetMarginBottomRight(self):
-        val = printfwc.wxPageSetupDialogData_GetMarginBottomRight(self.this)
-        val = wxPointPtr(val)
-        val.thisown = 1
+    def GetMarginBottomRight(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPageSetupDialogData_GetMarginBottomRight,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetMinMarginTopLeft(self):
-        val = printfwc.wxPageSetupDialogData_GetMinMarginTopLeft(self.this)
-        val = wxPointPtr(val)
-        val.thisown = 1
+    def GetMinMarginTopLeft(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPageSetupDialogData_GetMinMarginTopLeft,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetMinMarginBottomRight(self):
-        val = printfwc.wxPageSetupDialogData_GetMinMarginBottomRight(self.this)
-        val = wxPointPtr(val)
-        val.thisown = 1
+    def GetMinMarginBottomRight(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPageSetupDialogData_GetMinMarginBottomRight,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetPaperId(self):
-        val = printfwc.wxPageSetupDialogData_GetPaperId(self.this)
+    def GetPaperId(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPageSetupDialogData_GetPaperId,(self,) + _args, _kwargs)

         return val
         return val

-    def GetPaperSize(self):
-        val = printfwc.wxPageSetupDialogData_GetPaperSize(self.this)
-        val = wxSizePtr(val)
-        val.thisown = 1
+    def GetPaperSize(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPageSetupDialogData_GetPaperSize,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1

         return val
         return val

-    def GetPrintData(self):
-        val = printfwc.wxPageSetupDialogData_GetPrintData(self.this)
-        val = wxPrintDataPtr(val)
-        val.thisown = 1
+    def GetPrintData(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPageSetupDialogData_GetPrintData,(self,) + _args, _kwargs)
+        if val: val = wxPrintDataPtr(val) ; val.thisown = 1

         return val
         return val

-    def SetDefaultInfo(self,arg0):
-        val = printfwc.wxPageSetupDialogData_SetDefaultInfo(self.this,arg0)
+    def SetDefaultInfo(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPageSetupDialogData_SetDefaultInfo,(self,) + _args, _kwargs)

         return val
         return val

-    def SetDefaultMinMargins(self,arg0):
-        val = printfwc.wxPageSetupDialogData_SetDefaultMinMargins(self.this,arg0)
+    def SetDefaultMinMargins(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPageSetupDialogData_SetDefaultMinMargins,(self,) + _args, _kwargs)

         return val
         return val

-    def SetMarginTopLeft(self,arg0):
-        val = printfwc.wxPageSetupDialogData_SetMarginTopLeft(self.this,arg0.this)
+    def SetMarginTopLeft(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPageSetupDialogData_SetMarginTopLeft,(self,) + _args, _kwargs)

         return val
         return val

-    def SetMarginBottomRight(self,arg0):
-        val = printfwc.wxPageSetupDialogData_SetMarginBottomRight(self.this,arg0.this)
+    def SetMarginBottomRight(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPageSetupDialogData_SetMarginBottomRight,(self,) + _args, _kwargs)

         return val
         return val

-    def SetMinMarginTopLeft(self,arg0):
-        val = printfwc.wxPageSetupDialogData_SetMinMarginTopLeft(self.this,arg0.this)
+    def SetMinMarginTopLeft(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPageSetupDialogData_SetMinMarginTopLeft,(self,) + _args, _kwargs)

         return val
         return val

-    def SetMinMarginBottomRight(self,arg0):
-        val = printfwc.wxPageSetupDialogData_SetMinMarginBottomRight(self.this,arg0.this)
+    def SetMinMarginBottomRight(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPageSetupDialogData_SetMinMarginBottomRight,(self,) + _args, _kwargs)

         return val
         return val

-    def SetPaperId(self,arg0):
-        val = printfwc.wxPageSetupDialogData_SetPaperId(self.this,arg0)
+    def SetPaperId(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPageSetupDialogData_SetPaperId,(self,) + _args, _kwargs)

         return val
         return val

-    def SetPaperSize(self,arg0):
-        val = printfwc.wxPageSetupDialogData_SetPaperSize(self.this,arg0.this)
+    def SetPaperSize(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPageSetupDialogData_SetPaperSize,(self,) + _args, _kwargs)

         return val
         return val

-    def SetPrintData(self,arg0):
-        val = printfwc.wxPageSetupDialogData_SetPrintData(self.this,arg0.this)
+    def SetPrintData(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPageSetupDialogData_SetPrintData,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxPageSetupDialogData instance>"
+        return "<C wxPageSetupDialogData instance at %s>" % (self.this,)

 class wxPageSetupDialogData(wxPageSetupDialogDataPtr):
 class wxPageSetupDialogData(wxPageSetupDialogDataPtr):

-    def __init__(self) :
-        self.this = printfwc.new_wxPageSetupDialogData()
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(printfwc.new_wxPageSetupDialogData,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -206,22 +200,18 @@ class wxPageSetupDialogPtr(wxDialogPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetPageSetupData(self):
-        val = printfwc.wxPageSetupDialog_GetPageSetupData(self.this)
-        val = wxPageSetupDialogDataPtr(val)
+    def GetPageSetupData(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPageSetupDialog_GetPageSetupData,(self,) + _args, _kwargs)
+        if val: val = wxPageSetupDialogDataPtr(val) 

         return val
         return val

-    def ShowModal(self):
-        val = printfwc.wxPageSetupDialog_ShowModal(self.this)
+    def ShowModal(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPageSetupDialog_ShowModal,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxPageSetupDialog instance>"
+        return "<C wxPageSetupDialog instance at %s>" % (self.this,)

 class wxPageSetupDialog(wxPageSetupDialogPtr):
 class wxPageSetupDialog(wxPageSetupDialogPtr):

-    def __init__(self,arg0,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(printfwc.new_wxPageSetupDialog,(arg0.this,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(printfwc.new_wxPageSetupDialog,_args,_kwargs)

         self.thisown = 1
         wx._StdDialogCallbacks(self)
 
         self.thisown = 1
         wx._StdDialogCallbacks(self)
 


@@ -232,82 +222,81 @@ class wxPrintDialogDataPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self, printfwc=printfwc):
+    def __del__(self,printfwc=printfwc):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            printfwc.delete_wxPrintDialogData(self.this)
-    def EnableHelp(self,arg0):
-        val = printfwc.wxPrintDialogData_EnableHelp(self.this,arg0)
+            printfwc.delete_wxPrintDialogData(self)
+    def EnableHelp(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintDialogData_EnableHelp,(self,) + _args, _kwargs)

         return val
         return val

-    def EnablePageNumbers(self,arg0):
-        val = printfwc.wxPrintDialogData_EnablePageNumbers(self.this,arg0)
+    def EnablePageNumbers(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintDialogData_EnablePageNumbers,(self,) + _args, _kwargs)

         return val
         return val

-    def EnablePrintToFile(self,arg0):
-        val = printfwc.wxPrintDialogData_EnablePrintToFile(self.this,arg0)
+    def EnablePrintToFile(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintDialogData_EnablePrintToFile,(self,) + _args, _kwargs)

         return val
         return val

-    def EnableSelection(self,arg0):
-        val = printfwc.wxPrintDialogData_EnableSelection(self.this,arg0)
+    def EnableSelection(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintDialogData_EnableSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def GetAllPages(self):
-        val = printfwc.wxPrintDialogData_GetAllPages(self.this)
+    def GetAllPages(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintDialogData_GetAllPages,(self,) + _args, _kwargs)

         return val
         return val

-    def GetCollate(self):
-        val = printfwc.wxPrintDialogData_GetCollate(self.this)
+    def GetCollate(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintDialogData_GetCollate,(self,) + _args, _kwargs)

         return val
         return val

-    def GetFromPage(self):
-        val = printfwc.wxPrintDialogData_GetFromPage(self.this)
+    def GetFromPage(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintDialogData_GetFromPage,(self,) + _args, _kwargs)

         return val
         return val

-    def GetMaxPage(self):
-        val = printfwc.wxPrintDialogData_GetMaxPage(self.this)
+    def GetMaxPage(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintDialogData_GetMaxPage,(self,) + _args, _kwargs)

         return val
         return val

-    def GetMinPage(self):
-        val = printfwc.wxPrintDialogData_GetMinPage(self.this)
+    def GetMinPage(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintDialogData_GetMinPage,(self,) + _args, _kwargs)

         return val
         return val

-    def GetNoCopies(self):
-        val = printfwc.wxPrintDialogData_GetNoCopies(self.this)
+    def GetNoCopies(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintDialogData_GetNoCopies,(self,) + _args, _kwargs)

         return val
         return val

-    def GetPrintData(self):
-        val = printfwc.wxPrintDialogData_GetPrintData(self.this)
-        val = wxPrintDataPtr(val)
-        val.thisown = 1
+    def GetPrintData(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintDialogData_GetPrintData,(self,) + _args, _kwargs)
+        if val: val = wxPrintDataPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetPrintToFile(self):
-        val = printfwc.wxPrintDialogData_GetPrintToFile(self.this)
+    def GetPrintToFile(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintDialogData_GetPrintToFile,(self,) + _args, _kwargs)

         return val
         return val

-    def GetToPage(self):
-        val = printfwc.wxPrintDialogData_GetToPage(self.this)
+    def GetToPage(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintDialogData_GetToPage,(self,) + _args, _kwargs)

         return val
         return val

-    def SetCollate(self,arg0):
-        val = printfwc.wxPrintDialogData_SetCollate(self.this,arg0)
+    def SetCollate(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintDialogData_SetCollate,(self,) + _args, _kwargs)

         return val
         return val

-    def SetFromPage(self,arg0):
-        val = printfwc.wxPrintDialogData_SetFromPage(self.this,arg0)
+    def SetFromPage(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintDialogData_SetFromPage,(self,) + _args, _kwargs)

         return val
         return val

-    def SetMaxPage(self,arg0):
-        val = printfwc.wxPrintDialogData_SetMaxPage(self.this,arg0)
+    def SetMaxPage(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintDialogData_SetMaxPage,(self,) + _args, _kwargs)

         return val
         return val

-    def SetMinPage(self,arg0):
-        val = printfwc.wxPrintDialogData_SetMinPage(self.this,arg0)
+    def SetMinPage(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintDialogData_SetMinPage,(self,) + _args, _kwargs)

         return val
         return val

-    def SetNoCopies(self,arg0):
-        val = printfwc.wxPrintDialogData_SetNoCopies(self.this,arg0)
+    def SetNoCopies(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintDialogData_SetNoCopies,(self,) + _args, _kwargs)

         return val
         return val

-    def SetPrintData(self,arg0):
-        val = printfwc.wxPrintDialogData_SetPrintData(self.this,arg0.this)
+    def SetPrintData(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintDialogData_SetPrintData,(self,) + _args, _kwargs)

         return val
         return val

-    def SetPrintToFile(self,arg0):
-        val = printfwc.wxPrintDialogData_SetPrintToFile(self.this,arg0)
+    def SetPrintToFile(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintDialogData_SetPrintToFile,(self,) + _args, _kwargs)

         return val
         return val

-    def SetSetupDialog(self,arg0):
-        val = printfwc.wxPrintDialogData_SetSetupDialog(self.this,arg0)
+    def SetSetupDialog(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintDialogData_SetSetupDialog,(self,) + _args, _kwargs)

         return val
         return val

-    def SetToPage(self,arg0):
-        val = printfwc.wxPrintDialogData_SetToPage(self.this,arg0)
+    def SetToPage(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintDialogData_SetToPage,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxPrintDialogData instance>"
+        return "<C wxPrintDialogData instance at %s>" % (self.this,)

 class wxPrintDialogData(wxPrintDialogDataPtr):
 class wxPrintDialogData(wxPrintDialogDataPtr):

-    def __init__(self) :
-        self.this = printfwc.new_wxPrintDialogData()
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(printfwc.new_wxPrintDialogData,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -317,27 +306,22 @@ class wxPrintDialogPtr(wxDialogPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetPrintDialogData(self):
-        val = printfwc.wxPrintDialog_GetPrintDialogData(self.this)
-        val = wxPrintDialogDataPtr(val)
+    def GetPrintDialogData(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintDialog_GetPrintDialogData,(self,) + _args, _kwargs)
+        if val: val = wxPrintDialogDataPtr(val) 

         return val
         return val

-    def GetPrintDC(self):
-        val = printfwc.wxPrintDialog_GetPrintDC(self.this)
-        val = wxDCPtr(val)
-        val.thisown = 1
+    def GetPrintDC(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintDialog_GetPrintDC,(self,) + _args, _kwargs)
+        if val: val = wxDCPtr(val) ; val.thisown = 1

         return val
         return val

-    def ShowModal(self):
-        val = printfwc.wxPrintDialog_ShowModal(self.this)
+    def ShowModal(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintDialog_ShowModal,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxPrintDialog instance>"
+        return "<C wxPrintDialog instance at %s>" % (self.this,)

 class wxPrintDialog(wxPrintDialogPtr):
 class wxPrintDialog(wxPrintDialogPtr):

-    def __init__(self,arg0,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(printfwc.new_wxPrintDialog,(arg0.this,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(printfwc.new_wxPrintDialog,_args,_kwargs)

         self.thisown = 1
         wx._StdDialogCallbacks(self)
 
         self.thisown = 1
         wx._StdDialogCallbacks(self)
 


@@ -348,57 +332,57 @@ class wxPrintoutPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def _setSelf(self,arg0):
-        val = printfwc.wxPrintout__setSelf(self.this,arg0)
+    def _setSelf(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintout__setSelf,(self,) + _args, _kwargs)

         return val
         return val

-    def Destroy(self):
-        val = printfwc.wxPrintout_Destroy(self.this)
+    def Destroy(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintout_Destroy,(self,) + _args, _kwargs)

         return val
         return val

-    def GetDC(self):
-        val = printfwc.wxPrintout_GetDC(self.this)
-        val = wxDCPtr(val)
+    def GetDC(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintout_GetDC,(self,) + _args, _kwargs)
+        if val: val = wxDCPtr(val) 

         return val
         return val

-    def GetPageSizeMM(self):
-        val = printfwc.wxPrintout_GetPageSizeMM(self.this)
+    def GetPageSizeMM(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintout_GetPageSizeMM,(self,) + _args, _kwargs)

         return val
         return val

-    def GetPageSizePixels(self):
-        val = printfwc.wxPrintout_GetPageSizePixels(self.this)
+    def GetPageSizePixels(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintout_GetPageSizePixels,(self,) + _args, _kwargs)

         return val
         return val

-    def GetPPIPrinter(self):
-        val = printfwc.wxPrintout_GetPPIPrinter(self.this)
+    def GetPPIPrinter(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintout_GetPPIPrinter,(self,) + _args, _kwargs)

         return val
         return val

-    def GetPPIScreen(self):
-        val = printfwc.wxPrintout_GetPPIScreen(self.this)
+    def GetPPIScreen(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintout_GetPPIScreen,(self,) + _args, _kwargs)

         return val
         return val

-    def IsPreview(self):
-        val = printfwc.wxPrintout_IsPreview(self.this)
+    def IsPreview(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintout_IsPreview,(self,) + _args, _kwargs)

         return val
         return val

-    def base_OnBeginDocument(self,arg0,arg1):
-        val = printfwc.wxPrintout_base_OnBeginDocument(self.this,arg0,arg1)
+    def base_OnBeginDocument(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintout_base_OnBeginDocument,(self,) + _args, _kwargs)

         return val
         return val

-    def base_OnEndDocument(self):
-        val = printfwc.wxPrintout_base_OnEndDocument(self.this)
+    def base_OnEndDocument(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintout_base_OnEndDocument,(self,) + _args, _kwargs)

         return val
         return val

-    def base_OnBeginPrinting(self):
-        val = printfwc.wxPrintout_base_OnBeginPrinting(self.this)
+    def base_OnBeginPrinting(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintout_base_OnBeginPrinting,(self,) + _args, _kwargs)

         return val
         return val

-    def base_OnEndPrinting(self):
-        val = printfwc.wxPrintout_base_OnEndPrinting(self.this)
+    def base_OnEndPrinting(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintout_base_OnEndPrinting,(self,) + _args, _kwargs)

         return val
         return val

-    def base_OnPreparePrinting(self):
-        val = printfwc.wxPrintout_base_OnPreparePrinting(self.this)
+    def base_OnPreparePrinting(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintout_base_OnPreparePrinting,(self,) + _args, _kwargs)

         return val
         return val

-    def base_GetPageInfo(self):
-        val = printfwc.wxPrintout_base_GetPageInfo(self.this)
+    def base_GetPageInfo(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintout_base_GetPageInfo,(self,) + _args, _kwargs)

         return val
         return val

-    def base_HasPage(self,arg0):
-        val = printfwc.wxPrintout_base_HasPage(self.this,arg0)
+    def base_HasPage(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintout_base_HasPage,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxPrintout instance>"
+        return "<C wxPrintout instance at %s>" % (self.this,)

 class wxPrintout(wxPrintoutPtr):
 class wxPrintout(wxPrintoutPtr):

-    def __init__(self,*args) :
-        self.this = apply(printfwc.new_wxPrintout,()+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(printfwc.new_wxPrintout,_args,_kwargs)

         self.thisown = 1
         self._setSelf(self)
 
         self.thisown = 1
         self._setSelf(self)
 


@@ -409,38 +393,34 @@ class wxPrinterPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self, printfwc=printfwc):
+    def __del__(self,printfwc=printfwc):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            printfwc.delete_wxPrinter(self.this)
-    def CreateAbortWindow(self,arg0,arg1):
-        val = printfwc.wxPrinter_CreateAbortWindow(self.this,arg0.this,arg1.this)
+            printfwc.delete_wxPrinter(self)
+    def CreateAbortWindow(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrinter_CreateAbortWindow,(self,) + _args, _kwargs)

         return val
         return val

-    def GetPrintDialogData(self):
-        val = printfwc.wxPrinter_GetPrintDialogData(self.this)
-        val = wxPrintDialogDataPtr(val)
+    def GetPrintDialogData(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrinter_GetPrintDialogData,(self,) + _args, _kwargs)
+        if val: val = wxPrintDialogDataPtr(val) 

         return val
         return val

-    def Print(self,arg0,arg1,*args):
-        val = apply(printfwc.wxPrinter_Print,(self.this,arg0.this,arg1.this,)+args)
+    def Print(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrinter_Print,(self,) + _args, _kwargs)

         return val
         return val

-    def PrintDialog(self,arg0):
-        val = printfwc.wxPrinter_PrintDialog(self.this,arg0.this)
-        val = wxDCPtr(val)
+    def PrintDialog(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrinter_PrintDialog,(self,) + _args, _kwargs)
+        if val: val = wxDCPtr(val) 

         return val
         return val

-    def ReportError(self,arg0,arg1,arg2):
-        val = printfwc.wxPrinter_ReportError(self.this,arg0.this,arg1.this,arg2)
+    def ReportError(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrinter_ReportError,(self,) + _args, _kwargs)

         return val
         return val

-    def Setup(self,arg0):
-        val = printfwc.wxPrinter_Setup(self.this,arg0.this)
+    def Setup(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrinter_Setup,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxPrinter instance>"
+        return "<C wxPrinter instance at %s>" % (self.this,)

 class wxPrinter(wxPrinterPtr):
 class wxPrinter(wxPrinterPtr):

-    def __init__(self,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(printfwc.new_wxPrinter,()+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(printfwc.new_wxPrinter,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -450,68 +430,64 @@ class wxPrintPreviewPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetCanvas(self):
-        val = printfwc.wxPrintPreview_GetCanvas(self.this)
-        val = wxWindowPtr(val)
+    def GetCanvas(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintPreview_GetCanvas,(self,) + _args, _kwargs)
+        if val: val = wxWindowPtr(val) 

         return val
         return val

-    def GetCurrentPage(self):
-        val = printfwc.wxPrintPreview_GetCurrentPage(self.this)
+    def GetCurrentPage(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintPreview_GetCurrentPage,(self,) + _args, _kwargs)

         return val
         return val

-    def GetFrame(self):
-        val = printfwc.wxPrintPreview_GetFrame(self.this)
-        val = wxFramePtr(val)
+    def GetFrame(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintPreview_GetFrame,(self,) + _args, _kwargs)
+        if val: val = wxFramePtr(val) 

         return val
         return val

-    def GetMaxPage(self):
-        val = printfwc.wxPrintPreview_GetMaxPage(self.this)
+    def GetMaxPage(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintPreview_GetMaxPage,(self,) + _args, _kwargs)

         return val
         return val

-    def GetMinPage(self):
-        val = printfwc.wxPrintPreview_GetMinPage(self.this)
+    def GetMinPage(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintPreview_GetMinPage,(self,) + _args, _kwargs)

         return val
         return val

-    def GetPrintDialogData(self):
-        val = printfwc.wxPrintPreview_GetPrintDialogData(self.this)
-        val = wxPrintDialogDataPtr(val)
+    def GetPrintDialogData(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintPreview_GetPrintDialogData,(self,) + _args, _kwargs)
+        if val: val = wxPrintDialogDataPtr(val) 

         return val
         return val

-    def GetPrintout(self):
-        val = printfwc.wxPrintPreview_GetPrintout(self.this)
-        val = wxPrintoutPtr(val)
+    def GetPrintout(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintPreview_GetPrintout,(self,) + _args, _kwargs)
+        if val: val = wxPrintoutPtr(val) 

         return val
         return val

-    def GetPrintoutForPrinting(self):
-        val = printfwc.wxPrintPreview_GetPrintoutForPrinting(self.this)
-        val = wxPrintoutPtr(val)
+    def GetPrintoutForPrinting(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintPreview_GetPrintoutForPrinting,(self,) + _args, _kwargs)
+        if val: val = wxPrintoutPtr(val) 

         return val
         return val

-    def GetZoom(self):
-        val = printfwc.wxPrintPreview_GetZoom(self.this)
+    def GetZoom(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintPreview_GetZoom,(self,) + _args, _kwargs)

         return val
         return val

-    def Ok(self):
-        val = printfwc.wxPrintPreview_Ok(self.this)
+    def Ok(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintPreview_Ok,(self,) + _args, _kwargs)

         return val
         return val

-    def Print(self,arg0):
-        val = printfwc.wxPrintPreview_Print(self.this,arg0)
+    def Print(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintPreview_Print,(self,) + _args, _kwargs)

         return val
         return val

-    def SetCanvas(self,arg0):
-        val = printfwc.wxPrintPreview_SetCanvas(self.this,arg0.this)
+    def SetCanvas(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintPreview_SetCanvas,(self,) + _args, _kwargs)

         return val
         return val

-    def SetCurrentPage(self,arg0):
-        val = printfwc.wxPrintPreview_SetCurrentPage(self.this,arg0)
+    def SetCurrentPage(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintPreview_SetCurrentPage,(self,) + _args, _kwargs)

         return val
         return val

-    def SetFrame(self,arg0):
-        val = printfwc.wxPrintPreview_SetFrame(self.this,arg0.this)
+    def SetFrame(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintPreview_SetFrame,(self,) + _args, _kwargs)

         return val
         return val

-    def SetPrintout(self,arg0):
-        val = printfwc.wxPrintPreview_SetPrintout(self.this,arg0.this)
+    def SetPrintout(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintPreview_SetPrintout,(self,) + _args, _kwargs)

         return val
         return val

-    def SetZoom(self,arg0):
-        val = printfwc.wxPrintPreview_SetZoom(self.this,arg0)
+    def SetZoom(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintPreview_SetZoom,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxPrintPreview instance>"
+        return "<C wxPrintPreview instance at %s>" % (self.this,)

 class wxPrintPreview(wxPrintPreviewPtr):
 class wxPrintPreview(wxPrintPreviewPtr):

-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(printfwc.new_wxPrintPreview,(arg0.this,arg1.this,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(printfwc.new_wxPrintPreview,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -521,20 +497,14 @@ class wxPreviewFramePtr(wxFramePtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def Initialize(self):
-        val = printfwc.wxPreviewFrame_Initialize(self.this)
+    def Initialize(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPreviewFrame_Initialize,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxPreviewFrame instance>"
+        return "<C wxPreviewFrame instance at %s>" % (self.this,)

 class wxPreviewFrame(wxPreviewFramePtr):
 class wxPreviewFrame(wxPreviewFramePtr):

-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(printfwc.new_wxPreviewFrame,(arg0.this,arg1.this,arg2,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(printfwc.new_wxPreviewFrame,_args,_kwargs)

         self.thisown = 1
         wx._StdFrameCallbacks(self)
 
         self.thisown = 1
         wx._StdFrameCallbacks(self)
 

diff --git a/utils/wxPython/src/msw/stattool.cpp b/utils/wxPython/src/msw/stattool.cpp
index 9c0489d7a665fdc14637d10b1b797ab219245c01..85a959ef04280b106fd3c4c009ce326089cded55 100644 (file)
--- a/utils/wxPython/src/msw/stattool.cpp
+++ b/utils/wxPython/src/msw/stattool.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)

- * Version 1.1 (Patch 5)
+ * Version 1.1 (Patch 6)

  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.


@@ -24,16 +24,16 @@
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)

-#      define SWIGEXPORT(a,b) __declspec(dllexport) a b
+#      define SWIGEXPORT(a) __declspec(dllexport) a

 #   else
 #      if defined(__BORLANDC__)
 #   else
 #      if defined(__BORLANDC__)

-#          define SWIGEXPORT(a,b) a _export b
+#          define SWIGEXPORT(a) a _export 

 #      else
 #      else

-#          define SWIGEXPORT(a,b) a b
+#          define SWIGEXPORT(a) a 

 #      endif
 #   endif
 #else
 #      endif
 #   endif
 #else

-#   define SWIGEXPORT(a,b) a b
+#   define SWIGEXPORT(a) a 

 #endif
 
 #ifdef __cplusplus
 #endif
 
 #ifdef __cplusplus


@@ -43,12 +43,12 @@ extern "C" {
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);

+extern char *SWIG_GetPtrObj(PyObject *, void **, char *);

 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif
 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif

-

 #define SWIG_init    initstattoolc
 
 #define SWIG_name    "stattoolc"
 #define SWIG_init    initstattoolc
 
 #define SWIG_name    "stattoolc"


@@ -59,12 +59,13 @@ extern PyObject *SWIG_newvarlink(void);
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;

-    if (!target) {
+    PyObject*   o3;
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);
         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);


@@ -81,23 +82,23 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
     PyObject*   o3;
 
     PyObject*   o2;
     PyObject*   o3;
 

-    if (!target) {
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }
         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }

-        o3 = PyTuple_New(1);
-        PyTuple_SetItem(o3, 0, o);
+        o3 = PyTuple_New(1);            
+        PyTuple_SetItem(o3, 0, o);      

 
         o2 = target;
 
         o2 = target;

-        target = PySequence_Concat(o2, o3);
-        Py_DECREF(o2);
+        target = PySequence_Concat(o2, o3); 
+        Py_DECREF(o2);                      

         Py_DECREF(o3);
     }
     return target;
         Py_DECREF(o3);
     }
     return target;


@@ -115,6 +116,9 @@ extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
 
 
 static char* wxStringErrorMsg = "string type is required for parameter";
 
 
 static char* wxStringErrorMsg = "string type is required for parameter";

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

 static void *SwigwxStatusBarTowxWindow(void *ptr) {
     wxStatusBar *src;
     wxWindow *dest;
 static void *SwigwxStatusBarTowxWindow(void *ptr) {
     wxStatusBar *src;
     wxWindow *dest;


@@ -137,32 +141,35 @@ static PyObject *_wrap_new_wxStatusBar(PyObject *self, PyObject *args) {
     wxStatusBar * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxStatusBar * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;

-    wxPoint * _arg2 = &wxPyDefaultPosition;
-    wxSize * _arg3 = &wxPyDefaultSize;
-    long  _arg4 = (wxST_SIZEGRIP);
-    char * _arg5 = "statusBar";
-    char * _argc0 = 0;
-    char * _argc2 = 0;
-    char * _argc3 = 0;
+    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    long  _arg4 = (long ) wxST_SIZEGRIP;
+    char * _arg5 = (char *) "statusBar";
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;
+    PyObject * _argo3 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si|ssls:new_wxStatusBar",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTuple(args,"Oi|OOls:new_wxStatusBar",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxStatusBar. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxStatusBar. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxStatusBar. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxStatusBar. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxSize_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxStatusBar. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxStatusBar. Expected _wxSize_p.");
         return NULL;
         }


@@ -172,8 +179,13 @@ static PyObject *_wrap_new_wxStatusBar(PyObject *self, PyObject *args) {
         _result = (wxStatusBar *)new_wxStatusBar(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxStatusBar *)new_wxStatusBar(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxStatusBar_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxStatusBar_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -187,14 +199,15 @@ static PyObject *_wrap_wxStatusBar_GetFieldRect(PyObject *self, PyObject *args)
     wxRect * _result;
     wxStatusBar * _arg0;
     long  _arg1;
     wxRect * _result;
     wxStatusBar * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxStatusBar_GetFieldRect",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxStatusBar_GetFieldRect",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxStatusBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStatusBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStatusBar_GetFieldRect. Expected _wxStatusBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStatusBar_GetFieldRect. Expected _wxStatusBar_p.");
         return NULL;
         }


@@ -204,8 +217,13 @@ static PyObject *_wrap_wxStatusBar_GetFieldRect(PyObject *self, PyObject *args)
         _result = (wxRect *)wxStatusBar_GetFieldRect(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxRect *)wxStatusBar_GetFieldRect(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxRect_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxRect_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -214,13 +232,14 @@ static PyObject *_wrap_wxStatusBar_GetFieldsCount(PyObject *self, PyObject *args
     PyObject * _resultobj;
     int  _result;
     wxStatusBar * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxStatusBar * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxStatusBar_GetFieldsCount",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxStatusBar_GetFieldsCount",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxStatusBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStatusBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStatusBar_GetFieldsCount. Expected _wxStatusBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStatusBar_GetFieldsCount. Expected _wxStatusBar_p.");
         return NULL;
         }


@@ -239,14 +258,15 @@ static PyObject *_wrap_wxStatusBar_GetStatusText(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxString * _result;
     wxStatusBar * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxStatusBar * _arg0;

-    int  _arg1 = 0;
-    char * _argc0 = 0;
+    int  _arg1 = (int ) 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxStatusBar_GetStatusText",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"O|i:wxStatusBar_GetStatusText",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxStatusBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStatusBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStatusBar_GetStatusText. Expected _wxStatusBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStatusBar_GetStatusText. Expected _wxStatusBar_p.");
         return NULL;
         }


@@ -271,20 +291,22 @@ static PyObject *_wrap_wxStatusBar_DrawField(PyObject *self, PyObject *args) {
     wxStatusBar * _arg0;
     wxDC * _arg1;
     int  _arg2;
     wxStatusBar * _arg0;
     wxDC * _arg1;
     int  _arg2;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ssi:wxStatusBar_DrawField",&_argc0,&_argc1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"OOi:wxStatusBar_DrawField",&_argo0,&_argo1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxStatusBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStatusBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStatusBar_DrawField. Expected _wxStatusBar_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStatusBar_DrawField. Expected _wxStatusBar_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxDC_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxStatusBar_DrawField. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxStatusBar_DrawField. Expected _wxDC_p.");
         return NULL;
         }


@@ -305,20 +327,22 @@ static PyObject *_wrap_wxStatusBar_DrawFieldText(PyObject *self, PyObject *args)
     wxStatusBar * _arg0;
     wxDC * _arg1;
     int  _arg2;
     wxStatusBar * _arg0;
     wxDC * _arg1;
     int  _arg2;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ssi:wxStatusBar_DrawFieldText",&_argc0,&_argc1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"OOi:wxStatusBar_DrawFieldText",&_argo0,&_argo1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxStatusBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStatusBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStatusBar_DrawFieldText. Expected _wxStatusBar_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStatusBar_DrawFieldText. Expected _wxStatusBar_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxDC_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxStatusBar_DrawFieldText. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxStatusBar_DrawFieldText. Expected _wxDC_p.");
         return NULL;
         }


@@ -337,13 +361,14 @@ static PyObject *_wrap_wxStatusBar_DrawFieldText(PyObject *self, PyObject *args)
 static PyObject *_wrap_wxStatusBar_InitColours(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxStatusBar * _arg0;
 static PyObject *_wrap_wxStatusBar_InitColours(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxStatusBar * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxStatusBar_InitColours",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxStatusBar_InitColours",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxStatusBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStatusBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStatusBar_InitColours. Expected _wxStatusBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStatusBar_InitColours. Expected _wxStatusBar_p.");
         return NULL;
         }


@@ -362,14 +387,15 @@ static PyObject *_wrap_wxStatusBar_InitColours(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxStatusBar_SetFieldsCount(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxStatusBar * _arg0;
 static PyObject *_wrap_wxStatusBar_SetFieldsCount(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxStatusBar * _arg0;

-    int  _arg1 = 1;
-    char * _argc0 = 0;
+    int  _arg1 = (int ) 1;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxStatusBar_SetFieldsCount",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"O|i:wxStatusBar_SetFieldsCount",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxStatusBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStatusBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStatusBar_SetFieldsCount. Expected _wxStatusBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStatusBar_SetFieldsCount. Expected _wxStatusBar_p.");
         return NULL;
         }


@@ -389,15 +415,16 @@ static PyObject *_wrap_wxStatusBar_SetStatusText(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxStatusBar * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxStatusBar * _arg0;
     wxString * _arg1;

-    int  _arg2 = 0;
-    char * _argc0 = 0;
+    int  _arg2 = (int ) 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO|i:wxStatusBar_SetStatusText",&_argc0,&_obj1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"OO|i:wxStatusBar_SetStatusText",&_argo0,&_obj1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxStatusBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStatusBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStatusBar_SetStatusText. Expected _wxStatusBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStatusBar_SetStatusText. Expected _wxStatusBar_p.");
         return NULL;
         }


@@ -429,14 +456,15 @@ static PyObject *_wrap_wxStatusBar_SetStatusWidths(PyObject *self, PyObject *arg
     wxStatusBar * _arg0;
     int  _arg1;
     int * _arg2;
     wxStatusBar * _arg0;
     int  _arg1;
     int * _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
 
     self = self;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxStatusBar_SetStatusWidths",&_argc0,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"OO:wxStatusBar_SetStatusWidths",&_argo0,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxStatusBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStatusBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStatusBar_SetStatusWidths. Expected _wxStatusBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStatusBar_SetStatusWidths. Expected _wxStatusBar_p.");
         return NULL;
         }


@@ -483,8 +511,13 @@ static PyObject *_wrap_new_wxToolBarTool(PyObject *self, PyObject *args) {
         _result = (wxToolBarTool *)new_wxToolBarTool();
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxToolBarTool *)new_wxToolBarTool();
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarTool_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarTool_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -492,13 +525,14 @@ static PyObject *_wrap_new_wxToolBarTool(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxToolBarTool(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxToolBarTool * _arg0;
 static PyObject *_wrap_delete_wxToolBarTool(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxToolBarTool * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:delete_wxToolBarTool",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxToolBarTool",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxToolBarTool. Expected _wxToolBarTool_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxToolBarTool. Expected _wxToolBarTool_p.");
         return NULL;
         }


@@ -519,13 +553,14 @@ static PyObject *_wrap_wxToolBarTool_SetSize(PyObject *self, PyObject *args) {
     wxToolBarTool * _arg0;
     long  _arg1;
     long  _arg2;
     wxToolBarTool * _arg0;
     long  _arg1;
     long  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sll:wxToolBarTool_SetSize",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oll:wxToolBarTool_SetSize",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_SetSize. Expected _wxToolBarTool_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_SetSize. Expected _wxToolBarTool_p.");
         return NULL;
         }


@@ -545,13 +580,14 @@ static PyObject *_wrap_wxToolBarTool_GetWidth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxToolBarTool * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxToolBarTool * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_GetWidth",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_GetWidth",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_GetWidth. Expected _wxToolBarTool_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_GetWidth. Expected _wxToolBarTool_p.");
         return NULL;
         }


@@ -570,13 +606,14 @@ static PyObject *_wrap_wxToolBarTool_GetHeight(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxToolBarTool * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxToolBarTool * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_GetHeight",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_GetHeight",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_GetHeight. Expected _wxToolBarTool_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_GetHeight. Expected _wxToolBarTool_p.");
         return NULL;
         }


@@ -596,13 +633,14 @@ static PyObject *_wrap_wxToolBarTool_m_toolStyle_set(PyObject *self, PyObject *a
     int  _result;
     wxToolBarTool * _arg0;
     int  _arg1;
     int  _result;
     wxToolBarTool * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxToolBarTool_m_toolStyle_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxToolBarTool_m_toolStyle_set",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_toolStyle_set. Expected _wxToolBarTool_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_toolStyle_set. Expected _wxToolBarTool_p.");
         return NULL;
         }


@@ -621,13 +659,14 @@ static PyObject *_wrap_wxToolBarTool_m_toolStyle_get(PyObject *self, PyObject *a
     PyObject * _resultobj;
     int  _result;
     wxToolBarTool * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxToolBarTool * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_toolStyle_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_toolStyle_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_toolStyle_get. Expected _wxToolBarTool_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_toolStyle_get. Expected _wxToolBarTool_p.");
         return NULL;
         }


@@ -647,21 +686,23 @@ static PyObject *_wrap_wxToolBarTool_m_clientData_set(PyObject *self, PyObject *
     wxObject * _result;
     wxToolBarTool * _arg0;
     wxObject * _arg1;
     wxObject * _result;
     wxToolBarTool * _arg0;
     wxObject * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxToolBarTool_m_clientData_set",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxToolBarTool_m_clientData_set",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_clientData_set. Expected _wxToolBarTool_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_clientData_set. Expected _wxToolBarTool_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxObject_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxObject_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBarTool_m_clientData_set. Expected _wxObject_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBarTool_m_clientData_set. Expected _wxObject_p.");
         return NULL;
         }


@@ -671,8 +712,13 @@ static PyObject *_wrap_wxToolBarTool_m_clientData_set(PyObject *self, PyObject *
         _result = (wxObject *)wxToolBarTool_m_clientData_set(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxObject *)wxToolBarTool_m_clientData_set(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxObject_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxObject_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -681,14 +727,15 @@ static PyObject *_wrap_wxToolBarTool_m_clientData_get(PyObject *self, PyObject *
     PyObject * _resultobj;
     wxObject * _result;
     wxToolBarTool * _arg0;
     PyObject * _resultobj;
     wxObject * _result;
     wxToolBarTool * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_clientData_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_clientData_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_clientData_get. Expected _wxToolBarTool_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_clientData_get. Expected _wxToolBarTool_p.");
         return NULL;
         }


@@ -698,8 +745,13 @@ static PyObject *_wrap_wxToolBarTool_m_clientData_get(PyObject *self, PyObject *
         _result = (wxObject *)wxToolBarTool_m_clientData_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxObject *)wxToolBarTool_m_clientData_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxObject_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxObject_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -709,13 +761,14 @@ static PyObject *_wrap_wxToolBarTool_m_index_set(PyObject *self, PyObject *args)
     int  _result;
     wxToolBarTool * _arg0;
     int  _arg1;
     int  _result;
     wxToolBarTool * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxToolBarTool_m_index_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxToolBarTool_m_index_set",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_index_set. Expected _wxToolBarTool_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_index_set. Expected _wxToolBarTool_p.");
         return NULL;
         }


@@ -734,13 +787,14 @@ static PyObject *_wrap_wxToolBarTool_m_index_get(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     int  _result;
     wxToolBarTool * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxToolBarTool * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_index_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_index_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_index_get. Expected _wxToolBarTool_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_index_get. Expected _wxToolBarTool_p.");
         return NULL;
         }


@@ -760,13 +814,14 @@ static PyObject *_wrap_wxToolBarTool_m_x_set(PyObject *self, PyObject *args) {
     long  _result;
     wxToolBarTool * _arg0;
     long  _arg1;
     long  _result;
     wxToolBarTool * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxToolBarTool_m_x_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxToolBarTool_m_x_set",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_x_set. Expected _wxToolBarTool_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_x_set. Expected _wxToolBarTool_p.");
         return NULL;
         }


@@ -785,13 +840,14 @@ static PyObject *_wrap_wxToolBarTool_m_x_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxToolBarTool * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxToolBarTool * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_x_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_x_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_x_get. Expected _wxToolBarTool_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_x_get. Expected _wxToolBarTool_p.");
         return NULL;
         }


@@ -811,13 +867,14 @@ static PyObject *_wrap_wxToolBarTool_m_y_set(PyObject *self, PyObject *args) {
     long  _result;
     wxToolBarTool * _arg0;
     long  _arg1;
     long  _result;
     wxToolBarTool * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxToolBarTool_m_y_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxToolBarTool_m_y_set",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_y_set. Expected _wxToolBarTool_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_y_set. Expected _wxToolBarTool_p.");
         return NULL;
         }


@@ -836,13 +893,14 @@ static PyObject *_wrap_wxToolBarTool_m_y_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxToolBarTool * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxToolBarTool * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_y_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_y_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_y_get. Expected _wxToolBarTool_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_y_get. Expected _wxToolBarTool_p.");
         return NULL;
         }


@@ -862,13 +920,14 @@ static PyObject *_wrap_wxToolBarTool_m_width_set(PyObject *self, PyObject *args)
     long  _result;
     wxToolBarTool * _arg0;
     long  _arg1;
     long  _result;
     wxToolBarTool * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxToolBarTool_m_width_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxToolBarTool_m_width_set",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_width_set. Expected _wxToolBarTool_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_width_set. Expected _wxToolBarTool_p.");
         return NULL;
         }


@@ -887,13 +946,14 @@ static PyObject *_wrap_wxToolBarTool_m_width_get(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     long  _result;
     wxToolBarTool * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxToolBarTool * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_width_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_width_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_width_get. Expected _wxToolBarTool_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_width_get. Expected _wxToolBarTool_p.");
         return NULL;
         }


@@ -913,13 +973,14 @@ static PyObject *_wrap_wxToolBarTool_m_height_set(PyObject *self, PyObject *args
     long  _result;
     wxToolBarTool * _arg0;
     long  _arg1;
     long  _result;
     wxToolBarTool * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxToolBarTool_m_height_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxToolBarTool_m_height_set",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_height_set. Expected _wxToolBarTool_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_height_set. Expected _wxToolBarTool_p.");
         return NULL;
         }


@@ -938,13 +999,14 @@ static PyObject *_wrap_wxToolBarTool_m_height_get(PyObject *self, PyObject *args
     PyObject * _resultobj;
     long  _result;
     wxToolBarTool * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxToolBarTool * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_height_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_height_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_height_get. Expected _wxToolBarTool_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_height_get. Expected _wxToolBarTool_p.");
         return NULL;
         }


@@ -964,14 +1026,15 @@ static PyObject *_wrap_wxToolBarTool_m_toggleState_set(PyObject *self, PyObject
     bool  _result;
     wxToolBarTool * _arg0;
     bool  _arg1;
     bool  _result;
     wxToolBarTool * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxToolBarTool_m_toggleState_set",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxToolBarTool_m_toggleState_set",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_toggleState_set. Expected _wxToolBarTool_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_toggleState_set. Expected _wxToolBarTool_p.");
         return NULL;
         }


@@ -991,13 +1054,14 @@ static PyObject *_wrap_wxToolBarTool_m_toggleState_get(PyObject *self, PyObject
     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_toggleState_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_toggleState_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_toggleState_get. Expected _wxToolBarTool_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_toggleState_get. Expected _wxToolBarTool_p.");
         return NULL;
         }


@@ -1017,14 +1081,15 @@ static PyObject *_wrap_wxToolBarTool_m_isToggle_set(PyObject *self, PyObject *ar
     bool  _result;
     wxToolBarTool * _arg0;
     bool  _arg1;
     bool  _result;
     wxToolBarTool * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxToolBarTool_m_isToggle_set",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxToolBarTool_m_isToggle_set",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_isToggle_set. Expected _wxToolBarTool_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_isToggle_set. Expected _wxToolBarTool_p.");
         return NULL;
         }


@@ -1044,13 +1109,14 @@ static PyObject *_wrap_wxToolBarTool_m_isToggle_get(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_isToggle_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_isToggle_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_isToggle_get. Expected _wxToolBarTool_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_isToggle_get. Expected _wxToolBarTool_p.");
         return NULL;
         }


@@ -1070,14 +1136,15 @@ static PyObject *_wrap_wxToolBarTool_m_deleteSecondBitmap_set(PyObject *self, Py
     bool  _result;
     wxToolBarTool * _arg0;
     bool  _arg1;
     bool  _result;
     wxToolBarTool * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxToolBarTool_m_deleteSecondBitmap_set",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxToolBarTool_m_deleteSecondBitmap_set",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_deleteSecondBitmap_set. Expected _wxToolBarTool_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_deleteSecondBitmap_set. Expected _wxToolBarTool_p.");
         return NULL;
         }


@@ -1097,13 +1164,14 @@ static PyObject *_wrap_wxToolBarTool_m_deleteSecondBitmap_get(PyObject *self, Py
     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_deleteSecondBitmap_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_deleteSecondBitmap_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_deleteSecondBitmap_get. Expected _wxToolBarTool_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_deleteSecondBitmap_get. Expected _wxToolBarTool_p.");
         return NULL;
         }


@@ -1123,14 +1191,15 @@ static PyObject *_wrap_wxToolBarTool_m_enabled_set(PyObject *self, PyObject *arg
     bool  _result;
     wxToolBarTool * _arg0;
     bool  _arg1;
     bool  _result;
     wxToolBarTool * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxToolBarTool_m_enabled_set",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxToolBarTool_m_enabled_set",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_enabled_set. Expected _wxToolBarTool_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_enabled_set. Expected _wxToolBarTool_p.");
         return NULL;
         }


@@ -1150,13 +1219,14 @@ static PyObject *_wrap_wxToolBarTool_m_enabled_get(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_enabled_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_enabled_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_enabled_get. Expected _wxToolBarTool_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_enabled_get. Expected _wxToolBarTool_p.");
         return NULL;
         }


@@ -1176,21 +1246,23 @@ static PyObject *_wrap_wxToolBarTool_m_bitmap1_set(PyObject *self, PyObject *arg
     wxBitmap * _result;
     wxToolBarTool * _arg0;
     wxBitmap * _arg1;
     wxBitmap * _result;
     wxToolBarTool * _arg0;
     wxBitmap * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxToolBarTool_m_bitmap1_set",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxToolBarTool_m_bitmap1_set",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_bitmap1_set. Expected _wxToolBarTool_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_bitmap1_set. Expected _wxToolBarTool_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBarTool_m_bitmap1_set. Expected _wxBitmap_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBarTool_m_bitmap1_set. Expected _wxBitmap_p.");
         return NULL;
         }


@@ -1200,8 +1272,13 @@ static PyObject *_wrap_wxToolBarTool_m_bitmap1_set(PyObject *self, PyObject *arg
         _result = (wxBitmap *)wxToolBarTool_m_bitmap1_set(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxBitmap *)wxToolBarTool_m_bitmap1_set(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1210,14 +1287,15 @@ static PyObject *_wrap_wxToolBarTool_m_bitmap1_get(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     wxBitmap * _result;
     wxToolBarTool * _arg0;
     PyObject * _resultobj;
     wxBitmap * _result;
     wxToolBarTool * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_bitmap1_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_bitmap1_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_bitmap1_get. Expected _wxToolBarTool_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_bitmap1_get. Expected _wxToolBarTool_p.");
         return NULL;
         }


@@ -1227,8 +1305,13 @@ static PyObject *_wrap_wxToolBarTool_m_bitmap1_get(PyObject *self, PyObject *arg
         _result = (wxBitmap *)wxToolBarTool_m_bitmap1_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxBitmap *)wxToolBarTool_m_bitmap1_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1238,21 +1321,23 @@ static PyObject *_wrap_wxToolBarTool_m_bitmap2_set(PyObject *self, PyObject *arg
     wxBitmap * _result;
     wxToolBarTool * _arg0;
     wxBitmap * _arg1;
     wxBitmap * _result;
     wxToolBarTool * _arg0;
     wxBitmap * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxToolBarTool_m_bitmap2_set",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxToolBarTool_m_bitmap2_set",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_bitmap2_set. Expected _wxToolBarTool_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_bitmap2_set. Expected _wxToolBarTool_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBarTool_m_bitmap2_set. Expected _wxBitmap_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBarTool_m_bitmap2_set. Expected _wxBitmap_p.");
         return NULL;
         }


@@ -1262,8 +1347,13 @@ static PyObject *_wrap_wxToolBarTool_m_bitmap2_set(PyObject *self, PyObject *arg
         _result = (wxBitmap *)wxToolBarTool_m_bitmap2_set(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxBitmap *)wxToolBarTool_m_bitmap2_set(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1272,14 +1362,15 @@ static PyObject *_wrap_wxToolBarTool_m_bitmap2_get(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     wxBitmap * _result;
     wxToolBarTool * _arg0;
     PyObject * _resultobj;
     wxBitmap * _result;
     wxToolBarTool * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_bitmap2_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_bitmap2_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_bitmap2_get. Expected _wxToolBarTool_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_bitmap2_get. Expected _wxToolBarTool_p.");
         return NULL;
         }


@@ -1289,8 +1380,13 @@ static PyObject *_wrap_wxToolBarTool_m_bitmap2_get(PyObject *self, PyObject *arg
         _result = (wxBitmap *)wxToolBarTool_m_bitmap2_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxBitmap *)wxToolBarTool_m_bitmap2_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1300,14 +1396,15 @@ static PyObject *_wrap_wxToolBarTool_m_isMenuCommand_set(PyObject *self, PyObjec
     bool  _result;
     wxToolBarTool * _arg0;
     bool  _arg1;
     bool  _result;
     wxToolBarTool * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxToolBarTool_m_isMenuCommand_set",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxToolBarTool_m_isMenuCommand_set",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_isMenuCommand_set. Expected _wxToolBarTool_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_isMenuCommand_set. Expected _wxToolBarTool_p.");
         return NULL;
         }


@@ -1327,13 +1424,14 @@ static PyObject *_wrap_wxToolBarTool_m_isMenuCommand_get(PyObject *self, PyObjec
     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_isMenuCommand_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_isMenuCommand_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_isMenuCommand_get. Expected _wxToolBarTool_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_isMenuCommand_get. Expected _wxToolBarTool_p.");
         return NULL;
         }


@@ -1353,14 +1451,15 @@ static PyObject *_wrap_wxToolBarTool_m_shortHelpString_set(PyObject *self, PyObj
     wxString * _result;
     wxToolBarTool * _arg0;
     wxString * _arg1;
     wxString * _result;
     wxToolBarTool * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxToolBarTool_m_shortHelpString_set",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxToolBarTool_m_shortHelpString_set",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_shortHelpString_set. Expected _wxToolBarTool_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_shortHelpString_set. Expected _wxToolBarTool_p.");
         return NULL;
         }


@@ -1392,13 +1491,14 @@ static PyObject *_wrap_wxToolBarTool_m_shortHelpString_get(PyObject *self, PyObj
     PyObject * _resultobj;
     wxString * _result;
     wxToolBarTool * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxToolBarTool * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_shortHelpString_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_shortHelpString_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_shortHelpString_get. Expected _wxToolBarTool_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_shortHelpString_get. Expected _wxToolBarTool_p.");
         return NULL;
         }


@@ -1420,14 +1520,15 @@ static PyObject *_wrap_wxToolBarTool_m_longHelpString_set(PyObject *self, PyObje
     wxString * _result;
     wxToolBarTool * _arg0;
     wxString * _arg1;
     wxString * _result;
     wxToolBarTool * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxToolBarTool_m_longHelpString_set",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxToolBarTool_m_longHelpString_set",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_longHelpString_set. Expected _wxToolBarTool_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_longHelpString_set. Expected _wxToolBarTool_p.");
         return NULL;
         }


@@ -1459,13 +1560,14 @@ static PyObject *_wrap_wxToolBarTool_m_longHelpString_get(PyObject *self, PyObje
     PyObject * _resultobj;
     wxString * _result;
     wxToolBarTool * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxToolBarTool * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_longHelpString_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_longHelpString_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_longHelpString_get. Expected _wxToolBarTool_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_longHelpString_get. Expected _wxToolBarTool_p.");
         return NULL;
         }


@@ -1511,32 +1613,35 @@ static PyObject *_wrap_new_wxToolBar(PyObject *self, PyObject *args) {
     wxToolBar * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxToolBar * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;

-    wxPoint * _arg2 = &wxPyDefaultPosition;
-    wxSize * _arg3 = &wxPyDefaultSize;
-    long  _arg4 = (wxTB_HORIZONTAL)|(wxNO_BORDER);
-    char * _arg5 = "toolBar";
-    char * _argc0 = 0;
-    char * _argc2 = 0;
-    char * _argc3 = 0;
+    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    long  _arg4 = (long ) wxTB_HORIZONTAL|wxNO_BORDER;
+    char * _arg5 = (char *) "toolBar";
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;
+    PyObject * _argo3 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si|ssls:new_wxToolBar",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTuple(args,"Oi|OOls:new_wxToolBar",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxToolBar. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxToolBar. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxToolBar. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxToolBar. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxSize_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxToolBar. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxToolBar. Expected _wxSize_p.");
         return NULL;
         }


@@ -1546,8 +1651,13 @@ static PyObject *_wrap_new_wxToolBar(PyObject *self, PyObject *args) {
         _result = (wxToolBar *)new_wxToolBar(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxToolBar *)new_wxToolBar(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBar_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBar_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1555,13 +1665,14 @@ static PyObject *_wrap_new_wxToolBar(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxToolBar_AddSeparator(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxToolBar * _arg0;
 static PyObject *_wrap_wxToolBar_AddSeparator(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxToolBar * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBar_AddSeparator",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxToolBar_AddSeparator",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_AddSeparator. Expected _wxToolBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_AddSeparator. Expected _wxToolBar_p.");
         return NULL;
         }


@@ -1587,36 +1698,39 @@ static PyObject *_wrap_wxToolBar_AddTool(PyObject *self, PyObject *args) {
     wxToolBar * _arg0;
     int  _arg1;
     wxBitmap * _arg2;
     wxToolBar * _arg0;
     int  _arg1;
     wxBitmap * _arg2;

-    wxBitmap * _arg3 = &wxNullBitmap;
-    int  _arg4 = (0);
-    long  _arg5 = -1;
-    long  _arg6 = -1;
-    wxString * _arg7 = &wxPyEmptyStr;
-    wxString * _arg8 = &wxPyEmptyStr;
-    char * _argc0 = 0;
-    char * _argc2 = 0;
-    char * _argc3 = 0;
+    wxBitmap * _arg3 = (wxBitmap *) &wxNullBitmap;
+    int  _arg4 = (int ) FALSE;
+    long  _arg5 = (long ) -1;
+    long  _arg6 = (long ) -1;
+    wxString * _arg7 = (wxString *) &wxPyEmptyStr;
+    wxString * _arg8 = (wxString *) &wxPyEmptyStr;
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;
+    PyObject * _argo3 = 0;

     PyObject * _obj7 = 0;
     PyObject * _obj8 = 0;
     char _ptemp[128];
 
     self = self;
     PyObject * _obj7 = 0;
     PyObject * _obj8 = 0;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sis|sillOO:wxToolBar_AddTool",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_arg5,&_arg6,&_obj7,&_obj8)) 
+    if(!PyArg_ParseTuple(args,"OiO|OillOO:wxToolBar_AddTool",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5,&_arg6,&_obj7,&_obj8)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_AddTool. Expected _wxToolBar_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_AddTool. Expected _wxToolBar_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxBitmap_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxToolBar_AddTool. Expected _wxBitmap_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxToolBar_AddTool. Expected _wxBitmap_p.");
         return NULL;
         }
     }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxBitmap_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxToolBar_AddTool. Expected _wxBitmap_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxToolBar_AddTool. Expected _wxBitmap_p.");
         return NULL;
         }


@@ -1642,8 +1756,13 @@ static PyObject *_wrap_wxToolBar_AddTool(PyObject *self, PyObject *args) {
         _result = (wxToolBarTool *)wxToolBar_AddTool(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5,_arg6,*_arg7,*_arg8);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxToolBarTool *)wxToolBar_AddTool(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5,_arg6,*_arg7,*_arg8);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarTool_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarTool_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     if (_obj7)
         delete _arg7;
 {
     if (_obj7)
         delete _arg7;


@@ -1666,25 +1785,27 @@ static PyObject *_wrap_wxToolBar_AddSimpleTool(PyObject *self, PyObject *args) {
     wxToolBar * _arg0;
     int  _arg1;
     wxBitmap * _arg2;
     wxToolBar * _arg0;
     int  _arg1;
     wxBitmap * _arg2;

-    wxString * _arg3 = &wxPyEmptyStr;
-    wxString * _arg4 = &wxPyEmptyStr;
-    char * _argc0 = 0;
-    char * _argc2 = 0;
+    wxString * _arg3 = (wxString *) &wxPyEmptyStr;
+    wxString * _arg4 = (wxString *) &wxPyEmptyStr;
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;

     PyObject * _obj3 = 0;
     PyObject * _obj4 = 0;
     char _ptemp[128];
 
     self = self;
     PyObject * _obj3 = 0;
     PyObject * _obj4 = 0;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sis|OO:wxToolBar_AddSimpleTool",&_argc0,&_arg1,&_argc2,&_obj3,&_obj4)) 
+    if(!PyArg_ParseTuple(args,"OiO|OO:wxToolBar_AddSimpleTool",&_argo0,&_arg1,&_argo2,&_obj3,&_obj4)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_AddSimpleTool. Expected _wxToolBar_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_AddSimpleTool. Expected _wxToolBar_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxBitmap_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxToolBar_AddSimpleTool. Expected _wxBitmap_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxToolBar_AddSimpleTool. Expected _wxBitmap_p.");
         return NULL;
         }


@@ -1710,8 +1831,13 @@ static PyObject *_wrap_wxToolBar_AddSimpleTool(PyObject *self, PyObject *args) {
         _result = (wxToolBarTool *)wxToolBar_AddSimpleTool(_arg0,_arg1,*_arg2,*_arg3,*_arg4);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxToolBarTool *)wxToolBar_AddSimpleTool(_arg0,_arg1,*_arg2,*_arg3,*_arg4);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarTool_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarTool_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     if (_obj3)
         delete _arg3;
 {
     if (_obj3)
         delete _arg3;


@@ -1729,14 +1855,15 @@ static PyObject *_wrap_wxToolBar_EnableTool(PyObject *self, PyObject *args) {
     wxToolBar * _arg0;
     int  _arg1;
     bool  _arg2;
     wxToolBar * _arg0;
     int  _arg1;
     bool  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool2;
 
     self = self;
     int tempbool2;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxToolBar_EnableTool",&_argc0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxToolBar_EnableTool",&_argo0,&_arg1,&tempbool2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_EnableTool. Expected _wxToolBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_EnableTool. Expected _wxToolBar_p.");
         return NULL;
         }


@@ -1759,14 +1886,15 @@ static PyObject *_wrap_wxToolBar_FindToolForPosition(PyObject *self, PyObject *a
     wxToolBar * _arg0;
     float  _arg1;
     float  _arg2;
     wxToolBar * _arg0;
     float  _arg1;
     float  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sff:wxToolBar_FindToolForPosition",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Off:wxToolBar_FindToolForPosition",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_FindToolForPosition. Expected _wxToolBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_FindToolForPosition. Expected _wxToolBar_p.");
         return NULL;
         }


@@ -1776,8 +1904,13 @@ static PyObject *_wrap_wxToolBar_FindToolForPosition(PyObject *self, PyObject *a
         _result = (wxToolBarTool *)wxToolBar_FindToolForPosition(_arg0,_arg1,_arg2);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxToolBarTool *)wxToolBar_FindToolForPosition(_arg0,_arg1,_arg2);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarTool_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarTool_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1786,14 +1919,15 @@ static PyObject *_wrap_wxToolBar_GetToolSize(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxSize * _result;
     wxToolBar * _arg0;
     PyObject * _resultobj;
     wxSize * _result;
     wxToolBar * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBar_GetToolSize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxToolBar_GetToolSize",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolSize. Expected _wxToolBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolSize. Expected _wxToolBar_p.");
         return NULL;
         }


@@ -1813,14 +1947,15 @@ static PyObject *_wrap_wxToolBar_GetToolBitmapSize(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     wxSize * _result;
     wxToolBar * _arg0;
     PyObject * _resultobj;
     wxSize * _result;
     wxToolBar * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBar_GetToolBitmapSize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxToolBar_GetToolBitmapSize",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolBitmapSize. Expected _wxToolBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolBitmapSize. Expected _wxToolBar_p.");
         return NULL;
         }


@@ -1840,20 +1975,22 @@ static PyObject *_wrap_wxToolBar_SetToolBitmapSize(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     wxToolBar * _arg0;
     wxSize * _arg1;
     PyObject * _resultobj;
     wxToolBar * _arg0;
     wxSize * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxToolBar_SetToolBitmapSize",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxToolBar_SetToolBitmapSize",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_SetToolBitmapSize. Expected _wxToolBar_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_SetToolBitmapSize. Expected _wxToolBar_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxSize_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBar_SetToolBitmapSize. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBar_SetToolBitmapSize. Expected _wxSize_p.");
         return NULL;
         }


@@ -1873,14 +2010,15 @@ static PyObject *_wrap_wxToolBar_GetMaxSize(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxSize * _result;
     wxToolBar * _arg0;
     PyObject * _resultobj;
     wxSize * _result;
     wxToolBar * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBar_GetMaxSize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxToolBar_GetMaxSize",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetMaxSize. Expected _wxToolBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetMaxSize. Expected _wxToolBar_p.");
         return NULL;
         }


@@ -1901,13 +2039,14 @@ static PyObject *_wrap_wxToolBar_GetToolEnabled(PyObject *self, PyObject *args)
     bool  _result;
     wxToolBar * _arg0;
     int  _arg1;
     bool  _result;
     wxToolBar * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxToolBar_GetToolEnabled",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxToolBar_GetToolEnabled",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolEnabled. Expected _wxToolBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolEnabled. Expected _wxToolBar_p.");
         return NULL;
         }


@@ -1927,13 +2066,14 @@ static PyObject *_wrap_wxToolBar_GetToolLongHelp(PyObject *self, PyObject *args)
     wxString * _result;
     wxToolBar * _arg0;
     int  _arg1;
     wxString * _result;
     wxToolBar * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxToolBar_GetToolLongHelp",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxToolBar_GetToolLongHelp",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolLongHelp. Expected _wxToolBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolLongHelp. Expected _wxToolBar_p.");
         return NULL;
         }


@@ -1957,13 +2097,14 @@ static PyObject *_wrap_wxToolBar_GetToolPacking(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     int  _result;
     wxToolBar * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxToolBar * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBar_GetToolPacking",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxToolBar_GetToolPacking",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolPacking. Expected _wxToolBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolPacking. Expected _wxToolBar_p.");
         return NULL;
         }


@@ -1982,13 +2123,14 @@ static PyObject *_wrap_wxToolBar_GetToolSeparation(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     int  _result;
     wxToolBar * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxToolBar * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBar_GetToolSeparation",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxToolBar_GetToolSeparation",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolSeparation. Expected _wxToolBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolSeparation. Expected _wxToolBar_p.");
         return NULL;
         }


@@ -2008,13 +2150,14 @@ static PyObject *_wrap_wxToolBar_GetToolShortHelp(PyObject *self, PyObject *args
     wxString * _result;
     wxToolBar * _arg0;
     int  _arg1;
     wxString * _result;
     wxToolBar * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxToolBar_GetToolShortHelp",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxToolBar_GetToolShortHelp",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolShortHelp. Expected _wxToolBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolShortHelp. Expected _wxToolBar_p.");
         return NULL;
         }


@@ -2039,13 +2182,14 @@ static PyObject *_wrap_wxToolBar_GetToolState(PyObject *self, PyObject *args) {
     bool  _result;
     wxToolBar * _arg0;
     int  _arg1;
     bool  _result;
     wxToolBar * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxToolBar_GetToolState",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxToolBar_GetToolState",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolState. Expected _wxToolBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolState. Expected _wxToolBar_p.");
         return NULL;
         }


@@ -2064,13 +2208,14 @@ static PyObject *_wrap_wxToolBar_Realize(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxToolBar * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxToolBar * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBar_Realize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxToolBar_Realize",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_Realize. Expected _wxToolBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_Realize. Expected _wxToolBar_p.");
         return NULL;
         }


@@ -2090,14 +2235,15 @@ static PyObject *_wrap_wxToolBar_SetToolLongHelp(PyObject *self, PyObject *args)
     wxToolBar * _arg0;
     int  _arg1;
     wxString * _arg2;
     wxToolBar * _arg0;
     int  _arg1;
     wxString * _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
 
     self = self;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siO:wxToolBar_SetToolLongHelp",&_argc0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"OiO:wxToolBar_SetToolLongHelp",&_argo0,&_arg1,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_SetToolLongHelp. Expected _wxToolBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_SetToolLongHelp. Expected _wxToolBar_p.");
         return NULL;
         }


@@ -2129,14 +2275,15 @@ static PyObject *_wrap_wxToolBar_SetToolShortHelp(PyObject *self, PyObject *args
     wxToolBar * _arg0;
     int  _arg1;
     wxString * _arg2;
     wxToolBar * _arg0;
     int  _arg1;
     wxString * _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
 
     self = self;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siO:wxToolBar_SetToolShortHelp",&_argc0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"OiO:wxToolBar_SetToolShortHelp",&_argo0,&_arg1,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_SetToolShortHelp. Expected _wxToolBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_SetToolShortHelp. Expected _wxToolBar_p.");
         return NULL;
         }


@@ -2167,20 +2314,22 @@ static PyObject *_wrap_wxToolBar_SetMargins(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxToolBar * _arg0;
     wxSize * _arg1;
     PyObject * _resultobj;
     wxToolBar * _arg0;
     wxSize * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxToolBar_SetMargins",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxToolBar_SetMargins",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_SetMargins. Expected _wxToolBar_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_SetMargins. Expected _wxToolBar_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxSize_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBar_SetMargins. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBar_SetMargins. Expected _wxSize_p.");
         return NULL;
         }


@@ -2200,13 +2349,14 @@ static PyObject *_wrap_wxToolBar_SetToolPacking(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxToolBar * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxToolBar * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxToolBar_SetToolPacking",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxToolBar_SetToolPacking",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_SetToolPacking. Expected _wxToolBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_SetToolPacking. Expected _wxToolBar_p.");
         return NULL;
         }


@@ -2226,13 +2376,14 @@ static PyObject *_wrap_wxToolBar_SetToolSeparation(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     wxToolBar * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxToolBar * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxToolBar_SetToolSeparation",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxToolBar_SetToolSeparation",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_SetToolSeparation. Expected _wxToolBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_SetToolSeparation. Expected _wxToolBar_p.");
         return NULL;
         }


@@ -2253,14 +2404,15 @@ static PyObject *_wrap_wxToolBar_ToggleTool(PyObject *self, PyObject *args) {
     wxToolBar * _arg0;
     int  _arg1;
     bool  _arg2;
     wxToolBar * _arg0;
     int  _arg1;
     bool  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool2;
 
     self = self;
     int tempbool2;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxToolBar_ToggleTool",&_argc0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxToolBar_ToggleTool",&_argo0,&_arg1,&tempbool2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_ToggleTool. Expected _wxToolBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_ToggleTool. Expected _wxToolBar_p.");
         return NULL;
         }


@@ -2277,341 +2429,351 @@ static PyObject *_wrap_wxToolBar_ToggleTool(PyObject *self, PyObject *args) {
 }
 
 static PyMethodDef stattoolcMethods[] = {
 }
 
 static PyMethodDef stattoolcMethods[] = {

-        { "wxToolBar_ToggleTool", _wrap_wxToolBar_ToggleTool, 1 },
-        { "wxToolBar_SetToolSeparation", _wrap_wxToolBar_SetToolSeparation, 1 },
-        { "wxToolBar_SetToolPacking", _wrap_wxToolBar_SetToolPacking, 1 },
-        { "wxToolBar_SetMargins", _wrap_wxToolBar_SetMargins, 1 },
-        { "wxToolBar_SetToolShortHelp", _wrap_wxToolBar_SetToolShortHelp, 1 },
-        { "wxToolBar_SetToolLongHelp", _wrap_wxToolBar_SetToolLongHelp, 1 },
-        { "wxToolBar_Realize", _wrap_wxToolBar_Realize, 1 },
-        { "wxToolBar_GetToolState", _wrap_wxToolBar_GetToolState, 1 },
-        { "wxToolBar_GetToolShortHelp", _wrap_wxToolBar_GetToolShortHelp, 1 },
-        { "wxToolBar_GetToolSeparation", _wrap_wxToolBar_GetToolSeparation, 1 },
-        { "wxToolBar_GetToolPacking", _wrap_wxToolBar_GetToolPacking, 1 },
-        { "wxToolBar_GetToolLongHelp", _wrap_wxToolBar_GetToolLongHelp, 1 },
-        { "wxToolBar_GetToolEnabled", _wrap_wxToolBar_GetToolEnabled, 1 },
-        { "wxToolBar_GetMaxSize", _wrap_wxToolBar_GetMaxSize, 1 },
-        { "wxToolBar_SetToolBitmapSize", _wrap_wxToolBar_SetToolBitmapSize, 1 },
-        { "wxToolBar_GetToolBitmapSize", _wrap_wxToolBar_GetToolBitmapSize, 1 },
-        { "wxToolBar_GetToolSize", _wrap_wxToolBar_GetToolSize, 1 },
-        { "wxToolBar_FindToolForPosition", _wrap_wxToolBar_FindToolForPosition, 1 },
-        { "wxToolBar_EnableTool", _wrap_wxToolBar_EnableTool, 1 },
-        { "wxToolBar_AddSimpleTool", _wrap_wxToolBar_AddSimpleTool, 1 },
-        { "wxToolBar_AddTool", _wrap_wxToolBar_AddTool, 1 },
-        { "wxToolBar_AddSeparator", _wrap_wxToolBar_AddSeparator, 1 },
-        { "new_wxToolBar", _wrap_new_wxToolBar, 1 },
-        { "wxToolBarTool_m_longHelpString_get", _wrap_wxToolBarTool_m_longHelpString_get, 1 },
-        { "wxToolBarTool_m_longHelpString_set", _wrap_wxToolBarTool_m_longHelpString_set, 1 },
-        { "wxToolBarTool_m_shortHelpString_get", _wrap_wxToolBarTool_m_shortHelpString_get, 1 },
-        { "wxToolBarTool_m_shortHelpString_set", _wrap_wxToolBarTool_m_shortHelpString_set, 1 },
-        { "wxToolBarTool_m_isMenuCommand_get", _wrap_wxToolBarTool_m_isMenuCommand_get, 1 },
-        { "wxToolBarTool_m_isMenuCommand_set", _wrap_wxToolBarTool_m_isMenuCommand_set, 1 },
-        { "wxToolBarTool_m_bitmap2_get", _wrap_wxToolBarTool_m_bitmap2_get, 1 },
-        { "wxToolBarTool_m_bitmap2_set", _wrap_wxToolBarTool_m_bitmap2_set, 1 },
-        { "wxToolBarTool_m_bitmap1_get", _wrap_wxToolBarTool_m_bitmap1_get, 1 },
-        { "wxToolBarTool_m_bitmap1_set", _wrap_wxToolBarTool_m_bitmap1_set, 1 },
-        { "wxToolBarTool_m_enabled_get", _wrap_wxToolBarTool_m_enabled_get, 1 },
-        { "wxToolBarTool_m_enabled_set", _wrap_wxToolBarTool_m_enabled_set, 1 },
-        { "wxToolBarTool_m_deleteSecondBitmap_get", _wrap_wxToolBarTool_m_deleteSecondBitmap_get, 1 },
-        { "wxToolBarTool_m_deleteSecondBitmap_set", _wrap_wxToolBarTool_m_deleteSecondBitmap_set, 1 },
-        { "wxToolBarTool_m_isToggle_get", _wrap_wxToolBarTool_m_isToggle_get, 1 },
-        { "wxToolBarTool_m_isToggle_set", _wrap_wxToolBarTool_m_isToggle_set, 1 },
-        { "wxToolBarTool_m_toggleState_get", _wrap_wxToolBarTool_m_toggleState_get, 1 },
-        { "wxToolBarTool_m_toggleState_set", _wrap_wxToolBarTool_m_toggleState_set, 1 },
-        { "wxToolBarTool_m_height_get", _wrap_wxToolBarTool_m_height_get, 1 },
-        { "wxToolBarTool_m_height_set", _wrap_wxToolBarTool_m_height_set, 1 },
-        { "wxToolBarTool_m_width_get", _wrap_wxToolBarTool_m_width_get, 1 },
-        { "wxToolBarTool_m_width_set", _wrap_wxToolBarTool_m_width_set, 1 },
-        { "wxToolBarTool_m_y_get", _wrap_wxToolBarTool_m_y_get, 1 },
-        { "wxToolBarTool_m_y_set", _wrap_wxToolBarTool_m_y_set, 1 },
-        { "wxToolBarTool_m_x_get", _wrap_wxToolBarTool_m_x_get, 1 },
-        { "wxToolBarTool_m_x_set", _wrap_wxToolBarTool_m_x_set, 1 },
-        { "wxToolBarTool_m_index_get", _wrap_wxToolBarTool_m_index_get, 1 },
-        { "wxToolBarTool_m_index_set", _wrap_wxToolBarTool_m_index_set, 1 },
-        { "wxToolBarTool_m_clientData_get", _wrap_wxToolBarTool_m_clientData_get, 1 },
-        { "wxToolBarTool_m_clientData_set", _wrap_wxToolBarTool_m_clientData_set, 1 },
-        { "wxToolBarTool_m_toolStyle_get", _wrap_wxToolBarTool_m_toolStyle_get, 1 },
-        { "wxToolBarTool_m_toolStyle_set", _wrap_wxToolBarTool_m_toolStyle_set, 1 },
-        { "wxToolBarTool_GetHeight", _wrap_wxToolBarTool_GetHeight, 1 },
-        { "wxToolBarTool_GetWidth", _wrap_wxToolBarTool_GetWidth, 1 },
-        { "wxToolBarTool_SetSize", _wrap_wxToolBarTool_SetSize, 1 },
-        { "delete_wxToolBarTool", _wrap_delete_wxToolBarTool, 1 },
-        { "new_wxToolBarTool", _wrap_new_wxToolBarTool, 1 },
-        { "wxStatusBar_SetStatusWidths", _wrap_wxStatusBar_SetStatusWidths, 1 },
-        { "wxStatusBar_SetStatusText", _wrap_wxStatusBar_SetStatusText, 1 },
-        { "wxStatusBar_SetFieldsCount", _wrap_wxStatusBar_SetFieldsCount, 1 },
-        { "wxStatusBar_InitColours", _wrap_wxStatusBar_InitColours, 1 },
-        { "wxStatusBar_DrawFieldText", _wrap_wxStatusBar_DrawFieldText, 1 },
-        { "wxStatusBar_DrawField", _wrap_wxStatusBar_DrawField, 1 },
-        { "wxStatusBar_GetStatusText", _wrap_wxStatusBar_GetStatusText, 1 },
-        { "wxStatusBar_GetFieldsCount", _wrap_wxStatusBar_GetFieldsCount, 1 },
-        { "wxStatusBar_GetFieldRect", _wrap_wxStatusBar_GetFieldRect, 1 },
-        { "new_wxStatusBar", _wrap_new_wxStatusBar, 1 },
+        { "wxToolBar_ToggleTool", _wrap_wxToolBar_ToggleTool, METH_VARARGS },
+        { "wxToolBar_SetToolSeparation", _wrap_wxToolBar_SetToolSeparation, METH_VARARGS },
+        { "wxToolBar_SetToolPacking", _wrap_wxToolBar_SetToolPacking, METH_VARARGS },
+        { "wxToolBar_SetMargins", _wrap_wxToolBar_SetMargins, METH_VARARGS },
+        { "wxToolBar_SetToolShortHelp", _wrap_wxToolBar_SetToolShortHelp, METH_VARARGS },
+        { "wxToolBar_SetToolLongHelp", _wrap_wxToolBar_SetToolLongHelp, METH_VARARGS },
+        { "wxToolBar_Realize", _wrap_wxToolBar_Realize, METH_VARARGS },
+        { "wxToolBar_GetToolState", _wrap_wxToolBar_GetToolState, METH_VARARGS },
+        { "wxToolBar_GetToolShortHelp", _wrap_wxToolBar_GetToolShortHelp, METH_VARARGS },
+        { "wxToolBar_GetToolSeparation", _wrap_wxToolBar_GetToolSeparation, METH_VARARGS },
+        { "wxToolBar_GetToolPacking", _wrap_wxToolBar_GetToolPacking, METH_VARARGS },
+        { "wxToolBar_GetToolLongHelp", _wrap_wxToolBar_GetToolLongHelp, METH_VARARGS },
+        { "wxToolBar_GetToolEnabled", _wrap_wxToolBar_GetToolEnabled, METH_VARARGS },
+        { "wxToolBar_GetMaxSize", _wrap_wxToolBar_GetMaxSize, METH_VARARGS },
+        { "wxToolBar_SetToolBitmapSize", _wrap_wxToolBar_SetToolBitmapSize, METH_VARARGS },
+        { "wxToolBar_GetToolBitmapSize", _wrap_wxToolBar_GetToolBitmapSize, METH_VARARGS },
+        { "wxToolBar_GetToolSize", _wrap_wxToolBar_GetToolSize, METH_VARARGS },
+        { "wxToolBar_FindToolForPosition", _wrap_wxToolBar_FindToolForPosition, METH_VARARGS },
+        { "wxToolBar_EnableTool", _wrap_wxToolBar_EnableTool, METH_VARARGS },
+        { "wxToolBar_AddSimpleTool", _wrap_wxToolBar_AddSimpleTool, METH_VARARGS },
+        { "wxToolBar_AddTool", _wrap_wxToolBar_AddTool, METH_VARARGS },
+        { "wxToolBar_AddSeparator", _wrap_wxToolBar_AddSeparator, METH_VARARGS },
+        { "new_wxToolBar", _wrap_new_wxToolBar, METH_VARARGS },
+        { "wxToolBarTool_m_longHelpString_get", _wrap_wxToolBarTool_m_longHelpString_get, METH_VARARGS },
+        { "wxToolBarTool_m_longHelpString_set", _wrap_wxToolBarTool_m_longHelpString_set, METH_VARARGS },
+        { "wxToolBarTool_m_shortHelpString_get", _wrap_wxToolBarTool_m_shortHelpString_get, METH_VARARGS },
+        { "wxToolBarTool_m_shortHelpString_set", _wrap_wxToolBarTool_m_shortHelpString_set, METH_VARARGS },
+        { "wxToolBarTool_m_isMenuCommand_get", _wrap_wxToolBarTool_m_isMenuCommand_get, METH_VARARGS },
+        { "wxToolBarTool_m_isMenuCommand_set", _wrap_wxToolBarTool_m_isMenuCommand_set, METH_VARARGS },
+        { "wxToolBarTool_m_bitmap2_get", _wrap_wxToolBarTool_m_bitmap2_get, METH_VARARGS },
+        { "wxToolBarTool_m_bitmap2_set", _wrap_wxToolBarTool_m_bitmap2_set, METH_VARARGS },
+        { "wxToolBarTool_m_bitmap1_get", _wrap_wxToolBarTool_m_bitmap1_get, METH_VARARGS },
+        { "wxToolBarTool_m_bitmap1_set", _wrap_wxToolBarTool_m_bitmap1_set, METH_VARARGS },
+        { "wxToolBarTool_m_enabled_get", _wrap_wxToolBarTool_m_enabled_get, METH_VARARGS },
+        { "wxToolBarTool_m_enabled_set", _wrap_wxToolBarTool_m_enabled_set, METH_VARARGS },
+        { "wxToolBarTool_m_deleteSecondBitmap_get", _wrap_wxToolBarTool_m_deleteSecondBitmap_get, METH_VARARGS },
+        { "wxToolBarTool_m_deleteSecondBitmap_set", _wrap_wxToolBarTool_m_deleteSecondBitmap_set, METH_VARARGS },
+        { "wxToolBarTool_m_isToggle_get", _wrap_wxToolBarTool_m_isToggle_get, METH_VARARGS },
+        { "wxToolBarTool_m_isToggle_set", _wrap_wxToolBarTool_m_isToggle_set, METH_VARARGS },
+        { "wxToolBarTool_m_toggleState_get", _wrap_wxToolBarTool_m_toggleState_get, METH_VARARGS },
+        { "wxToolBarTool_m_toggleState_set", _wrap_wxToolBarTool_m_toggleState_set, METH_VARARGS },
+        { "wxToolBarTool_m_height_get", _wrap_wxToolBarTool_m_height_get, METH_VARARGS },
+        { "wxToolBarTool_m_height_set", _wrap_wxToolBarTool_m_height_set, METH_VARARGS },
+        { "wxToolBarTool_m_width_get", _wrap_wxToolBarTool_m_width_get, METH_VARARGS },
+        { "wxToolBarTool_m_width_set", _wrap_wxToolBarTool_m_width_set, METH_VARARGS },
+        { "wxToolBarTool_m_y_get", _wrap_wxToolBarTool_m_y_get, METH_VARARGS },
+        { "wxToolBarTool_m_y_set", _wrap_wxToolBarTool_m_y_set, METH_VARARGS },
+        { "wxToolBarTool_m_x_get", _wrap_wxToolBarTool_m_x_get, METH_VARARGS },
+        { "wxToolBarTool_m_x_set", _wrap_wxToolBarTool_m_x_set, METH_VARARGS },
+        { "wxToolBarTool_m_index_get", _wrap_wxToolBarTool_m_index_get, METH_VARARGS },
+        { "wxToolBarTool_m_index_set", _wrap_wxToolBarTool_m_index_set, METH_VARARGS },
+        { "wxToolBarTool_m_clientData_get", _wrap_wxToolBarTool_m_clientData_get, METH_VARARGS },
+        { "wxToolBarTool_m_clientData_set", _wrap_wxToolBarTool_m_clientData_set, METH_VARARGS },
+        { "wxToolBarTool_m_toolStyle_get", _wrap_wxToolBarTool_m_toolStyle_get, METH_VARARGS },
+        { "wxToolBarTool_m_toolStyle_set", _wrap_wxToolBarTool_m_toolStyle_set, METH_VARARGS },
+        { "wxToolBarTool_GetHeight", _wrap_wxToolBarTool_GetHeight, METH_VARARGS },
+        { "wxToolBarTool_GetWidth", _wrap_wxToolBarTool_GetWidth, METH_VARARGS },
+        { "wxToolBarTool_SetSize", _wrap_wxToolBarTool_SetSize, METH_VARARGS },
+        { "delete_wxToolBarTool", _wrap_delete_wxToolBarTool, METH_VARARGS },
+        { "new_wxToolBarTool", _wrap_new_wxToolBarTool, METH_VARARGS },
+        { "wxStatusBar_SetStatusWidths", _wrap_wxStatusBar_SetStatusWidths, METH_VARARGS },
+        { "wxStatusBar_SetStatusText", _wrap_wxStatusBar_SetStatusText, METH_VARARGS },
+        { "wxStatusBar_SetFieldsCount", _wrap_wxStatusBar_SetFieldsCount, METH_VARARGS },
+        { "wxStatusBar_InitColours", _wrap_wxStatusBar_InitColours, METH_VARARGS },
+        { "wxStatusBar_DrawFieldText", _wrap_wxStatusBar_DrawFieldText, METH_VARARGS },
+        { "wxStatusBar_DrawField", _wrap_wxStatusBar_DrawField, METH_VARARGS },
+        { "wxStatusBar_GetStatusText", _wrap_wxStatusBar_GetStatusText, METH_VARARGS },
+        { "wxStatusBar_GetFieldsCount", _wrap_wxStatusBar_GetFieldsCount, METH_VARARGS },
+        { "wxStatusBar_GetFieldRect", _wrap_wxStatusBar_GetFieldRect, METH_VARARGS },
+        { "new_wxStatusBar", _wrap_new_wxStatusBar, METH_VARARGS },

         { NULL, NULL }
 };
         { NULL, NULL }
 };

+#ifdef __cplusplus
+}
+#endif
+/*
+ * This table is used by the pointer type-checker
+ */
+static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
+    { "_wxAcceleratorTable","_class_wxAcceleratorTable",0},
+    { "_wxEvent","_class_wxEvent",0},
+    { "_class_wxActivateEvent","_wxActivateEvent",0},
+    { "_signed_long","_long",0},
+    { "_wxMenuEvent","_class_wxMenuEvent",0},
+    { "_wxPrintQuality","_int",0},
+    { "_wxPrintQuality","_signed_int",0},
+    { "_wxPrintQuality","_unsigned_int",0},
+    { "_wxPrintQuality","_wxWindowID",0},
+    { "_wxPrintQuality","_uint",0},
+    { "_wxPrintQuality","_EBool",0},
+    { "_wxPrintQuality","_size_t",0},
+    { "_class_wxRegionIterator","_wxRegionIterator",0},
+    { "_class_wxMenuBar","_wxMenuBar",0},
+    { "_class_wxEvtHandler","_class_wxToolBar",SwigwxToolBarTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxToolBar",SwigwxToolBarTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxStatusBar",SwigwxStatusBarTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxStatusBar",SwigwxStatusBarTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxEvtHandler",0},
+    { "_wxPaintEvent","_class_wxPaintEvent",0},
+    { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
+    { "_wxCursor","_class_wxCursor",0},
+    { "_wxNotifyEvent","_class_wxNotifyEvent",0},
+    { "_wxMask","_class_wxMask",0},
+    { "_wxPen","_class_wxPen",0},
+    { "_wxUpdateUIEvent","_class_wxUpdateUIEvent",0},
+    { "_byte","_unsigned_char",0},
+    { "_wxStaticBox","_class_wxStaticBox",0},
+    { "_wxChoice","_class_wxChoice",0},
+    { "_wxSlider","_class_wxSlider",0},
+    { "_long","_wxDash",0},
+    { "_long","_unsigned_long",0},
+    { "_long","_signed_long",0},
+    { "_wxImageList","_class_wxImageList",0},
+    { "_wxDropFilesEvent","_class_wxDropFilesEvent",0},
+    { "_wxBitmapButton","_class_wxBitmapButton",0},
+    { "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
+    { "_class_wxGauge","_wxGauge",0},
+    { "_wxDC","_class_wxDC",0},
+    { "_wxSpinEvent","_class_wxSpinEvent",0},
+    { "_size_t","_wxPrintQuality",0},
+    { "_size_t","_unsigned_int",0},
+    { "_size_t","_int",0},
+    { "_size_t","_wxWindowID",0},
+    { "_size_t","_uint",0},
+    { "_class_wxRealPoint","_wxRealPoint",0},
+    { "_wxPrinterDC","_class_wxPrinterDC",0},
+    { "_class_wxMenuItem","_wxMenuItem",0},
+    { "_class_wxPaintEvent","_wxPaintEvent",0},
+    { "_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0},
+    { "_class_wxStatusBar","_wxStatusBar",0},
+    { "_wxPanel","_class_wxPanel",0},
+    { "_wxInitDialogEvent","_class_wxInitDialogEvent",0},
+    { "_wxCheckBox","_class_wxCheckBox",0},
+    { "_wxPyEvent","_class_wxPyEvent",0},
+    { "_wxTextCtrl","_class_wxTextCtrl",0},
+    { "_class_wxMask","_wxMask",0},
+    { "_class_wxKeyEvent","_wxKeyEvent",0},
+    { "_wxColour","_class_wxColour",0},
+    { "_class_wxDialog","_wxDialog",0},
+    { "_wxIdleEvent","_class_wxIdleEvent",0},
+    { "_class_wxUpdateUIEvent","_wxUpdateUIEvent",0},
+    { "_wxToolBar","_class_wxToolBar",0},
+    { "_wxStaticLine","_class_wxStaticLine",0},
+    { "_wxBrush","_class_wxBrush",0},
+    { "_wxShowEvent","_class_wxShowEvent",0},
+    { "_uint","_wxPrintQuality",0},
+    { "_uint","_size_t",0},
+    { "_uint","_unsigned_int",0},
+    { "_uint","_int",0},
+    { "_uint","_wxWindowID",0},
+    { "_class_wxEvent","_wxEvent",0},
+    { "_wxCheckListBox","_class_wxCheckListBox",0},
+    { "_wxRect","_class_wxRect",0},
+    { "_wxCommandEvent","_class_wxCommandEvent",0},
+    { "_wxSizeEvent","_class_wxSizeEvent",0},
+    { "_wxPoint","_class_wxPoint",0},
+    { "_class_wxButton","_wxButton",0},
+    { "_wxRadioBox","_class_wxRadioBox",0},
+    { "_wxBitmap","_class_wxBitmap",0},
+    { "_wxPyTimer","_class_wxPyTimer",0},
+    { "_wxWindowDC","_class_wxWindowDC",0},
+    { "_wxScrollBar","_class_wxScrollBar",0},
+    { "_wxSpinButton","_class_wxSpinButton",0},
+    { "_wxToolBarTool","_class_wxToolBarTool",0},
+    { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
+    { "_class_wxNotifyEvent","_wxNotifyEvent",0},
+    { "_class_wxPyEvent","_wxPyEvent",0},
+    { "_class_wxIconizeEvent","_wxIconizeEvent",0},
+    { "_class_wxStaticBitmap","_wxStaticBitmap",0},
+    { "_class_wxToolBar","_wxToolBar",0},
+    { "_class_wxStaticLine","_wxStaticLine",0},
+    { "_wxScrollEvent","_class_wxScrollEvent",0},
+    { "_EBool","_wxPrintQuality",0},
+    { "_EBool","_signed_int",0},
+    { "_EBool","_int",0},
+    { "_EBool","_wxWindowID",0},
+    { "_class_wxRegion","_wxRegion",0},
+    { "_class_wxDropFilesEvent","_wxDropFilesEvent",0},
+    { "_wxStaticText","_class_wxStaticText",0},
+    { "_wxFont","_class_wxFont",0},
+    { "_wxCloseEvent","_class_wxCloseEvent",0},
+    { "_unsigned_long","_wxDash",0},
+    { "_unsigned_long","_long",0},
+    { "_class_wxRect","_wxRect",0},
+    { "_class_wxDC","_wxDC",0},
+    { "_class_wxPyTimer","_wxPyTimer",0},
+    { "_wxFocusEvent","_class_wxFocusEvent",0},
+    { "_wxMaximizeEvent","_class_wxMaximizeEvent",0},
+    { "_class_wxSpinButton","_wxSpinButton",0},
+    { "_wxAcceleratorEntry","_class_wxAcceleratorEntry",0},
+    { "_class_wxPanel","_wxPanel",0},
+    { "_class_wxCheckBox","_wxCheckBox",0},
+    { "_wxComboBox","_class_wxComboBox",0},
+    { "_wxRadioButton","_class_wxRadioButton",0},
+    { "_signed_int","_wxPrintQuality",0},
+    { "_signed_int","_EBool",0},
+    { "_signed_int","_wxWindowID",0},
+    { "_signed_int","_int",0},
+    { "_class_wxTextCtrl","_wxTextCtrl",0},
+    { "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
+    { "_wxMetaFileDC","_class_wxMetaFileDC",0},
+    { "_wxMenu","_class_wxMenu",0},
+    { "_class_wxMoveEvent","_wxMoveEvent",0},
+    { "_wxListBox","_class_wxListBox",0},
+    { "_wxScreenDC","_class_wxScreenDC",0},
+    { "_WXTYPE","_short",0},
+    { "_WXTYPE","_signed_short",0},
+    { "_WXTYPE","_unsigned_short",0},
+    { "_class_wxBrush","_wxBrush",0},
+    { "_unsigned_short","_WXTYPE",0},
+    { "_unsigned_short","_short",0},
+    { "_class_wxWindow","_class_wxToolBar",SwigwxToolBarTowxWindow},
+    { "_class_wxWindow","_wxToolBar",SwigwxToolBarTowxWindow},
+    { "_class_wxWindow","_class_wxStatusBar",SwigwxStatusBarTowxWindow},
+    { "_class_wxWindow","_wxStatusBar",SwigwxStatusBarTowxWindow},
+    { "_class_wxWindow","_wxWindow",0},
+    { "_class_wxStaticText","_wxStaticText",0},
+    { "_class_wxFont","_wxFont",0},
+    { "_class_wxCloseEvent","_wxCloseEvent",0},
+    { "_class_wxMenuEvent","_wxMenuEvent",0},
+    { "_wxClientDC","_class_wxClientDC",0},
+    { "_wxMouseEvent","_class_wxMouseEvent",0},
+    { "_class_wxPoint","_wxPoint",0},
+    { "_wxRealPoint","_class_wxRealPoint",0},
+    { "_class_wxRadioBox","_wxRadioBox",0},
+    { "_signed_short","_WXTYPE",0},
+    { "_signed_short","_short",0},
+    { "_wxMemoryDC","_class_wxMemoryDC",0},
+    { "_wxPaintDC","_class_wxPaintDC",0},
+    { "_class_wxWindowDC","_wxWindowDC",0},
+    { "_class_wxFocusEvent","_wxFocusEvent",0},
+    { "_class_wxMaximizeEvent","_wxMaximizeEvent",0},
+    { "_wxStatusBar","_class_wxStatusBar",0},
+    { "_class_wxToolBarTool","_wxToolBarTool",0},
+    { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
+    { "_class_wxCursor","_wxCursor",0},
+    { "_wxScrolledWindow","_class_wxScrolledWindow",0},
+    { "_unsigned_char","_byte",0},
+    { "_class_wxMetaFileDC","_wxMetaFileDC",0},
+    { "_class_wxMenu","_wxMenu",0},
+    { "_wxControl","_class_wxToolBar",SwigwxToolBarTowxControl},
+    { "_wxControl","_wxToolBar",SwigwxToolBarTowxControl},
+    { "_wxControl","_class_wxControl",0},
+    { "_class_wxListBox","_wxListBox",0},
+    { "_unsigned_int","_wxPrintQuality",0},
+    { "_unsigned_int","_size_t",0},
+    { "_unsigned_int","_uint",0},
+    { "_unsigned_int","_wxWindowID",0},
+    { "_unsigned_int","_int",0},
+    { "_wxIcon","_class_wxIcon",0},
+    { "_wxDialog","_class_wxDialog",0},
+    { "_class_wxPen","_wxPen",0},
+    { "_short","_WXTYPE",0},
+    { "_short","_unsigned_short",0},
+    { "_short","_signed_short",0},
+    { "_class_wxStaticBox","_wxStaticBox",0},
+    { "_class_wxScrollEvent","_wxScrollEvent",0},
+    { "_wxJoystickEvent","_class_wxJoystickEvent",0},
+    { "_class_wxChoice","_wxChoice",0},
+    { "_class_wxSlider","_wxSlider",0},
+    { "_class_wxImageList","_wxImageList",0},
+    { "_class_wxBitmapButton","_wxBitmapButton",0},
+    { "_wxWindowID","_wxPrintQuality",0},
+    { "_wxWindowID","_size_t",0},
+    { "_wxWindowID","_EBool",0},
+    { "_wxWindowID","_uint",0},
+    { "_wxWindowID","_int",0},
+    { "_wxWindowID","_signed_int",0},
+    { "_wxWindowID","_unsigned_int",0},
+    { "_int","_wxPrintQuality",0},
+    { "_int","_size_t",0},
+    { "_int","_EBool",0},
+    { "_int","_uint",0},
+    { "_int","_wxWindowID",0},
+    { "_int","_unsigned_int",0},
+    { "_int","_signed_int",0},
+    { "_class_wxMouseEvent","_wxMouseEvent",0},
+    { "_class_wxSpinEvent","_wxSpinEvent",0},
+    { "_wxButton","_class_wxButton",0},
+    { "_wxSize","_class_wxSize",0},
+    { "_wxRegionIterator","_class_wxRegionIterator",0},
+    { "_class_wxPrinterDC","_wxPrinterDC",0},
+    { "_class_wxPaintDC","_wxPaintDC",0},
+    { "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0},
+    { "_class_wxInitDialogEvent","_wxInitDialogEvent",0},
+    { "_class_wxComboBox","_wxComboBox",0},
+    { "_class_wxRadioButton","_wxRadioButton",0},
+    { "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
+    { "_wxIconizeEvent","_class_wxIconizeEvent",0},
+    { "_class_wxControl","_class_wxToolBar",SwigwxToolBarTowxControl},
+    { "_class_wxControl","_wxToolBar",SwigwxToolBarTowxControl},
+    { "_class_wxControl","_wxControl",0},
+    { "_wxStaticBitmap","_class_wxStaticBitmap",0},
+    { "_class_wxIcon","_wxIcon",0},
+    { "_class_wxColour","_wxColour",0},
+    { "_class_wxScreenDC","_wxScreenDC",0},
+    { "_wxPalette","_class_wxPalette",0},
+    { "_class_wxIdleEvent","_wxIdleEvent",0},
+    { "_wxEraseEvent","_class_wxEraseEvent",0},
+    { "_class_wxJoystickEvent","_wxJoystickEvent",0},
+    { "_wxRegion","_class_wxRegion",0},
+    { "_class_wxShowEvent","_wxShowEvent",0},
+    { "_wxActivateEvent","_class_wxActivateEvent",0},
+    { "_wxGauge","_class_wxGauge",0},
+    { "_class_wxCheckListBox","_wxCheckListBox",0},
+    { "_class_wxCommandEvent","_wxCommandEvent",0},
+    { "_class_wxClientDC","_wxClientDC",0},
+    { "_class_wxSizeEvent","_wxSizeEvent",0},
+    { "_class_wxSize","_wxSize",0},
+    { "_class_wxBitmap","_wxBitmap",0},
+    { "_class_wxMemoryDC","_wxMemoryDC",0},
+    { "_wxMenuBar","_class_wxMenuBar",0},
+    { "_wxEvtHandler","_class_wxToolBar",SwigwxToolBarTowxEvtHandler},
+    { "_wxEvtHandler","_wxToolBar",SwigwxToolBarTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxStatusBar",SwigwxStatusBarTowxEvtHandler},
+    { "_wxEvtHandler","_wxStatusBar",SwigwxStatusBarTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxEvtHandler",0},
+    { "_wxMenuItem","_class_wxMenuItem",0},
+    { "_class_wxScrollBar","_wxScrollBar",0},
+    { "_wxDash","_unsigned_long",0},
+    { "_wxDash","_long",0},
+    { "_class_wxScrolledWindow","_wxScrolledWindow",0},
+    { "_wxKeyEvent","_class_wxKeyEvent",0},
+    { "_wxMoveEvent","_class_wxMoveEvent",0},
+    { "_class_wxPalette","_wxPalette",0},
+    { "_class_wxEraseEvent","_wxEraseEvent",0},
+    { "_wxWindow","_class_wxToolBar",SwigwxToolBarTowxWindow},
+    { "_wxWindow","_wxToolBar",SwigwxToolBarTowxWindow},
+    { "_wxWindow","_class_wxStatusBar",SwigwxStatusBarTowxWindow},
+    { "_wxWindow","_wxStatusBar",SwigwxStatusBarTowxWindow},
+    { "_wxWindow","_class_wxWindow",0},
+{0,0,0}};
+

 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif
 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif

-SWIGEXPORT(void,initstattoolc)() {
+SWIGEXPORT(void) initstattoolc() {

         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("stattoolc", stattoolcMethods);
         d = PyModule_GetDict(m);
         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("stattoolc", stattoolcMethods);
         d = PyModule_GetDict(m);

-/*
- * These are the pointer type-equivalency mappings. 
- * (Used by the SWIG pointer type-checker).
- */
-        SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_wxEvent","_class_wxEvent",0);
-        SWIG_RegisterMapping("_class_wxActivateEvent","_wxActivateEvent",0);
-        SWIG_RegisterMapping("_signed_long","_long",0);
-        SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_signed_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_unsigned_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_wxWindowID",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_uint",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_EBool",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_size_t",0);
-        SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
-        SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxToolBar",SwigwxToolBarTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxToolBar",SwigwxToolBarTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxStatusBar",SwigwxStatusBarTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxStatusBar",SwigwxStatusBarTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxEvtHandler",0);
-        SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
-        SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
-        SWIG_RegisterMapping("_wxNotifyEvent","_class_wxNotifyEvent",0);
-        SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
-        SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
-        SWIG_RegisterMapping("_wxUpdateUIEvent","_class_wxUpdateUIEvent",0);
-        SWIG_RegisterMapping("_byte","_unsigned_char",0);
-        SWIG_RegisterMapping("_wxStaticBox","_class_wxStaticBox",0);
-        SWIG_RegisterMapping("_wxChoice","_class_wxChoice",0);
-        SWIG_RegisterMapping("_wxSlider","_class_wxSlider",0);
-        SWIG_RegisterMapping("_long","_wxDash",0);
-        SWIG_RegisterMapping("_long","_unsigned_long",0);
-        SWIG_RegisterMapping("_long","_signed_long",0);
-        SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0);
-        SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0);
-        SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_class_wxGauge","_wxGauge",0);
-        SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
-        SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0);
-        SWIG_RegisterMapping("_size_t","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_size_t","_unsigned_int",0);
-        SWIG_RegisterMapping("_size_t","_int",0);
-        SWIG_RegisterMapping("_size_t","_wxWindowID",0);
-        SWIG_RegisterMapping("_size_t","_uint",0);
-        SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
-        SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0);
-        SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0);
-        SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0);
-        SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0);
-        SWIG_RegisterMapping("_class_wxStatusBar","_wxStatusBar",0);
-        SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);
-        SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
-        SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
-        SWIG_RegisterMapping("_wxPyEvent","_class_wxPyEvent",0);
-        SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);
-        SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
-        SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0);
-        SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
-        SWIG_RegisterMapping("_class_wxDialog","_wxDialog",0);
-        SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0);
-        SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0);
-        SWIG_RegisterMapping("_wxToolBar","_class_wxToolBar",0);
-        SWIG_RegisterMapping("_wxStaticLine","_class_wxStaticLine",0);
-        SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
-        SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0);
-        SWIG_RegisterMapping("_uint","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_uint","_size_t",0);
-        SWIG_RegisterMapping("_uint","_unsigned_int",0);
-        SWIG_RegisterMapping("_uint","_int",0);
-        SWIG_RegisterMapping("_uint","_wxWindowID",0);
-        SWIG_RegisterMapping("_class_wxEvent","_wxEvent",0);
-        SWIG_RegisterMapping("_wxCheckListBox","_class_wxCheckListBox",0);
-        SWIG_RegisterMapping("_wxRect","_class_wxRect",0);
-        SWIG_RegisterMapping("_wxCommandEvent","_class_wxCommandEvent",0);
-        SWIG_RegisterMapping("_wxSizeEvent","_class_wxSizeEvent",0);
-        SWIG_RegisterMapping("_wxPoint","_class_wxPoint",0);
-        SWIG_RegisterMapping("_class_wxButton","_wxButton",0);
-        SWIG_RegisterMapping("_wxRadioBox","_class_wxRadioBox",0);
-        SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
-        SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0);
-        SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0);
-        SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0);
-        SWIG_RegisterMapping("_wxToolBarTool","_class_wxToolBarTool",0);
-        SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_class_wxNotifyEvent","_wxNotifyEvent",0);
-        SWIG_RegisterMapping("_class_wxPyEvent","_wxPyEvent",0);
-        SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
-        SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
-        SWIG_RegisterMapping("_class_wxToolBar","_wxToolBar",0);
-        SWIG_RegisterMapping("_class_wxStaticLine","_wxStaticLine",0);
-        SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0);
-        SWIG_RegisterMapping("_EBool","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_EBool","_signed_int",0);
-        SWIG_RegisterMapping("_EBool","_int",0);
-        SWIG_RegisterMapping("_EBool","_wxWindowID",0);
-        SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
-        SWIG_RegisterMapping("_class_wxDropFilesEvent","_wxDropFilesEvent",0);
-        SWIG_RegisterMapping("_wxStaticText","_class_wxStaticText",0);
-        SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
-        SWIG_RegisterMapping("_wxCloseEvent","_class_wxCloseEvent",0);
-        SWIG_RegisterMapping("_unsigned_long","_wxDash",0);
-        SWIG_RegisterMapping("_unsigned_long","_long",0);
-        SWIG_RegisterMapping("_class_wxRect","_wxRect",0);
-        SWIG_RegisterMapping("_class_wxDC","_wxDC",0);
-        SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxFocusEvent","_class_wxFocusEvent",0);
-        SWIG_RegisterMapping("_wxMaximizeEvent","_class_wxMaximizeEvent",0);
-        SWIG_RegisterMapping("_class_wxSpinButton","_wxSpinButton",0);
-        SWIG_RegisterMapping("_wxAcceleratorEntry","_class_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_class_wxPanel","_wxPanel",0);
-        SWIG_RegisterMapping("_class_wxCheckBox","_wxCheckBox",0);
-        SWIG_RegisterMapping("_wxComboBox","_class_wxComboBox",0);
-        SWIG_RegisterMapping("_wxRadioButton","_class_wxRadioButton",0);
-        SWIG_RegisterMapping("_signed_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_signed_int","_EBool",0);
-        SWIG_RegisterMapping("_signed_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_signed_int","_int",0);
-        SWIG_RegisterMapping("_class_wxTextCtrl","_wxTextCtrl",0);
-        SWIG_RegisterMapping("_wxLayoutConstraints","_class_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_wxMetaFileDC","_class_wxMetaFileDC",0);
-        SWIG_RegisterMapping("_wxMenu","_class_wxMenu",0);
-        SWIG_RegisterMapping("_class_wxMoveEvent","_wxMoveEvent",0);
-        SWIG_RegisterMapping("_wxListBox","_class_wxListBox",0);
-        SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0);
-        SWIG_RegisterMapping("_WXTYPE","_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_signed_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_unsigned_short",0);
-        SWIG_RegisterMapping("_class_wxBrush","_wxBrush",0);
-        SWIG_RegisterMapping("_unsigned_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_unsigned_short","_short",0);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxToolBar",SwigwxToolBarTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxToolBar",SwigwxToolBarTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxStatusBar",SwigwxStatusBarTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxStatusBar",SwigwxStatusBarTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxWindow",0);
-        SWIG_RegisterMapping("_class_wxStaticText","_wxStaticText",0);
-        SWIG_RegisterMapping("_class_wxFont","_wxFont",0);
-        SWIG_RegisterMapping("_class_wxCloseEvent","_wxCloseEvent",0);
-        SWIG_RegisterMapping("_class_wxMenuEvent","_wxMenuEvent",0);
-        SWIG_RegisterMapping("_wxClientDC","_class_wxClientDC",0);
-        SWIG_RegisterMapping("_wxMouseEvent","_class_wxMouseEvent",0);
-        SWIG_RegisterMapping("_class_wxPoint","_wxPoint",0);
-        SWIG_RegisterMapping("_wxRealPoint","_class_wxRealPoint",0);
-        SWIG_RegisterMapping("_class_wxRadioBox","_wxRadioBox",0);
-        SWIG_RegisterMapping("_signed_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_signed_short","_short",0);
-        SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0);
-        SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
-        SWIG_RegisterMapping("_class_wxWindowDC","_wxWindowDC",0);
-        SWIG_RegisterMapping("_class_wxFocusEvent","_wxFocusEvent",0);
-        SWIG_RegisterMapping("_class_wxMaximizeEvent","_wxMaximizeEvent",0);
-        SWIG_RegisterMapping("_wxStatusBar","_class_wxStatusBar",0);
-        SWIG_RegisterMapping("_class_wxToolBarTool","_wxToolBarTool",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
-        SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0);
-        SWIG_RegisterMapping("_unsigned_char","_byte",0);
-        SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0);
-        SWIG_RegisterMapping("_class_wxMenu","_wxMenu",0);
-        SWIG_RegisterMapping("_wxControl","_class_wxToolBar",SwigwxToolBarTowxControl);
-        SWIG_RegisterMapping("_wxControl","_wxToolBar",SwigwxToolBarTowxControl);
-        SWIG_RegisterMapping("_wxControl","_class_wxControl",0);
-        SWIG_RegisterMapping("_class_wxListBox","_wxListBox",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_unsigned_int","_size_t",0);
-        SWIG_RegisterMapping("_unsigned_int","_uint",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_unsigned_int","_int",0);
-        SWIG_RegisterMapping("_wxIcon","_class_wxIcon",0);
-        SWIG_RegisterMapping("_wxDialog","_class_wxDialog",0);
-        SWIG_RegisterMapping("_class_wxPen","_wxPen",0);
-        SWIG_RegisterMapping("_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_short","_unsigned_short",0);
-        SWIG_RegisterMapping("_short","_signed_short",0);
-        SWIG_RegisterMapping("_class_wxStaticBox","_wxStaticBox",0);
-        SWIG_RegisterMapping("_class_wxScrollEvent","_wxScrollEvent",0);
-        SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0);
-        SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
-        SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);
-        SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0);
-        SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
-        SWIG_RegisterMapping("_wxWindowID","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_wxWindowID","_size_t",0);
-        SWIG_RegisterMapping("_wxWindowID","_EBool",0);
-        SWIG_RegisterMapping("_wxWindowID","_uint",0);
-        SWIG_RegisterMapping("_wxWindowID","_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_signed_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_int","_size_t",0);
-        SWIG_RegisterMapping("_int","_EBool",0);
-        SWIG_RegisterMapping("_int","_uint",0);
-        SWIG_RegisterMapping("_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_int","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_signed_int",0);
-        SWIG_RegisterMapping("_class_wxMouseEvent","_wxMouseEvent",0);
-        SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0);
-        SWIG_RegisterMapping("_wxButton","_class_wxButton",0);
-        SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
-        SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
-        SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
-        SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
-        SWIG_RegisterMapping("_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0);
-        SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0);
-        SWIG_RegisterMapping("_class_wxComboBox","_wxComboBox",0);
-        SWIG_RegisterMapping("_class_wxRadioButton","_wxRadioButton",0);
-        SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_wxIconizeEvent","_class_wxIconizeEvent",0);
-        SWIG_RegisterMapping("_class_wxControl","_class_wxToolBar",SwigwxToolBarTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_wxToolBar",SwigwxToolBarTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_wxControl",0);
-        SWIG_RegisterMapping("_wxStaticBitmap","_class_wxStaticBitmap",0);
-        SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
-        SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
-        SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
-        SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
-        SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0);
-        SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
-        SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
-        SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
-        SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
-        SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
-        SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0);
-        SWIG_RegisterMapping("_class_wxCheckListBox","_wxCheckListBox",0);
-        SWIG_RegisterMapping("_class_wxCommandEvent","_wxCommandEvent",0);
-        SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
-        SWIG_RegisterMapping("_class_wxSizeEvent","_wxSizeEvent",0);
-        SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
-        SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0);
-        SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0);
-        SWIG_RegisterMapping("_wxMenuBar","_class_wxMenuBar",0);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxToolBar",SwigwxToolBarTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxToolBar",SwigwxToolBarTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxStatusBar",SwigwxStatusBarTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxStatusBar",SwigwxStatusBarTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxEvtHandler",0);
-        SWIG_RegisterMapping("_wxMenuItem","_class_wxMenuItem",0);
-        SWIG_RegisterMapping("_class_wxScrollBar","_wxScrollBar",0);
-        SWIG_RegisterMapping("_wxDash","_unsigned_long",0);
-        SWIG_RegisterMapping("_wxDash","_long",0);
-        SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
-        SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0);
-        SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0);
-        SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
-        SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0);
-        SWIG_RegisterMapping("_wxWindow","_class_wxToolBar",SwigwxToolBarTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxToolBar",SwigwxToolBarTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxStatusBar",SwigwxStatusBarTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxStatusBar",SwigwxStatusBarTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxWindow",0);
+{
+   int i;
+   for (i = 0; _swig_mapping[i].n1; i++)
+        SWIG_RegisterMapping(_swig_mapping[i].n1,_swig_mapping[i].n2,_swig_mapping[i].pcnv);
+}

 }
 }

diff --git a/utils/wxPython/src/msw/stattool.py b/utils/wxPython/src/msw/stattool.py
index 0f0e36ec8ad2fd9238d881a459d8b0456a56a67c..35d725612d910e9969d1c7ce9087ba9a3e8a8c9b 100644 (file)
--- a/utils/wxPython/src/msw/stattool.py
+++ b/utils/wxPython/src/msw/stattool.py
@@ -15,46 +15,39 @@ class wxStatusBarPtr(wxWindowPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetFieldRect(self,arg0):
-        val = stattoolc.wxStatusBar_GetFieldRect(self.this,arg0)
-        val = wxRectPtr(val)
-        val.thisown = 1
+    def GetFieldRect(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxStatusBar_GetFieldRect,(self,) + _args, _kwargs)
+        if val: val = wxRectPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetFieldsCount(self):
-        val = stattoolc.wxStatusBar_GetFieldsCount(self.this)
+    def GetFieldsCount(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxStatusBar_GetFieldsCount,(self,) + _args, _kwargs)

         return val
         return val

-    def GetStatusText(self,*args):
-        val = apply(stattoolc.wxStatusBar_GetStatusText,(self.this,)+args)
+    def GetStatusText(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxStatusBar_GetStatusText,(self,) + _args, _kwargs)

         return val
         return val

-    def DrawField(self,arg0,arg1):
-        val = stattoolc.wxStatusBar_DrawField(self.this,arg0.this,arg1)
+    def DrawField(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxStatusBar_DrawField,(self,) + _args, _kwargs)

         return val
         return val

-    def DrawFieldText(self,arg0,arg1):
-        val = stattoolc.wxStatusBar_DrawFieldText(self.this,arg0.this,arg1)
+    def DrawFieldText(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxStatusBar_DrawFieldText,(self,) + _args, _kwargs)

         return val
         return val

-    def InitColours(self):
-        val = stattoolc.wxStatusBar_InitColours(self.this)
+    def InitColours(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxStatusBar_InitColours,(self,) + _args, _kwargs)

         return val
         return val

-    def SetFieldsCount(self,*args):
-        val = apply(stattoolc.wxStatusBar_SetFieldsCount,(self.this,)+args)
+    def SetFieldsCount(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxStatusBar_SetFieldsCount,(self,) + _args, _kwargs)

         return val
         return val

-    def SetStatusText(self,arg0,*args):
-        val = apply(stattoolc.wxStatusBar_SetStatusText,(self.this,arg0,)+args)
+    def SetStatusText(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxStatusBar_SetStatusText,(self,) + _args, _kwargs)

         return val
         return val

-    def SetStatusWidths(self,arg0,*args):
-        val = apply(stattoolc.wxStatusBar_SetStatusWidths,(self.this,arg0,)+args)
+    def SetStatusWidths(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxStatusBar_SetStatusWidths,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxStatusBar instance>"
+        return "<C wxStatusBar instance at %s>" % (self.this,)

 class wxStatusBar(wxStatusBarPtr):
 class wxStatusBar(wxStatusBarPtr):

-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(stattoolc.new_wxStatusBar,(arg0.this,arg1,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(stattoolc.new_wxStatusBar,_args,_kwargs)

         self.thisown = 1
         wx._StdWindowCallbacks(self)
 
         self.thisown = 1
         wx._StdWindowCallbacks(self)
 


@@ -65,107 +58,107 @@ class wxToolBarToolPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self, stattoolc=stattoolc):
+    def __del__(self,stattoolc=stattoolc):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            stattoolc.delete_wxToolBarTool(self.this)
-    def SetSize(self,arg0,arg1):
-        val = stattoolc.wxToolBarTool_SetSize(self.this,arg0,arg1)
+            stattoolc.delete_wxToolBarTool(self)
+    def SetSize(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarTool_SetSize,(self,) + _args, _kwargs)

         return val
         return val

-    def GetWidth(self):
-        val = stattoolc.wxToolBarTool_GetWidth(self.this)
+    def GetWidth(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarTool_GetWidth,(self,) + _args, _kwargs)

         return val
         return val

-    def GetHeight(self):
-        val = stattoolc.wxToolBarTool_GetHeight(self.this)
+    def GetHeight(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarTool_GetHeight,(self,) + _args, _kwargs)

         return val
     def __setattr__(self,name,value):
         if name == "m_toolStyle" :
         return val
     def __setattr__(self,name,value):
         if name == "m_toolStyle" :

-            stattoolc.wxToolBarTool_m_toolStyle_set(self.this,value)
+            stattoolc.wxToolBarTool_m_toolStyle_set(self,value)

             return
         if name == "m_clientData" :
             return
         if name == "m_clientData" :

-            stattoolc.wxToolBarTool_m_clientData_set(self.this,value)
+            stattoolc.wxToolBarTool_m_clientData_set(self,value)

             return
         if name == "m_index" :
             return
         if name == "m_index" :

-            stattoolc.wxToolBarTool_m_index_set(self.this,value)
+            stattoolc.wxToolBarTool_m_index_set(self,value)

             return
         if name == "m_x" :
             return
         if name == "m_x" :

-            stattoolc.wxToolBarTool_m_x_set(self.this,value)
+            stattoolc.wxToolBarTool_m_x_set(self,value)

             return
         if name == "m_y" :
             return
         if name == "m_y" :

-            stattoolc.wxToolBarTool_m_y_set(self.this,value)
+            stattoolc.wxToolBarTool_m_y_set(self,value)

             return
         if name == "m_width" :
             return
         if name == "m_width" :

-            stattoolc.wxToolBarTool_m_width_set(self.this,value)
+            stattoolc.wxToolBarTool_m_width_set(self,value)

             return
         if name == "m_height" :
             return
         if name == "m_height" :

-            stattoolc.wxToolBarTool_m_height_set(self.this,value)
+            stattoolc.wxToolBarTool_m_height_set(self,value)

             return
         if name == "m_toggleState" :
             return
         if name == "m_toggleState" :

-            stattoolc.wxToolBarTool_m_toggleState_set(self.this,value)
+            stattoolc.wxToolBarTool_m_toggleState_set(self,value)

             return
         if name == "m_isToggle" :
             return
         if name == "m_isToggle" :

-            stattoolc.wxToolBarTool_m_isToggle_set(self.this,value)
+            stattoolc.wxToolBarTool_m_isToggle_set(self,value)

             return
         if name == "m_deleteSecondBitmap" :
             return
         if name == "m_deleteSecondBitmap" :

-            stattoolc.wxToolBarTool_m_deleteSecondBitmap_set(self.this,value)
+            stattoolc.wxToolBarTool_m_deleteSecondBitmap_set(self,value)

             return
         if name == "m_enabled" :
             return
         if name == "m_enabled" :

-            stattoolc.wxToolBarTool_m_enabled_set(self.this,value)
+            stattoolc.wxToolBarTool_m_enabled_set(self,value)

             return
         if name == "m_bitmap1" :
             return
         if name == "m_bitmap1" :

-            stattoolc.wxToolBarTool_m_bitmap1_set(self.this,value.this)
+            stattoolc.wxToolBarTool_m_bitmap1_set(self,value.this)

             return
         if name == "m_bitmap2" :
             return
         if name == "m_bitmap2" :

-            stattoolc.wxToolBarTool_m_bitmap2_set(self.this,value.this)
+            stattoolc.wxToolBarTool_m_bitmap2_set(self,value.this)

             return
         if name == "m_isMenuCommand" :
             return
         if name == "m_isMenuCommand" :

-            stattoolc.wxToolBarTool_m_isMenuCommand_set(self.this,value)
+            stattoolc.wxToolBarTool_m_isMenuCommand_set(self,value)

             return
         if name == "m_shortHelpString" :
             return
         if name == "m_shortHelpString" :

-            stattoolc.wxToolBarTool_m_shortHelpString_set(self.this,value)
+            stattoolc.wxToolBarTool_m_shortHelpString_set(self,value)

             return
         if name == "m_longHelpString" :
             return
         if name == "m_longHelpString" :

-            stattoolc.wxToolBarTool_m_longHelpString_set(self.this,value)
+            stattoolc.wxToolBarTool_m_longHelpString_set(self,value)

             return
         self.__dict__[name] = value
     def __getattr__(self,name):
         if name == "m_toolStyle" : 
             return
         self.__dict__[name] = value
     def __getattr__(self,name):
         if name == "m_toolStyle" : 

-            return stattoolc.wxToolBarTool_m_toolStyle_get(self.this)
+            return stattoolc.wxToolBarTool_m_toolStyle_get(self)

         if name == "m_clientData" : 
         if name == "m_clientData" : 

-            return stattoolc.wxToolBarTool_m_clientData_get(self.this)
+            return stattoolc.wxToolBarTool_m_clientData_get(self)

         if name == "m_index" : 
         if name == "m_index" : 

-            return stattoolc.wxToolBarTool_m_index_get(self.this)
+            return stattoolc.wxToolBarTool_m_index_get(self)

         if name == "m_x" : 
         if name == "m_x" : 

-            return stattoolc.wxToolBarTool_m_x_get(self.this)
+            return stattoolc.wxToolBarTool_m_x_get(self)

         if name == "m_y" : 
         if name == "m_y" : 

-            return stattoolc.wxToolBarTool_m_y_get(self.this)
+            return stattoolc.wxToolBarTool_m_y_get(self)

         if name == "m_width" : 
         if name == "m_width" : 

-            return stattoolc.wxToolBarTool_m_width_get(self.this)
+            return stattoolc.wxToolBarTool_m_width_get(self)

         if name == "m_height" : 
         if name == "m_height" : 

-            return stattoolc.wxToolBarTool_m_height_get(self.this)
+            return stattoolc.wxToolBarTool_m_height_get(self)

         if name == "m_toggleState" : 
         if name == "m_toggleState" : 

-            return stattoolc.wxToolBarTool_m_toggleState_get(self.this)
+            return stattoolc.wxToolBarTool_m_toggleState_get(self)

         if name == "m_isToggle" : 
         if name == "m_isToggle" : 

-            return stattoolc.wxToolBarTool_m_isToggle_get(self.this)
+            return stattoolc.wxToolBarTool_m_isToggle_get(self)

         if name == "m_deleteSecondBitmap" : 
         if name == "m_deleteSecondBitmap" : 

-            return stattoolc.wxToolBarTool_m_deleteSecondBitmap_get(self.this)
+            return stattoolc.wxToolBarTool_m_deleteSecondBitmap_get(self)

         if name == "m_enabled" : 
         if name == "m_enabled" : 

-            return stattoolc.wxToolBarTool_m_enabled_get(self.this)
+            return stattoolc.wxToolBarTool_m_enabled_get(self)

         if name == "m_bitmap1" : 
         if name == "m_bitmap1" : 

-            return wxBitmapPtr(stattoolc.wxToolBarTool_m_bitmap1_get(self.this))
+            return wxBitmapPtr(stattoolc.wxToolBarTool_m_bitmap1_get(self))

         if name == "m_bitmap2" : 
         if name == "m_bitmap2" : 

-            return wxBitmapPtr(stattoolc.wxToolBarTool_m_bitmap2_get(self.this))
+            return wxBitmapPtr(stattoolc.wxToolBarTool_m_bitmap2_get(self))

         if name == "m_isMenuCommand" : 
         if name == "m_isMenuCommand" : 

-            return stattoolc.wxToolBarTool_m_isMenuCommand_get(self.this)
+            return stattoolc.wxToolBarTool_m_isMenuCommand_get(self)

         if name == "m_shortHelpString" : 
         if name == "m_shortHelpString" : 

-            return stattoolc.wxToolBarTool_m_shortHelpString_get(self.this)
+            return stattoolc.wxToolBarTool_m_shortHelpString_get(self)

         if name == "m_longHelpString" : 
         if name == "m_longHelpString" : 

-            return stattoolc.wxToolBarTool_m_longHelpString_get(self.this)
+            return stattoolc.wxToolBarTool_m_longHelpString_get(self)

         raise AttributeError,name
     def __repr__(self):
         raise AttributeError,name
     def __repr__(self):

-        return "<C wxToolBarTool instance>"
+        return "<C wxToolBarTool instance at %s>" % (self.this,)

 class wxToolBarTool(wxToolBarToolPtr):
 class wxToolBarTool(wxToolBarToolPtr):

-    def __init__(self) :
-        self.this = stattoolc.new_wxToolBarTool()
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(stattoolc.new_wxToolBarTool,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -175,96 +168,83 @@ class wxToolBarPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def AddSeparator(self):
-        val = stattoolc.wxToolBar_AddSeparator(self.this)
+    def AddSeparator(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_AddSeparator,(self,) + _args, _kwargs)

         return val
         return val

-    def AddTool(self,arg0,arg1,*args):
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        args = tuple(argl)
-        val = apply(stattoolc.wxToolBar_AddTool,(self.this,arg0,arg1.this,)+args)
-        val = wxToolBarToolPtr(val)
+    def AddTool(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_AddTool,(self,) + _args, _kwargs)
+        if val: val = wxToolBarToolPtr(val) 

         return val
         return val

-    def AddSimpleTool(self,arg0,arg1,*args):
-        val = apply(stattoolc.wxToolBar_AddSimpleTool,(self.this,arg0,arg1.this,)+args)
-        val = wxToolBarToolPtr(val)
+    def AddSimpleTool(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_AddSimpleTool,(self,) + _args, _kwargs)
+        if val: val = wxToolBarToolPtr(val) 

         return val
         return val

-    def EnableTool(self,arg0,arg1):
-        val = stattoolc.wxToolBar_EnableTool(self.this,arg0,arg1)
+    def EnableTool(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_EnableTool,(self,) + _args, _kwargs)

         return val
         return val

-    def FindToolForPosition(self,arg0,arg1):
-        val = stattoolc.wxToolBar_FindToolForPosition(self.this,arg0,arg1)
-        val = wxToolBarToolPtr(val)
+    def FindToolForPosition(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_FindToolForPosition,(self,) + _args, _kwargs)
+        if val: val = wxToolBarToolPtr(val) 

         return val
         return val

-    def GetToolSize(self):
-        val = stattoolc.wxToolBar_GetToolSize(self.this)
-        val = wxSizePtr(val)
-        val.thisown = 1
+    def GetToolSize(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_GetToolSize,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1

         return val
         return val

-    def GetToolBitmapSize(self):
-        val = stattoolc.wxToolBar_GetToolBitmapSize(self.this)
-        val = wxSizePtr(val)
-        val.thisown = 1
+    def GetToolBitmapSize(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_GetToolBitmapSize,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1

         return val
         return val

-    def SetToolBitmapSize(self,arg0):
-        val = stattoolc.wxToolBar_SetToolBitmapSize(self.this,arg0.this)
+    def SetToolBitmapSize(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_SetToolBitmapSize,(self,) + _args, _kwargs)

         return val
         return val

-    def GetMaxSize(self):
-        val = stattoolc.wxToolBar_GetMaxSize(self.this)
-        val = wxSizePtr(val)
-        val.thisown = 1
+    def GetMaxSize(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_GetMaxSize,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1

         return val
         return val

-    def GetToolEnabled(self,arg0):
-        val = stattoolc.wxToolBar_GetToolEnabled(self.this,arg0)
+    def GetToolEnabled(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_GetToolEnabled,(self,) + _args, _kwargs)

         return val
         return val

-    def GetToolLongHelp(self,arg0):
-        val = stattoolc.wxToolBar_GetToolLongHelp(self.this,arg0)
+    def GetToolLongHelp(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_GetToolLongHelp,(self,) + _args, _kwargs)

         return val
         return val

-    def GetToolPacking(self):
-        val = stattoolc.wxToolBar_GetToolPacking(self.this)
+    def GetToolPacking(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_GetToolPacking,(self,) + _args, _kwargs)

         return val
         return val

-    def GetToolSeparation(self):
-        val = stattoolc.wxToolBar_GetToolSeparation(self.this)
+    def GetToolSeparation(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_GetToolSeparation,(self,) + _args, _kwargs)

         return val
         return val

-    def GetToolShortHelp(self,arg0):
-        val = stattoolc.wxToolBar_GetToolShortHelp(self.this,arg0)
+    def GetToolShortHelp(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_GetToolShortHelp,(self,) + _args, _kwargs)

         return val
         return val

-    def GetToolState(self,arg0):
-        val = stattoolc.wxToolBar_GetToolState(self.this,arg0)
+    def GetToolState(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_GetToolState,(self,) + _args, _kwargs)

         return val
         return val

-    def Realize(self):
-        val = stattoolc.wxToolBar_Realize(self.this)
+    def Realize(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_Realize,(self,) + _args, _kwargs)

         return val
         return val

-    def SetToolLongHelp(self,arg0,arg1):
-        val = stattoolc.wxToolBar_SetToolLongHelp(self.this,arg0,arg1)
+    def SetToolLongHelp(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_SetToolLongHelp,(self,) + _args, _kwargs)

         return val
         return val

-    def SetToolShortHelp(self,arg0,arg1):
-        val = stattoolc.wxToolBar_SetToolShortHelp(self.this,arg0,arg1)
+    def SetToolShortHelp(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_SetToolShortHelp,(self,) + _args, _kwargs)

         return val
         return val

-    def SetMargins(self,arg0):
-        val = stattoolc.wxToolBar_SetMargins(self.this,arg0.this)
+    def SetMargins(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_SetMargins,(self,) + _args, _kwargs)

         return val
         return val

-    def SetToolPacking(self,arg0):
-        val = stattoolc.wxToolBar_SetToolPacking(self.this,arg0)
+    def SetToolPacking(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_SetToolPacking,(self,) + _args, _kwargs)

         return val
         return val

-    def SetToolSeparation(self,arg0):
-        val = stattoolc.wxToolBar_SetToolSeparation(self.this,arg0)
+    def SetToolSeparation(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_SetToolSeparation,(self,) + _args, _kwargs)

         return val
         return val

-    def ToggleTool(self,arg0,arg1):
-        val = stattoolc.wxToolBar_ToggleTool(self.this,arg0,arg1)
+    def ToggleTool(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_ToggleTool,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxToolBar instance>"
+        return "<C wxToolBar instance at %s>" % (self.this,)

 class wxToolBar(wxToolBarPtr):
 class wxToolBar(wxToolBarPtr):

-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(stattoolc.new_wxToolBar,(arg0.this,arg1,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(stattoolc.new_wxToolBar,_args,_kwargs)

         self.thisown = 1
         wx._StdWindowCallbacks(self)
 
         self.thisown = 1
         wx._StdWindowCallbacks(self)
 

diff --git a/utils/wxPython/src/msw/utils.cpp b/utils/wxPython/src/msw/utils.cpp
index b10a47023283407498e7e5b827a41888f6f55715..739ee9841c164a78b4c393ee0036221aa440b2af 100644 (file)
--- a/utils/wxPython/src/msw/utils.cpp
+++ b/utils/wxPython/src/msw/utils.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)

- * Version 1.1 (Patch 5)
+ * Version 1.1 (Patch 6)

  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.


@@ -24,16 +24,16 @@
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)

-#      define SWIGEXPORT(a,b) __declspec(dllexport) a b
+#      define SWIGEXPORT(a) __declspec(dllexport) a

 #   else
 #      if defined(__BORLANDC__)
 #   else
 #      if defined(__BORLANDC__)

-#          define SWIGEXPORT(a,b) a _export b
+#          define SWIGEXPORT(a) a _export 

 #      else
 #      else

-#          define SWIGEXPORT(a,b) a b
+#          define SWIGEXPORT(a) a 

 #      endif
 #   endif
 #else
 #      endif
 #   endif
 #else

-#   define SWIGEXPORT(a,b) a b
+#   define SWIGEXPORT(a) a 

 #endif
 
 #ifdef __cplusplus
 #endif
 
 #ifdef __cplusplus


@@ -43,12 +43,12 @@ extern "C" {
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);

+extern char *SWIG_GetPtrObj(PyObject *, void **, char *);

 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif
 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif

-

 #define SWIG_init    initutilsc
 
 #define SWIG_name    "utilsc"
 #define SWIG_init    initutilsc
 
 #define SWIG_name    "utilsc"


@@ -58,12 +58,13 @@ extern PyObject *SWIG_newvarlink(void);
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;

-    if (!target) {
+    PyObject*   o3;
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);
         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);


@@ -80,23 +81,23 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
     PyObject*   o3;
 
     PyObject*   o2;
     PyObject*   o3;
 

-    if (!target) {
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }
         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }

-        o3 = PyTuple_New(1);
-        PyTuple_SetItem(o3, 0, o);
+        o3 = PyTuple_New(1);            
+        PyTuple_SetItem(o3, 0, o);      

 
         o2 = target;
 
         o2 = target;

-        target = PySequence_Concat(o2, o3);
-        Py_DECREF(o2);
+        target = PySequence_Concat(o2, o3); 
+        Py_DECREF(o2);                      

         Py_DECREF(o3);
     }
     return target;
         Py_DECREF(o3);
     }
     return target;


@@ -128,15 +129,18 @@ static char* wxStringErrorMsg = "string type is required for parameter";
         }
         return ret;
     }
         }
         return ret;
     }

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

 #define new_wxConfig(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (new wxConfig(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
 static PyObject *_wrap_new_wxConfig(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxConfig * _result;
 #define new_wxConfig(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (new wxConfig(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
 static PyObject *_wrap_new_wxConfig(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxConfig * _result;

-    wxString * _arg0 = &wxPyEmptyStr;
-    wxString * _arg1 = &wxPyEmptyStr;
-    wxString * _arg2 = &wxPyEmptyStr;
-    wxString * _arg3 = &wxPyEmptyStr;
-    long  _arg4 = 0;
+    wxString * _arg0 = (wxString *) &wxPyEmptyStr;
+    wxString * _arg1 = (wxString *) &wxPyEmptyStr;
+    wxString * _arg2 = (wxString *) &wxPyEmptyStr;
+    wxString * _arg3 = (wxString *) &wxPyEmptyStr;
+    long  _arg4 = (long ) 0;

     PyObject * _obj0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;
     PyObject * _obj0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;


@@ -183,8 +187,13 @@ static PyObject *_wrap_new_wxConfig(PyObject *self, PyObject *args) {
         _result = (wxConfig *)new_wxConfig(*_arg0,*_arg1,*_arg2,*_arg3,_arg4);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxConfig *)new_wxConfig(*_arg0,*_arg1,*_arg2,*_arg3,_arg4);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxConfig_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxConfig_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     if (_obj0)
         delete _arg0;
 {
     if (_obj0)
         delete _arg0;


@@ -208,13 +217,14 @@ static PyObject *_wrap_new_wxConfig(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxConfig(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxConfig * _arg0;
 static PyObject *_wrap_delete_wxConfig(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxConfig * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:delete_wxConfig",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxConfig",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxConfig_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxConfig. Expected _wxConfig_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxConfig. Expected _wxConfig_p.");
         return NULL;
         }


@@ -233,13 +243,14 @@ static PyObject *_wrap_delete_wxConfig(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxConfig_DontCreateOnDemand(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxConfig * _arg0;
 static PyObject *_wrap_wxConfig_DontCreateOnDemand(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxConfig * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxConfig_DontCreateOnDemand",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxConfig_DontCreateOnDemand",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxConfig_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_DontCreateOnDemand. Expected _wxConfig_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_DontCreateOnDemand. Expected _wxConfig_p.");
         return NULL;
         }


@@ -259,13 +270,14 @@ static PyObject *_wrap_wxConfig_DeleteAll(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxConfig * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxConfig * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxConfig_DeleteAll",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxConfig_DeleteAll",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxConfig_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_DeleteAll. Expected _wxConfig_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_DeleteAll. Expected _wxConfig_p.");
         return NULL;
         }


@@ -285,16 +297,17 @@ static PyObject *_wrap_wxConfig_DeleteEntry(PyObject *self, PyObject *args) {
     bool  _result;
     wxConfig * _arg0;
     wxString * _arg1;
     bool  _result;
     wxConfig * _arg0;
     wxString * _arg1;

-    bool  _arg2 = TRUE;
-    char * _argc0 = 0;
+    bool  _arg2 = (bool ) TRUE;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
     PyObject * _obj1 = 0;

-    int tempbool2;
+    int tempbool2 = (int) TRUE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO|i:wxConfig_DeleteEntry",&_argc0,&_obj1,&tempbool2)) 
+    if(!PyArg_ParseTuple(args,"OO|i:wxConfig_DeleteEntry",&_argo0,&_obj1,&tempbool2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxConfig_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_DeleteEntry. Expected _wxConfig_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_DeleteEntry. Expected _wxConfig_p.");
         return NULL;
         }


@@ -326,14 +339,15 @@ static PyObject *_wrap_wxConfig_DeleteGroup(PyObject *self, PyObject *args) {
     bool  _result;
     wxConfig * _arg0;
     wxString * _arg1;
     bool  _result;
     wxConfig * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxConfig_DeleteGroup",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxConfig_DeleteGroup",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxConfig_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_DeleteGroup. Expected _wxConfig_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_DeleteGroup. Expected _wxConfig_p.");
         return NULL;
         }


@@ -364,14 +378,15 @@ static PyObject *_wrap_wxConfig_Exists(PyObject *self, PyObject *args) {
     bool  _result;
     wxConfig * _arg0;
     wxString * _arg1;
     bool  _result;
     wxConfig * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxConfig_Exists",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxConfig_Exists",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxConfig_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_Exists. Expected _wxConfig_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_Exists. Expected _wxConfig_p.");
         return NULL;
         }


@@ -401,15 +416,16 @@ static PyObject *_wrap_wxConfig_Flush(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxConfig * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxConfig * _arg0;

-    bool  _arg1 = FALSE;
-    char * _argc0 = 0;
-    int tempbool1;
+    bool  _arg1 = (bool ) FALSE;
+    PyObject * _argo0 = 0;
+    int tempbool1 = (int) FALSE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxConfig_Flush",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"O|i:wxConfig_Flush",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxConfig_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_Flush. Expected _wxConfig_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_Flush. Expected _wxConfig_p.");
         return NULL;
         }


@@ -429,13 +445,14 @@ static PyObject *_wrap_wxConfig_GetAppName(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxConfig * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxConfig * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxConfig_GetAppName",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxConfig_GetAppName",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxConfig_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_GetAppName. Expected _wxConfig_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_GetAppName. Expected _wxConfig_p.");
         return NULL;
         }


@@ -466,13 +483,14 @@ static PyObject *_wrap_wxConfig_GetFirstGroup(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     PyObject * _result;
     wxConfig * _arg0;
     PyObject * _resultobj;
     PyObject * _result;
     wxConfig * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxConfig_GetFirstGroup",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxConfig_GetFirstGroup",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxConfig_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_GetFirstGroup. Expected _wxConfig_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_GetFirstGroup. Expected _wxConfig_p.");
         return NULL;
         }


@@ -500,13 +518,14 @@ static PyObject *_wrap_wxConfig_GetFirstEntry(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     PyObject * _result;
     wxConfig * _arg0;
     PyObject * _resultobj;
     PyObject * _result;
     wxConfig * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxConfig_GetFirstEntry",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxConfig_GetFirstEntry",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxConfig_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_GetFirstEntry. Expected _wxConfig_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_GetFirstEntry. Expected _wxConfig_p.");
         return NULL;
         }


@@ -534,13 +553,14 @@ static PyObject *_wrap_wxConfig_GetNextGroup(PyObject *self, PyObject *args) {
     PyObject * _result;
     wxConfig * _arg0;
     long  _arg1;
     PyObject * _result;
     wxConfig * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxConfig_GetNextGroup",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxConfig_GetNextGroup",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxConfig_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_GetNextGroup. Expected _wxConfig_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_GetNextGroup. Expected _wxConfig_p.");
         return NULL;
         }


@@ -568,13 +588,14 @@ static PyObject *_wrap_wxConfig_GetNextEntry(PyObject *self, PyObject *args) {
     PyObject * _result;
     wxConfig * _arg0;
     long  _arg1;
     PyObject * _result;
     wxConfig * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxConfig_GetNextEntry",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxConfig_GetNextEntry",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxConfig_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_GetNextEntry. Expected _wxConfig_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_GetNextEntry. Expected _wxConfig_p.");
         return NULL;
         }


@@ -595,15 +616,16 @@ static PyObject *_wrap_wxConfig_GetNumberOfEntries(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     int  _result;
     wxConfig * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxConfig * _arg0;

-    bool  _arg1 = FALSE;
-    char * _argc0 = 0;
-    int tempbool1;
+    bool  _arg1 = (bool ) FALSE;
+    PyObject * _argo0 = 0;
+    int tempbool1 = (int) FALSE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxConfig_GetNumberOfEntries",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"O|i:wxConfig_GetNumberOfEntries",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxConfig_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_GetNumberOfEntries. Expected _wxConfig_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_GetNumberOfEntries. Expected _wxConfig_p.");
         return NULL;
         }


@@ -623,15 +645,16 @@ static PyObject *_wrap_wxConfig_GetNumberOfGroups(PyObject *self, PyObject *args
     PyObject * _resultobj;
     int  _result;
     wxConfig * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxConfig * _arg0;

-    bool  _arg1 = FALSE;
-    char * _argc0 = 0;
-    int tempbool1;
+    bool  _arg1 = (bool ) FALSE;
+    PyObject * _argo0 = 0;
+    int tempbool1 = (int) FALSE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxConfig_GetNumberOfGroups",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"O|i:wxConfig_GetNumberOfGroups",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxConfig_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_GetNumberOfGroups. Expected _wxConfig_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_GetNumberOfGroups. Expected _wxConfig_p.");
         return NULL;
         }


@@ -651,13 +674,14 @@ static PyObject *_wrap_wxConfig_GetPath(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxConfig * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxConfig * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxConfig_GetPath",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxConfig_GetPath",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxConfig_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_GetPath. Expected _wxConfig_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_GetPath. Expected _wxConfig_p.");
         return NULL;
         }


@@ -681,13 +705,14 @@ static PyObject *_wrap_wxConfig_GetVendorName(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxConfig * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxConfig * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxConfig_GetVendorName",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxConfig_GetVendorName",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxConfig_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_GetVendorName. Expected _wxConfig_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_GetVendorName. Expected _wxConfig_p.");
         return NULL;
         }


@@ -712,14 +737,15 @@ static PyObject *_wrap_wxConfig_HasEntry(PyObject *self, PyObject *args) {
     bool  _result;
     wxConfig * _arg0;
     wxString * _arg1;
     bool  _result;
     wxConfig * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxConfig_HasEntry",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxConfig_HasEntry",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxConfig_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_HasEntry. Expected _wxConfig_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_HasEntry. Expected _wxConfig_p.");
         return NULL;
         }


@@ -750,14 +776,15 @@ static PyObject *_wrap_wxConfig_HasGroup(PyObject *self, PyObject *args) {
     bool  _result;
     wxConfig * _arg0;
     wxString * _arg1;
     bool  _result;
     wxConfig * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxConfig_HasGroup",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxConfig_HasGroup",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxConfig_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_HasGroup. Expected _wxConfig_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_HasGroup. Expected _wxConfig_p.");
         return NULL;
         }


@@ -787,13 +814,14 @@ static PyObject *_wrap_wxConfig_IsExpandingEnvVars(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     bool  _result;
     wxConfig * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxConfig * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxConfig_IsExpandingEnvVars",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxConfig_IsExpandingEnvVars",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxConfig_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_IsExpandingEnvVars. Expected _wxConfig_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_IsExpandingEnvVars. Expected _wxConfig_p.");
         return NULL;
         }


@@ -812,13 +840,14 @@ static PyObject *_wrap_wxConfig_IsRecordingDefaults(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     bool  _result;
     wxConfig * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxConfig * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxConfig_IsRecordingDefaults",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxConfig_IsRecordingDefaults",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxConfig_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_IsRecordingDefaults. Expected _wxConfig_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_IsRecordingDefaults. Expected _wxConfig_p.");
         return NULL;
         }


@@ -838,16 +867,17 @@ static PyObject *_wrap_wxConfig_Read(PyObject *self, PyObject *args) {
     wxString * _result;
     wxConfig * _arg0;
     wxString * _arg1;
     wxString * _result;
     wxConfig * _arg0;
     wxString * _arg1;

-    wxString * _arg2 = &wxPyEmptyStr;
-    char * _argc0 = 0;
+    wxString * _arg2 = (wxString *) &wxPyEmptyStr;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO|O:wxConfig_Read",&_argc0,&_obj1,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"OO|O:wxConfig_Read",&_argo0,&_obj1,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxConfig_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_Read. Expected _wxConfig_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_Read. Expected _wxConfig_p.");
         return NULL;
         }


@@ -895,15 +925,16 @@ static PyObject *_wrap_wxConfig_ReadInt(PyObject *self, PyObject *args) {
     long  _result;
     wxConfig * _arg0;
     wxString * _arg1;
     long  _result;
     wxConfig * _arg0;
     wxString * _arg1;

-    long  _arg2 = 0;
-    char * _argc0 = 0;
+    long  _arg2 = (long ) 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO|l:wxConfig_ReadInt",&_argc0,&_obj1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"OO|l:wxConfig_ReadInt",&_argo0,&_obj1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxConfig_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_ReadInt. Expected _wxConfig_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_ReadInt. Expected _wxConfig_p.");
         return NULL;
         }


@@ -934,15 +965,16 @@ static PyObject *_wrap_wxConfig_ReadFloat(PyObject *self, PyObject *args) {
     double  _result;
     wxConfig * _arg0;
     wxString * _arg1;
     double  _result;
     wxConfig * _arg0;
     wxString * _arg1;

-    double  _arg2 = 0.0;
-    char * _argc0 = 0;
+    double  _arg2 = (double ) 0.0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO|d:wxConfig_ReadFloat",&_argc0,&_obj1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"OO|d:wxConfig_ReadFloat",&_argo0,&_obj1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxConfig_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_ReadFloat. Expected _wxConfig_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_ReadFloat. Expected _wxConfig_p.");
         return NULL;
         }


@@ -971,15 +1003,16 @@ static PyObject *_wrap_wxConfig_ReadFloat(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxConfig_SetExpandEnvVars(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxConfig * _arg0;
 static PyObject *_wrap_wxConfig_SetExpandEnvVars(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxConfig * _arg0;

-    bool  _arg1 = TRUE;
-    char * _argc0 = 0;
-    int tempbool1;
+    bool  _arg1 = (bool ) TRUE;
+    PyObject * _argo0 = 0;
+    int tempbool1 = (int) TRUE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxConfig_SetExpandEnvVars",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"O|i:wxConfig_SetExpandEnvVars",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxConfig_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_SetExpandEnvVars. Expected _wxConfig_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_SetExpandEnvVars. Expected _wxConfig_p.");
         return NULL;
         }


@@ -1000,14 +1033,15 @@ static PyObject *_wrap_wxConfig_SetPath(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxConfig * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxConfig * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxConfig_SetPath",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxConfig_SetPath",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxConfig_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_SetPath. Expected _wxConfig_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_SetPath. Expected _wxConfig_p.");
         return NULL;
         }


@@ -1037,15 +1071,16 @@ static PyObject *_wrap_wxConfig_SetPath(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxConfig_SetRecordDefaults(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxConfig * _arg0;
 static PyObject *_wrap_wxConfig_SetRecordDefaults(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxConfig * _arg0;

-    bool  _arg1 = TRUE;
-    char * _argc0 = 0;
-    int tempbool1;
+    bool  _arg1 = (bool ) TRUE;
+    PyObject * _argo0 = 0;
+    int tempbool1 = (int) TRUE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxConfig_SetRecordDefaults",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"O|i:wxConfig_SetRecordDefaults",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxConfig_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_SetRecordDefaults. Expected _wxConfig_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_SetRecordDefaults. Expected _wxConfig_p.");
         return NULL;
         }


@@ -1068,15 +1103,16 @@ static PyObject *_wrap_wxConfig_Write(PyObject *self, PyObject *args) {
     wxConfig * _arg0;
     wxString * _arg1;
     wxString * _arg2;
     wxConfig * _arg0;
     wxString * _arg1;
     wxString * _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sOO:wxConfig_Write",&_argc0,&_obj1,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"OOO:wxConfig_Write",&_argo0,&_obj1,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxConfig_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_Write. Expected _wxConfig_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_Write. Expected _wxConfig_p.");
         return NULL;
         }


@@ -1119,14 +1155,15 @@ static PyObject *_wrap_wxConfig_WriteInt(PyObject *self, PyObject *args) {
     wxConfig * _arg0;
     wxString * _arg1;
     long  _arg2;
     wxConfig * _arg0;
     wxString * _arg1;
     long  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sOl:wxConfig_WriteInt",&_argc0,&_obj1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"OOl:wxConfig_WriteInt",&_argo0,&_obj1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxConfig_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_WriteInt. Expected _wxConfig_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_WriteInt. Expected _wxConfig_p.");
         return NULL;
         }


@@ -1158,14 +1195,15 @@ static PyObject *_wrap_wxConfig_WriteFloat(PyObject *self, PyObject *args) {
     wxConfig * _arg0;
     wxString * _arg1;
     double  _arg2;
     wxConfig * _arg0;
     wxString * _arg1;
     double  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sOd:wxConfig_WriteFloat",&_argc0,&_obj1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"OOd:wxConfig_WriteFloat",&_argo0,&_obj1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxConfig_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_WriteFloat. Expected _wxConfig_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_WriteFloat. Expected _wxConfig_p.");
         return NULL;
         }


@@ -1191,43 +1229,66 @@ static PyObject *_wrap_wxConfig_WriteFloat(PyObject *self, PyObject *args) {
 }
 
 static PyMethodDef utilscMethods[] = {
 }
 
 static PyMethodDef utilscMethods[] = {

-        { "wxConfig_WriteFloat", _wrap_wxConfig_WriteFloat, 1 },
-        { "wxConfig_WriteInt", _wrap_wxConfig_WriteInt, 1 },
-        { "wxConfig_Write", _wrap_wxConfig_Write, 1 },
-        { "wxConfig_SetRecordDefaults", _wrap_wxConfig_SetRecordDefaults, 1 },
-        { "wxConfig_SetPath", _wrap_wxConfig_SetPath, 1 },
-        { "wxConfig_SetExpandEnvVars", _wrap_wxConfig_SetExpandEnvVars, 1 },
-        { "wxConfig_ReadFloat", _wrap_wxConfig_ReadFloat, 1 },
-        { "wxConfig_ReadInt", _wrap_wxConfig_ReadInt, 1 },
-        { "wxConfig_Read", _wrap_wxConfig_Read, 1 },
-        { "wxConfig_IsRecordingDefaults", _wrap_wxConfig_IsRecordingDefaults, 1 },
-        { "wxConfig_IsExpandingEnvVars", _wrap_wxConfig_IsExpandingEnvVars, 1 },
-        { "wxConfig_HasGroup", _wrap_wxConfig_HasGroup, 1 },
-        { "wxConfig_HasEntry", _wrap_wxConfig_HasEntry, 1 },
-        { "wxConfig_GetVendorName", _wrap_wxConfig_GetVendorName, 1 },
-        { "wxConfig_GetPath", _wrap_wxConfig_GetPath, 1 },
-        { "wxConfig_GetNumberOfGroups", _wrap_wxConfig_GetNumberOfGroups, 1 },
-        { "wxConfig_GetNumberOfEntries", _wrap_wxConfig_GetNumberOfEntries, 1 },
-        { "wxConfig_GetNextEntry", _wrap_wxConfig_GetNextEntry, 1 },
-        { "wxConfig_GetNextGroup", _wrap_wxConfig_GetNextGroup, 1 },
-        { "wxConfig_GetFirstEntry", _wrap_wxConfig_GetFirstEntry, 1 },
-        { "wxConfig_GetFirstGroup", _wrap_wxConfig_GetFirstGroup, 1 },
-        { "wxConfig_GetAppName", _wrap_wxConfig_GetAppName, 1 },
-        { "wxConfig_Flush", _wrap_wxConfig_Flush, 1 },
-        { "wxConfig_Exists", _wrap_wxConfig_Exists, 1 },
-        { "wxConfig_DeleteGroup", _wrap_wxConfig_DeleteGroup, 1 },
-        { "wxConfig_DeleteEntry", _wrap_wxConfig_DeleteEntry, 1 },
-        { "wxConfig_DeleteAll", _wrap_wxConfig_DeleteAll, 1 },
-        { "wxConfig_DontCreateOnDemand", _wrap_wxConfig_DontCreateOnDemand, 1 },
-        { "delete_wxConfig", _wrap_delete_wxConfig, 1 },
-        { "new_wxConfig", _wrap_new_wxConfig, 1 },
+        { "wxConfig_WriteFloat", _wrap_wxConfig_WriteFloat, METH_VARARGS },
+        { "wxConfig_WriteInt", _wrap_wxConfig_WriteInt, METH_VARARGS },
+        { "wxConfig_Write", _wrap_wxConfig_Write, METH_VARARGS },
+        { "wxConfig_SetRecordDefaults", _wrap_wxConfig_SetRecordDefaults, METH_VARARGS },
+        { "wxConfig_SetPath", _wrap_wxConfig_SetPath, METH_VARARGS },
+        { "wxConfig_SetExpandEnvVars", _wrap_wxConfig_SetExpandEnvVars, METH_VARARGS },
+        { "wxConfig_ReadFloat", _wrap_wxConfig_ReadFloat, METH_VARARGS },
+        { "wxConfig_ReadInt", _wrap_wxConfig_ReadInt, METH_VARARGS },
+        { "wxConfig_Read", _wrap_wxConfig_Read, METH_VARARGS },
+        { "wxConfig_IsRecordingDefaults", _wrap_wxConfig_IsRecordingDefaults, METH_VARARGS },
+        { "wxConfig_IsExpandingEnvVars", _wrap_wxConfig_IsExpandingEnvVars, METH_VARARGS },
+        { "wxConfig_HasGroup", _wrap_wxConfig_HasGroup, METH_VARARGS },
+        { "wxConfig_HasEntry", _wrap_wxConfig_HasEntry, METH_VARARGS },
+        { "wxConfig_GetVendorName", _wrap_wxConfig_GetVendorName, METH_VARARGS },
+        { "wxConfig_GetPath", _wrap_wxConfig_GetPath, METH_VARARGS },
+        { "wxConfig_GetNumberOfGroups", _wrap_wxConfig_GetNumberOfGroups, METH_VARARGS },
+        { "wxConfig_GetNumberOfEntries", _wrap_wxConfig_GetNumberOfEntries, METH_VARARGS },
+        { "wxConfig_GetNextEntry", _wrap_wxConfig_GetNextEntry, METH_VARARGS },
+        { "wxConfig_GetNextGroup", _wrap_wxConfig_GetNextGroup, METH_VARARGS },
+        { "wxConfig_GetFirstEntry", _wrap_wxConfig_GetFirstEntry, METH_VARARGS },
+        { "wxConfig_GetFirstGroup", _wrap_wxConfig_GetFirstGroup, METH_VARARGS },
+        { "wxConfig_GetAppName", _wrap_wxConfig_GetAppName, METH_VARARGS },
+        { "wxConfig_Flush", _wrap_wxConfig_Flush, METH_VARARGS },
+        { "wxConfig_Exists", _wrap_wxConfig_Exists, METH_VARARGS },
+        { "wxConfig_DeleteGroup", _wrap_wxConfig_DeleteGroup, METH_VARARGS },
+        { "wxConfig_DeleteEntry", _wrap_wxConfig_DeleteEntry, METH_VARARGS },
+        { "wxConfig_DeleteAll", _wrap_wxConfig_DeleteAll, METH_VARARGS },
+        { "wxConfig_DontCreateOnDemand", _wrap_wxConfig_DontCreateOnDemand, METH_VARARGS },
+        { "delete_wxConfig", _wrap_delete_wxConfig, METH_VARARGS },
+        { "new_wxConfig", _wrap_new_wxConfig, METH_VARARGS },

         { NULL, NULL }
 };
         { NULL, NULL }
 };

+#ifdef __cplusplus
+}
+#endif
+/*
+ * This table is used by the pointer type-checker
+ */
+static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
+    { "_signed_long","_long",0},
+    { "_long","_unsigned_long",0},
+    { "_long","_signed_long",0},
+    { "_wxConfig","_class_wxConfig",0},
+    { "_unsigned_long","_long",0},
+    { "_signed_int","_int",0},
+    { "_unsigned_short","_short",0},
+    { "_signed_short","_short",0},
+    { "_unsigned_int","_int",0},
+    { "_short","_unsigned_short",0},
+    { "_short","_signed_short",0},
+    { "_int","_unsigned_int",0},
+    { "_int","_signed_int",0},
+    { "_class_wxConfig","_wxConfig",0},
+{0,0,0}};
+

 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif
 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif

-SWIGEXPORT(void,initutilsc)() {
+SWIGEXPORT(void) initutilsc() {

         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("utilsc", utilscMethods);
         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("utilsc", utilscMethods);


@@ -1237,22 +1298,9 @@ SWIGEXPORT(void,initutilsc)() {
     wxClassInfo::CleanUpClasses();
     wxClassInfo::InitializeClasses();
 
     wxClassInfo::CleanUpClasses();
     wxClassInfo::InitializeClasses();
 

-/*
- * These are the pointer type-equivalency mappings. 
- * (Used by the SWIG pointer type-checker).
- */
-        SWIG_RegisterMapping("_signed_long","_long",0);
-        SWIG_RegisterMapping("_long","_unsigned_long",0);
-        SWIG_RegisterMapping("_long","_signed_long",0);
-        SWIG_RegisterMapping("_wxConfig","_class_wxConfig",0);
-        SWIG_RegisterMapping("_unsigned_long","_long",0);
-        SWIG_RegisterMapping("_signed_int","_int",0);
-        SWIG_RegisterMapping("_unsigned_short","_short",0);
-        SWIG_RegisterMapping("_signed_short","_short",0);
-        SWIG_RegisterMapping("_unsigned_int","_int",0);
-        SWIG_RegisterMapping("_short","_unsigned_short",0);
-        SWIG_RegisterMapping("_short","_signed_short",0);
-        SWIG_RegisterMapping("_int","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_signed_int",0);
-        SWIG_RegisterMapping("_class_wxConfig","_wxConfig",0);
+{
+   int i;
+   for (i = 0; _swig_mapping[i].n1; i++)
+        SWIG_RegisterMapping(_swig_mapping[i].n1,_swig_mapping[i].n2,_swig_mapping[i].pcnv);
+}

 }
 }

diff --git a/utils/wxPython/src/msw/utils.py b/utils/wxPython/src/msw/utils.py
index 5d437af2076899f52cab289379543f1f1fb1ab70..86f4d662d16cff1d6476a5e91141506fa4c948d3 100644 (file)
--- a/utils/wxPython/src/msw/utils.py
+++ b/utils/wxPython/src/msw/utils.py
@@ -4,98 +4,98 @@ class wxConfigPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self, utilsc=utilsc):
+    def __del__(self,utilsc=utilsc):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            utilsc.delete_wxConfig(self.this)
-    def DontCreateOnDemand(self):
-        val = utilsc.wxConfig_DontCreateOnDemand(self.this)
+            utilsc.delete_wxConfig(self)
+    def DontCreateOnDemand(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_DontCreateOnDemand,(self,) + _args, _kwargs)

         return val
         return val

-    def DeleteAll(self):
-        val = utilsc.wxConfig_DeleteAll(self.this)
+    def DeleteAll(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_DeleteAll,(self,) + _args, _kwargs)

         return val
         return val

-    def DeleteEntry(self,arg0,*args):
-        val = apply(utilsc.wxConfig_DeleteEntry,(self.this,arg0,)+args)
+    def DeleteEntry(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_DeleteEntry,(self,) + _args, _kwargs)

         return val
         return val

-    def DeleteGroup(self,arg0):
-        val = utilsc.wxConfig_DeleteGroup(self.this,arg0)
+    def DeleteGroup(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_DeleteGroup,(self,) + _args, _kwargs)

         return val
         return val

-    def Exists(self,arg0):
-        val = utilsc.wxConfig_Exists(self.this,arg0)
+    def Exists(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_Exists,(self,) + _args, _kwargs)

         return val
         return val

-    def Flush(self,*args):
-        val = apply(utilsc.wxConfig_Flush,(self.this,)+args)
+    def Flush(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_Flush,(self,) + _args, _kwargs)

         return val
         return val

-    def GetAppName(self):
-        val = utilsc.wxConfig_GetAppName(self.this)
+    def GetAppName(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_GetAppName,(self,) + _args, _kwargs)

         return val
         return val

-    def GetFirstGroup(self):
-        val = utilsc.wxConfig_GetFirstGroup(self.this)
+    def GetFirstGroup(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_GetFirstGroup,(self,) + _args, _kwargs)

         return val
         return val

-    def GetFirstEntry(self):
-        val = utilsc.wxConfig_GetFirstEntry(self.this)
+    def GetFirstEntry(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_GetFirstEntry,(self,) + _args, _kwargs)

         return val
         return val

-    def GetNextGroup(self,arg0):
-        val = utilsc.wxConfig_GetNextGroup(self.this,arg0)
+    def GetNextGroup(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_GetNextGroup,(self,) + _args, _kwargs)

         return val
         return val

-    def GetNextEntry(self,arg0):
-        val = utilsc.wxConfig_GetNextEntry(self.this,arg0)
+    def GetNextEntry(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_GetNextEntry,(self,) + _args, _kwargs)

         return val
         return val

-    def GetNumberOfEntries(self,*args):
-        val = apply(utilsc.wxConfig_GetNumberOfEntries,(self.this,)+args)
+    def GetNumberOfEntries(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_GetNumberOfEntries,(self,) + _args, _kwargs)

         return val
         return val

-    def GetNumberOfGroups(self,*args):
-        val = apply(utilsc.wxConfig_GetNumberOfGroups,(self.this,)+args)
+    def GetNumberOfGroups(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_GetNumberOfGroups,(self,) + _args, _kwargs)

         return val
         return val

-    def GetPath(self):
-        val = utilsc.wxConfig_GetPath(self.this)
+    def GetPath(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_GetPath,(self,) + _args, _kwargs)

         return val
         return val

-    def GetVendorName(self):
-        val = utilsc.wxConfig_GetVendorName(self.this)
+    def GetVendorName(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_GetVendorName,(self,) + _args, _kwargs)

         return val
         return val

-    def HasEntry(self,arg0):
-        val = utilsc.wxConfig_HasEntry(self.this,arg0)
+    def HasEntry(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_HasEntry,(self,) + _args, _kwargs)

         return val
         return val

-    def HasGroup(self,arg0):
-        val = utilsc.wxConfig_HasGroup(self.this,arg0)
+    def HasGroup(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_HasGroup,(self,) + _args, _kwargs)

         return val
         return val

-    def IsExpandingEnvVars(self):
-        val = utilsc.wxConfig_IsExpandingEnvVars(self.this)
+    def IsExpandingEnvVars(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_IsExpandingEnvVars,(self,) + _args, _kwargs)

         return val
         return val

-    def IsRecordingDefaults(self):
-        val = utilsc.wxConfig_IsRecordingDefaults(self.this)
+    def IsRecordingDefaults(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_IsRecordingDefaults,(self,) + _args, _kwargs)

         return val
         return val

-    def Read(self,arg0,*args):
-        val = apply(utilsc.wxConfig_Read,(self.this,arg0,)+args)
+    def Read(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_Read,(self,) + _args, _kwargs)

         return val
         return val

-    def ReadInt(self,arg0,*args):
-        val = apply(utilsc.wxConfig_ReadInt,(self.this,arg0,)+args)
+    def ReadInt(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_ReadInt,(self,) + _args, _kwargs)

         return val
         return val

-    def ReadFloat(self,arg0,*args):
-        val = apply(utilsc.wxConfig_ReadFloat,(self.this,arg0,)+args)
+    def ReadFloat(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_ReadFloat,(self,) + _args, _kwargs)

         return val
         return val

-    def SetExpandEnvVars(self,*args):
-        val = apply(utilsc.wxConfig_SetExpandEnvVars,(self.this,)+args)
+    def SetExpandEnvVars(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_SetExpandEnvVars,(self,) + _args, _kwargs)

         return val
         return val

-    def SetPath(self,arg0):
-        val = utilsc.wxConfig_SetPath(self.this,arg0)
+    def SetPath(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_SetPath,(self,) + _args, _kwargs)

         return val
         return val

-    def SetRecordDefaults(self,*args):
-        val = apply(utilsc.wxConfig_SetRecordDefaults,(self.this,)+args)
+    def SetRecordDefaults(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_SetRecordDefaults,(self,) + _args, _kwargs)

         return val
         return val

-    def Write(self,arg0,arg1):
-        val = utilsc.wxConfig_Write(self.this,arg0,arg1)
+    def Write(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_Write,(self,) + _args, _kwargs)

         return val
         return val

-    def WriteInt(self,arg0,arg1):
-        val = utilsc.wxConfig_WriteInt(self.this,arg0,arg1)
+    def WriteInt(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_WriteInt,(self,) + _args, _kwargs)

         return val
         return val

-    def WriteFloat(self,arg0,arg1):
-        val = utilsc.wxConfig_WriteFloat(self.this,arg0,arg1)
+    def WriteFloat(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_WriteFloat,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxConfig instance>"
+        return "<C wxConfig instance at %s>" % (self.this,)

 class wxConfig(wxConfigPtr):
 class wxConfig(wxConfigPtr):

-    def __init__(self,*args) :
-        self.this = apply(utilsc.new_wxConfig,()+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(utilsc.new_wxConfig,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 

diff --git a/utils/wxPython/src/msw/windows.cpp b/utils/wxPython/src/msw/windows.cpp
index 8a1cbf660aaebd578eae919cf059c9d9758ce56a..54c3ce3c156d872f192e84da008662b70d8968d7 100644 (file)
--- a/utils/wxPython/src/msw/windows.cpp
+++ b/utils/wxPython/src/msw/windows.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)

- * Version 1.1 (Patch 5)
+ * Version 1.1 (Patch 6)

  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.


@@ -24,16 +24,16 @@
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)

-#      define SWIGEXPORT(a,b) __declspec(dllexport) a b
+#      define SWIGEXPORT(a) __declspec(dllexport) a

 #   else
 #      if defined(__BORLANDC__)
 #   else
 #      if defined(__BORLANDC__)

-#          define SWIGEXPORT(a,b) a _export b
+#          define SWIGEXPORT(a) a _export 

 #      else
 #      else

-#          define SWIGEXPORT(a,b) a b
+#          define SWIGEXPORT(a) a 

 #      endif
 #   endif
 #else
 #      endif
 #   endif
 #else

-#   define SWIGEXPORT(a,b) a b
+#   define SWIGEXPORT(a) a 

 #endif
 
 #ifdef __cplusplus
 #endif
 
 #ifdef __cplusplus


@@ -43,12 +43,12 @@ extern "C" {
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);

+extern char *SWIG_GetPtrObj(PyObject *, void **, char *);

 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif
 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif

-

 #define SWIG_init    initwindowsc
 
 #define SWIG_name    "windowsc"
 #define SWIG_init    initwindowsc
 
 #define SWIG_name    "windowsc"


@@ -58,12 +58,13 @@ extern PyObject *SWIG_newvarlink(void);
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;

-    if (!target) {
+    PyObject*   o3;
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);
         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);


@@ -80,23 +81,23 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
     PyObject*   o3;
 
     PyObject*   o2;
     PyObject*   o3;
 

-    if (!target) {
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }
         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }

-        o3 = PyTuple_New(1);
-        PyTuple_SetItem(o3, 0, o);
+        o3 = PyTuple_New(1);            
+        PyTuple_SetItem(o3, 0, o);      

 
         o2 = target;
 
         o2 = target;

-        target = PySequence_Concat(o2, o3);
-        Py_DECREF(o2);
+        target = PySequence_Concat(o2, o3); 
+        Py_DECREF(o2);                      

         Py_DECREF(o3);
     }
     return target;
         Py_DECREF(o3);
     }
     return target;


@@ -125,6 +126,9 @@ wxWindow* wxWindow_FromHWND(unsigned long hWnd) {
     win->SubclassWin(hWnd);
     return win;
 }
     win->SubclassWin(hWnd);
     return win;
 }

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

 static PyObject *_wrap_wxWindow_FindFocus(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _result;
 static PyObject *_wrap_wxWindow_FindFocus(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _result;


@@ -138,8 +142,13 @@ static PyObject *_wrap_wxWindow_FindFocus(PyObject *self, PyObject *args) {
         _result = (wxWindow *)wxWindow_FindFocus();
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxWindow *)wxWindow_FindFocus();
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -157,8 +166,13 @@ static PyObject *_wrap_wxWindow_FromHWND(PyObject *self, PyObject *args) {
         _result = (wxWindow *)wxWindow_FromHWND(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxWindow *)wxWindow_FromHWND(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -168,20 +182,22 @@ static PyObject *_wrap_wxEvtHandler_ProcessEvent(PyObject *self, PyObject *args)
     bool  _result;
     wxEvtHandler * _arg0;
     wxEvent * _arg1;
     bool  _result;
     wxEvtHandler * _arg0;
     wxEvent * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxEvtHandler_ProcessEvent",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxEvtHandler_ProcessEvent",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxEvtHandler_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvtHandler_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvtHandler_ProcessEvent. Expected _wxEvtHandler_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvtHandler_ProcessEvent. Expected _wxEvtHandler_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxEvent_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxEvtHandler_ProcessEvent. Expected _wxEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxEvtHandler_ProcessEvent. Expected _wxEvent_p.");
         return NULL;
         }


@@ -209,14 +225,15 @@ static PyObject *_wrap_wxEvtHandler_Connect(PyObject *self, PyObject *args) {
     int  _arg2;
     int  _arg3;
     PyObject * _arg4;
     int  _arg2;
     int  _arg3;
     PyObject * _arg4;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj4 = 0;
 
     self = self;
     PyObject * _obj4 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siiiO:wxEvtHandler_Connect",&_argc0,&_arg1,&_arg2,&_arg3,&_obj4)) 
+    if(!PyArg_ParseTuple(args,"OiiiO:wxEvtHandler_Connect",&_argo0,&_arg1,&_arg2,&_arg3,&_obj4)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxEvtHandler_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvtHandler_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvtHandler_Connect. Expected _wxEvtHandler_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvtHandler_Connect. Expected _wxEvtHandler_p.");
         return NULL;
         }


@@ -248,32 +265,35 @@ static PyObject *_wrap_new_wxWindow(PyObject *self, PyObject *args) {
     wxWindow * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxWindow * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;

-    wxPoint * _arg2 = &wxPyDefaultPosition;
-    wxSize * _arg3 = &wxPyDefaultSize;
-    long  _arg4 = 0;
-    char * _arg5 = "panel";
-    char * _argc0 = 0;
-    char * _argc2 = 0;
-    char * _argc3 = 0;
+    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    long  _arg4 = (long ) 0;
+    char * _arg5 = (char *) "panel";
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;
+    PyObject * _argo3 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si|ssls:new_wxWindow",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTuple(args,"Oi|OOls:new_wxWindow",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxWindow. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxWindow. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxWindow. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxWindow. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxSize_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxWindow. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxWindow. Expected _wxSize_p.");
         return NULL;
         }


@@ -283,8 +303,13 @@ static PyObject *_wrap_new_wxWindow(PyObject *self, PyObject *args) {
         _result = (wxWindow *)new_wxWindow(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxWindow *)new_wxWindow(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -292,13 +317,14 @@ static PyObject *_wrap_new_wxWindow(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxWindow_CaptureMouse(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;
 static PyObject *_wrap_wxWindow_CaptureMouse(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_CaptureMouse",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_CaptureMouse",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_CaptureMouse. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_CaptureMouse. Expected _wxWindow_p.");
         return NULL;
         }


@@ -317,14 +343,15 @@ static PyObject *_wrap_wxWindow_CaptureMouse(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxWindow_Center(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;
 static PyObject *_wrap_wxWindow_Center(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;

-    int  _arg1 = (wxBOTH);
-    char * _argc0 = 0;
+    int  _arg1 = (int ) wxBOTH;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxWindow_Center",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"O|i:wxWindow_Center",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Center. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Center. Expected _wxWindow_p.");
         return NULL;
         }


@@ -343,14 +370,15 @@ static PyObject *_wrap_wxWindow_Center(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxWindow_Centre(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;
 static PyObject *_wrap_wxWindow_Centre(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;

-    int  _arg1 = (wxBOTH);
-    char * _argc0 = 0;
+    int  _arg1 = (int ) wxBOTH;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxWindow_Centre",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"O|i:wxWindow_Centre",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Centre. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Centre. Expected _wxWindow_p.");
         return NULL;
         }


@@ -369,14 +397,15 @@ static PyObject *_wrap_wxWindow_Centre(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxWindow_CentreOnParent(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;
 static PyObject *_wrap_wxWindow_CentreOnParent(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;

-    int  _arg1 = (wxBOTH);
-    char * _argc0 = 0;
+    int  _arg1 = (int ) wxBOTH;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxWindow_CentreOnParent",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"O|i:wxWindow_CentreOnParent",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_CentreOnParent. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_CentreOnParent. Expected _wxWindow_p.");
         return NULL;
         }


@@ -395,14 +424,15 @@ static PyObject *_wrap_wxWindow_CentreOnParent(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxWindow_CenterOnParent(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;
 static PyObject *_wrap_wxWindow_CenterOnParent(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;

-    int  _arg1 = (wxBOTH);
-    char * _argc0 = 0;
+    int  _arg1 = (int ) wxBOTH;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxWindow_CenterOnParent",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"O|i:wxWindow_CenterOnParent",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_CenterOnParent. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_CenterOnParent. Expected _wxWindow_p.");
         return NULL;
         }


@@ -423,17 +453,18 @@ static PyObject *_wrap_wxWindow_ClientToScreenXY(PyObject *self, PyObject *args)
     wxWindow * _arg0;
     int * _arg1;
     int * _arg2;
     wxWindow * _arg0;
     int * _arg1;
     int * _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int  temp;
     PyObject * _obj1 = 0;
     int  temp0;
     PyObject * _obj2 = 0;
 
     self = self;
     int  temp;
     PyObject * _obj1 = 0;
     int  temp0;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sOO:wxWindow_ClientToScreenXY",&_argc0,&_obj1,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"OOO:wxWindow_ClientToScreenXY",&_argo0,&_obj1,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ClientToScreenXY. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ClientToScreenXY. Expected _wxWindow_p.");
         return NULL;
         }


@@ -472,21 +503,23 @@ static PyObject *_wrap_wxWindow_ClientToScreen(PyObject *self, PyObject *args) {
     wxPoint * _result;
     wxWindow * _arg0;
     wxPoint * _arg1;
     wxPoint * _result;
     wxWindow * _arg0;
     wxPoint * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxWindow_ClientToScreen",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxWindow_ClientToScreen",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ClientToScreen. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ClientToScreen. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPoint_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_ClientToScreen. Expected _wxPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_ClientToScreen. Expected _wxPoint_p.");
         return NULL;
         }


@@ -506,14 +539,15 @@ static PyObject *_wrap_wxWindow_Close(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;

-    int  _arg1 = (0);
-    char * _argc0 = 0;
+    int  _arg1 = (int ) FALSE;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxWindow_Close",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"O|i:wxWindow_Close",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Close. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Close. Expected _wxWindow_p.");
         return NULL;
         }


@@ -532,13 +566,14 @@ static PyObject *_wrap_wxWindow_Destroy(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_Destroy",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_Destroy",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Destroy. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Destroy. Expected _wxWindow_p.");
         return NULL;
         }


@@ -556,13 +591,14 @@ static PyObject *_wrap_wxWindow_Destroy(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxWindow_DestroyChildren(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;
 static PyObject *_wrap_wxWindow_DestroyChildren(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_DestroyChildren",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_DestroyChildren",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_DestroyChildren. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_DestroyChildren. Expected _wxWindow_p.");
         return NULL;
         }


@@ -582,14 +618,15 @@ static PyObject *_wrap_wxWindow_DragAcceptFiles(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxWindow * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxWindow_DragAcceptFiles",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxWindow_DragAcceptFiles",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_DragAcceptFiles. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_DragAcceptFiles. Expected _wxWindow_p.");
         return NULL;
         }


@@ -610,14 +647,15 @@ static PyObject *_wrap_wxWindow_Enable(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxWindow_Enable",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxWindow_Enable",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Enable. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Enable. Expected _wxWindow_p.");
         return NULL;
         }


@@ -639,14 +677,15 @@ static PyObject *_wrap_wxWindow_FindWindowById(PyObject *self, PyObject *args) {
     wxWindow * _result;
     wxWindow * _arg0;
     long  _arg1;
     wxWindow * _result;
     wxWindow * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxWindow_FindWindowById",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxWindow_FindWindowById",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_FindWindowById. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_FindWindowById. Expected _wxWindow_p.");
         return NULL;
         }


@@ -656,8 +695,13 @@ static PyObject *_wrap_wxWindow_FindWindowById(PyObject *self, PyObject *args) {
         _result = (wxWindow *)wxWindow_FindWindowById(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxWindow *)wxWindow_FindWindowById(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -667,15 +711,16 @@ static PyObject *_wrap_wxWindow_FindWindowByName(PyObject *self, PyObject *args)
     wxWindow * _result;
     wxWindow * _arg0;
     wxString * _arg1;
     wxWindow * _result;
     wxWindow * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
     char _ptemp[128];
 
     self = self;
     PyObject * _obj1 = 0;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxWindow_FindWindowByName",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxWindow_FindWindowByName",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_FindWindowByName. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_FindWindowByName. Expected _wxWindow_p.");
         return NULL;
         }


@@ -692,8 +737,13 @@ static PyObject *_wrap_wxWindow_FindWindowByName(PyObject *self, PyObject *args)
         _result = (wxWindow *)wxWindow_FindWindowByName(_arg0,*_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxWindow *)wxWindow_FindWindowByName(_arg0,*_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     if (_obj1)
         delete _arg1;
 {
     if (_obj1)
         delete _arg1;


@@ -705,13 +755,14 @@ static PyObject *_wrap_wxWindow_FindWindowByName(PyObject *self, PyObject *args)
 static PyObject *_wrap_wxWindow_Fit(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;
 static PyObject *_wrap_wxWindow_Fit(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_Fit",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_Fit",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Fit. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Fit. Expected _wxWindow_p.");
         return NULL;
         }


@@ -731,14 +782,15 @@ static PyObject *_wrap_wxWindow_GetBackgroundColour(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     wxColour * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxColour * _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetBackgroundColour",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_GetBackgroundColour",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetBackgroundColour. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetBackgroundColour. Expected _wxWindow_p.");
         return NULL;
         }


@@ -758,13 +810,14 @@ static PyObject *_wrap_wxWindow_GetCharHeight(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetCharHeight",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_GetCharHeight",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetCharHeight. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetCharHeight. Expected _wxWindow_p.");
         return NULL;
         }


@@ -783,13 +836,14 @@ static PyObject *_wrap_wxWindow_GetCharWidth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetCharWidth",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_GetCharWidth",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetCharWidth. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetCharWidth. Expected _wxWindow_p.");
         return NULL;
         }


@@ -811,7 +865,7 @@ static PyObject *_wrap_wxWindow_GetClientSizeTuple(PyObject *self, PyObject *arg
     int  temp;
     int * _arg2;
     int  temp0;
     int  temp;
     int * _arg2;
     int  temp0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 {
 
     self = self;
 {


@@ -820,10 +874,11 @@ static PyObject *_wrap_wxWindow_GetClientSizeTuple(PyObject *self, PyObject *arg
 {
   _arg2 = &temp0;
 }
 {
   _arg2 = &temp0;
 }

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetClientSizeTuple",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_GetClientSizeTuple",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetClientSizeTuple. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetClientSizeTuple. Expected _wxWindow_p.");
         return NULL;
         }


@@ -853,14 +908,15 @@ static PyObject *_wrap_wxWindow_GetClientSize(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxSize * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxSize * _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetClientSize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_GetClientSize",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetClientSize. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetClientSize. Expected _wxWindow_p.");
         return NULL;
         }


@@ -880,14 +936,15 @@ static PyObject *_wrap_wxWindow_GetConstraints(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxLayoutConstraints * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxLayoutConstraints * _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetConstraints",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_GetConstraints",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetConstraints. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetConstraints. Expected _wxWindow_p.");
         return NULL;
         }


@@ -897,8 +954,13 @@ static PyObject *_wrap_wxWindow_GetConstraints(PyObject *self, PyObject *args) {
         _result = (wxLayoutConstraints *)wxWindow_GetConstraints(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxLayoutConstraints *)wxWindow_GetConstraints(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxLayoutConstraints_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxLayoutConstraints_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -907,14 +969,15 @@ static PyObject *_wrap_wxWindow_GetFont(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFont * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxFont * _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetFont",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_GetFont",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetFont. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetFont. Expected _wxWindow_p.");
         return NULL;
         }


@@ -925,8 +988,13 @@ static PyObject *_wrap_wxWindow_GetFont(PyObject *self, PyObject *args) {
     _result = (wxFont *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxFont *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -935,14 +1003,15 @@ static PyObject *_wrap_wxWindow_GetForegroundColour(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     wxColour * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxColour * _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetForegroundColour",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_GetForegroundColour",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetForegroundColour. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetForegroundColour. Expected _wxWindow_p.");
         return NULL;
         }


@@ -962,14 +1031,15 @@ static PyObject *_wrap_wxWindow_GetGrandParent(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxWindow * _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetGrandParent",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_GetGrandParent",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetGrandParent. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetGrandParent. Expected _wxWindow_p.");
         return NULL;
         }


@@ -979,8 +1049,13 @@ static PyObject *_wrap_wxWindow_GetGrandParent(PyObject *self, PyObject *args) {
         _result = (wxWindow *)wxWindow_GetGrandParent(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxWindow *)wxWindow_GetGrandParent(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -989,13 +1064,14 @@ static PyObject *_wrap_wxWindow_GetId(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetId",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_GetId",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetId. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetId. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1014,13 +1090,14 @@ static PyObject *_wrap_wxWindow_GetLabel(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetLabel",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_GetLabel",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetLabel. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetLabel. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1044,14 +1121,15 @@ static PyObject *_wrap_wxWindow_SetLabel(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxWindow_SetLabel",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxWindow_SetLabel",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetLabel. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetLabel. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1082,13 +1160,14 @@ static PyObject *_wrap_wxWindow_GetName(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetName",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_GetName",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetName. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetName. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1112,14 +1191,15 @@ static PyObject *_wrap_wxWindow_GetParent(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxWindow * _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetParent",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_GetParent",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetParent. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetParent. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1129,8 +1209,13 @@ static PyObject *_wrap_wxWindow_GetParent(PyObject *self, PyObject *args) {
         _result = (wxWindow *)wxWindow_GetParent(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxWindow *)wxWindow_GetParent(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1142,7 +1227,7 @@ static PyObject *_wrap_wxWindow_GetPositionTuple(PyObject *self, PyObject *args)
     int  temp;
     int * _arg2;
     int  temp0;
     int  temp;
     int * _arg2;
     int  temp0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 {
 
     self = self;
 {


@@ -1151,10 +1236,11 @@ static PyObject *_wrap_wxWindow_GetPositionTuple(PyObject *self, PyObject *args)
 {
   _arg2 = &temp0;
 }
 {
   _arg2 = &temp0;
 }

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetPositionTuple",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_GetPositionTuple",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetPositionTuple. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetPositionTuple. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1184,14 +1270,15 @@ static PyObject *_wrap_wxWindow_GetPosition(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPoint * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxPoint * _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetPosition",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_GetPosition",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetPosition. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetPosition. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1211,14 +1298,15 @@ static PyObject *_wrap_wxWindow_GetRect(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRect * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxRect * _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetRect",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_GetRect",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetRect. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetRect. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1239,13 +1327,14 @@ static PyObject *_wrap_wxWindow_GetScrollThumb(PyObject *self, PyObject *args) {
     int  _result;
     wxWindow * _arg0;
     int  _arg1;
     int  _result;
     wxWindow * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxWindow_GetScrollThumb",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxWindow_GetScrollThumb",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetScrollThumb. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetScrollThumb. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1265,13 +1354,14 @@ static PyObject *_wrap_wxWindow_GetScrollPos(PyObject *self, PyObject *args) {
     int  _result;
     wxWindow * _arg0;
     int  _arg1;
     int  _result;
     wxWindow * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxWindow_GetScrollPos",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxWindow_GetScrollPos",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetScrollPos. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetScrollPos. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1291,13 +1381,14 @@ static PyObject *_wrap_wxWindow_GetScrollRange(PyObject *self, PyObject *args) {
     int  _result;
     wxWindow * _arg0;
     int  _arg1;
     int  _result;
     wxWindow * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxWindow_GetScrollRange",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxWindow_GetScrollRange",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetScrollRange. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetScrollRange. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1319,7 +1410,7 @@ static PyObject *_wrap_wxWindow_GetSizeTuple(PyObject *self, PyObject *args) {
     int  temp;
     int * _arg2;
     int  temp0;
     int  temp;
     int * _arg2;
     int  temp0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 {
 
     self = self;
 {


@@ -1328,10 +1419,11 @@ static PyObject *_wrap_wxWindow_GetSizeTuple(PyObject *self, PyObject *args) {
 {
   _arg2 = &temp0;
 }
 {
   _arg2 = &temp0;
 }

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetSizeTuple",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_GetSizeTuple",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetSizeTuple. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetSizeTuple. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1361,14 +1453,15 @@ static PyObject *_wrap_wxWindow_GetSize(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxSize * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxSize * _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetSize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_GetSize",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetSize. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetSize. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1392,7 +1485,7 @@ static PyObject *_wrap_wxWindow_GetTextExtent(PyObject *self, PyObject *args) {
     int  temp;
     int * _arg3;
     int  temp0;
     int  temp;
     int * _arg3;
     int  temp0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;


@@ -1402,10 +1495,11 @@ static PyObject *_wrap_wxWindow_GetTextExtent(PyObject *self, PyObject *args) {
 {
   _arg3 = &temp0;
 }
 {
   _arg3 = &temp0;
 }

-    if(!PyArg_ParseTuple(args,"sO:wxWindow_GetTextExtent",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxWindow_GetTextExtent",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetTextExtent. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetTextExtent. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1454,10 +1548,10 @@ static PyObject *_wrap_wxWindow_GetFullTextExtent(PyObject *self, PyObject *args
     int  temp1;
     int * _arg5;
     int  temp2;
     int  temp1;
     int * _arg5;
     int  temp2;

-    wxFont * _arg6 = NULL;
-    char * _argc0 = 0;
+    wxFont * _arg6 = (wxFont *) NULL;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
     PyObject * _obj1 = 0;

-    char * _argc6 = 0;
+    PyObject * _argo6 = 0;

 
     self = self;
 {
 
     self = self;
 {


@@ -1472,10 +1566,11 @@ static PyObject *_wrap_wxWindow_GetFullTextExtent(PyObject *self, PyObject *args
 {
   _arg5 = &temp2;
 }
 {
   _arg5 = &temp2;
 }

-    if(!PyArg_ParseTuple(args,"sO|s:wxWindow_GetFullTextExtent",&_argc0,&_obj1,&_argc6)) 
+    if(!PyArg_ParseTuple(args,"OO|O:wxWindow_GetFullTextExtent",&_argo0,&_obj1,&_argo6)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetFullTextExtent. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetFullTextExtent. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1487,8 +1582,9 @@ static PyObject *_wrap_wxWindow_GetFullTextExtent(PyObject *self, PyObject *args
     }
     _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }
     }
     _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }

-    if (_argc6) {
-        if (SWIG_GetPtr(_argc6,(void **) &_arg6,"_wxFont_p")) {
+    if (_argo6) {
+        if (_argo6 == Py_None) { _arg6 = NULL; }
+        else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxFont_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of wxWindow_GetFullTextExtent. Expected _wxFont_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of wxWindow_GetFullTextExtent. Expected _wxFont_p.");
         return NULL;
         }


@@ -1532,13 +1628,14 @@ static PyObject *_wrap_wxWindow_GetTitle(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetTitle",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_GetTitle",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetTitle. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetTitle. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1562,14 +1659,15 @@ static PyObject *_wrap_wxWindow_GetUpdateRegion(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxRegion * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxRegion * _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetUpdateRegion",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_GetUpdateRegion",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetUpdateRegion. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetUpdateRegion. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1589,13 +1687,14 @@ static PyObject *_wrap_wxWindow_GetWindowStyleFlag(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     long  _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetWindowStyleFlag",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_GetWindowStyleFlag",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetWindowStyleFlag. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetWindowStyleFlag. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1614,13 +1713,14 @@ static PyObject *_wrap_wxWindow_Hide(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_Hide",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_Hide",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Hide. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Hide. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1638,13 +1738,14 @@ static PyObject *_wrap_wxWindow_Hide(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxWindow_InitDialog(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;
 static PyObject *_wrap_wxWindow_InitDialog(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_InitDialog",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_InitDialog",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_InitDialog. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_InitDialog. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1664,13 +1765,14 @@ static PyObject *_wrap_wxWindow_IsEnabled(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_IsEnabled",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_IsEnabled",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_IsEnabled. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_IsEnabled. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1689,13 +1791,14 @@ static PyObject *_wrap_wxWindow_IsRetained(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_IsRetained",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_IsRetained",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_IsRetained. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_IsRetained. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1714,13 +1817,14 @@ static PyObject *_wrap_wxWindow_IsShown(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_IsShown",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_IsShown",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_IsShown. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_IsShown. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1739,13 +1843,14 @@ static PyObject *_wrap_wxWindow_IsTopLevel(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_IsTopLevel",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_IsTopLevel",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_IsTopLevel. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_IsTopLevel. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1763,13 +1868,14 @@ static PyObject *_wrap_wxWindow_IsTopLevel(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxWindow_Layout(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;
 static PyObject *_wrap_wxWindow_Layout(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_Layout",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_Layout",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Layout. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Layout. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1791,23 +1897,25 @@ static PyObject *_wrap_wxWindow_LoadFromResource(PyObject *self, PyObject *args)
     wxWindow * _arg0;
     wxWindow * _arg1;
     wxString * _arg2;
     wxWindow * _arg0;
     wxWindow * _arg1;
     wxString * _arg2;

-    wxResourceTable * _arg3 = NULL;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    wxResourceTable * _arg3 = (wxResourceTable *) NULL;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     PyObject * _obj2 = 0;
     PyObject * _obj2 = 0;

-    char * _argc3 = 0;
+    PyObject * _argo3 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ssO|s:wxWindow_LoadFromResource",&_argc0,&_argc1,&_obj2,&_argc3)) 
+    if(!PyArg_ParseTuple(args,"OOO|O:wxWindow_LoadFromResource",&_argo0,&_argo1,&_obj2,&_argo3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_LoadFromResource. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_LoadFromResource. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_LoadFromResource. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_LoadFromResource. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1819,8 +1927,9 @@ static PyObject *_wrap_wxWindow_LoadFromResource(PyObject *self, PyObject *args)
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxResourceTable_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxResourceTable_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxWindow_LoadFromResource. Expected _wxResourceTable_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxWindow_LoadFromResource. Expected _wxResourceTable_p.");
         return NULL;
         }


@@ -1842,13 +1951,14 @@ static PyObject *_wrap_wxWindow_LoadFromResource(PyObject *self, PyObject *args)
 static PyObject *_wrap_wxWindow_Lower(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;
 static PyObject *_wrap_wxWindow_Lower(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_Lower",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_Lower",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Lower. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Lower. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1868,14 +1978,15 @@ static PyObject *_wrap_wxWindow_MakeModal(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxWindow_MakeModal",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxWindow_MakeModal",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_MakeModal. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_MakeModal. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1897,13 +2008,14 @@ static PyObject *_wrap_wxWindow_MoveXY(PyObject *self, PyObject *args) {
     wxWindow * _arg0;
     int  _arg1;
     int  _arg2;
     wxWindow * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxWindow_MoveXY",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxWindow_MoveXY",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_MoveXY. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_MoveXY. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1923,20 +2035,22 @@ static PyObject *_wrap_wxWindow_Move(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxPoint * _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxPoint * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxWindow_Move",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxWindow_Move",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Move. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Move. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPoint_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_Move. Expected _wxPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_Move. Expected _wxPoint_p.");
         return NULL;
         }


@@ -1959,20 +2073,22 @@ static PyObject *_wrap_wxWindow_PopupMenuXY(PyObject *self, PyObject *args) {
     wxMenu * _arg1;
     int  _arg2;
     int  _arg3;
     wxMenu * _arg1;
     int  _arg2;
     int  _arg3;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ssii:wxWindow_PopupMenuXY",&_argc0,&_argc1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"OOii:wxWindow_PopupMenuXY",&_argo0,&_argo1,&_arg2,&_arg3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_PopupMenuXY. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_PopupMenuXY. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxMenu_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_PopupMenuXY. Expected _wxMenu_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_PopupMenuXY. Expected _wxMenu_p.");
         return NULL;
         }


@@ -1993,27 +2109,30 @@ static PyObject *_wrap_wxWindow_PopupMenu(PyObject *self, PyObject *args) {
     wxWindow * _arg0;
     wxMenu * _arg1;
     wxPoint * _arg2;
     wxWindow * _arg0;
     wxMenu * _arg1;
     wxPoint * _arg2;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
-    char * _argc2 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sss:wxWindow_PopupMenu",&_argc0,&_argc1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"OOO:wxWindow_PopupMenu",&_argo0,&_argo1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_PopupMenu. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_PopupMenu. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxMenu_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_PopupMenu. Expected _wxMenu_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_PopupMenu. Expected _wxMenu_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxWindow_PopupMenu. Expected _wxPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxWindow_PopupMenu. Expected _wxPoint_p.");
         return NULL;
         }


@@ -2031,13 +2150,14 @@ static PyObject *_wrap_wxWindow_PopupMenu(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxWindow_Raise(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;
 static PyObject *_wrap_wxWindow_Raise(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_Raise",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_Raise",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Raise. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Raise. Expected _wxWindow_p.");
         return NULL;
         }


@@ -2056,24 +2176,26 @@ static PyObject *_wrap_wxWindow_Raise(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxWindow_Refresh(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;
 static PyObject *_wrap_wxWindow_Refresh(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;

-    bool  _arg1 = (1);
-    wxRect * _arg2 = NULL;
-    char * _argc0 = 0;
-    int tempbool1;
-    char * _argc2 = 0;
+    bool  _arg1 = (bool ) TRUE;
+    wxRect * _arg2 = (wxRect *) NULL;
+    PyObject * _argo0 = 0;
+    int tempbool1 = (int) TRUE;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|is:wxWindow_Refresh",&_argc0,&tempbool1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"O|iO:wxWindow_Refresh",&_argo0,&tempbool1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Refresh. Expected _wxWindow_p.");
         return NULL;
         }
     }
     _arg1 = (bool ) tempbool1;
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Refresh. Expected _wxWindow_p.");
         return NULL;
         }
     }
     _arg1 = (bool ) tempbool1;

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxRect_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxWindow_Refresh. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxWindow_Refresh. Expected _wxRect_p.");
         return NULL;
         }


@@ -2092,13 +2214,14 @@ static PyObject *_wrap_wxWindow_Refresh(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxWindow_ReleaseMouse(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;
 static PyObject *_wrap_wxWindow_ReleaseMouse(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_ReleaseMouse",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_ReleaseMouse",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ReleaseMouse. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ReleaseMouse. Expected _wxWindow_p.");
         return NULL;
         }


@@ -2119,20 +2242,22 @@ static PyObject *_wrap_wxWindow_Reparent(PyObject *self, PyObject *args) {
     bool  _result;
     wxWindow * _arg0;
     wxWindow * _arg1;
     bool  _result;
     wxWindow * _arg0;
     wxWindow * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxWindow_Reparent",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxWindow_Reparent",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Reparent. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Reparent. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_Reparent. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_Reparent. Expected _wxWindow_p.");
         return NULL;
         }


@@ -2152,17 +2277,18 @@ static PyObject *_wrap_wxWindow_ScreenToClientXY(PyObject *self, PyObject *args)
     wxWindow * _arg0;
     int * _arg1;
     int * _arg2;
     wxWindow * _arg0;
     int * _arg1;
     int * _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int  temp;
     PyObject * _obj1 = 0;
     int  temp0;
     PyObject * _obj2 = 0;
 
     self = self;
     int  temp;
     PyObject * _obj1 = 0;
     int  temp0;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sOO:wxWindow_ScreenToClientXY",&_argc0,&_obj1,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"OOO:wxWindow_ScreenToClientXY",&_argo0,&_obj1,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ScreenToClientXY. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ScreenToClientXY. Expected _wxWindow_p.");
         return NULL;
         }


@@ -2201,21 +2327,23 @@ static PyObject *_wrap_wxWindow_ScreenToClient(PyObject *self, PyObject *args) {
     wxPoint * _result;
     wxWindow * _arg0;
     wxPoint * _arg1;
     wxPoint * _result;
     wxWindow * _arg0;
     wxPoint * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxWindow_ScreenToClient",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxWindow_ScreenToClient",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ScreenToClient. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ScreenToClient. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPoint_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_ScreenToClient. Expected _wxPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_ScreenToClient. Expected _wxPoint_p.");
         return NULL;
         }


@@ -2236,21 +2364,23 @@ static PyObject *_wrap_wxWindow_ScrollWindow(PyObject *self, PyObject *args) {
     wxWindow * _arg0;
     int  _arg1;
     int  _arg2;
     wxWindow * _arg0;
     int  _arg1;
     int  _arg2;

-    wxRect * _arg3 = NULL;
-    char * _argc0 = 0;
-    char * _argc3 = 0;
+    wxRect * _arg3 = (wxRect *) NULL;
+    PyObject * _argo0 = 0;
+    PyObject * _argo3 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii|s:wxWindow_ScrollWindow",&_argc0,&_arg1,&_arg2,&_argc3)) 
+    if(!PyArg_ParseTuple(args,"Oii|O:wxWindow_ScrollWindow",&_argo0,&_arg1,&_arg2,&_argo3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ScrollWindow. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ScrollWindow. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxRect_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxWindow_ScrollWindow. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxWindow_ScrollWindow. Expected _wxRect_p.");
         return NULL;
         }


@@ -2270,20 +2400,22 @@ static PyObject *_wrap_wxWindow_SetAcceleratorTable(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxAcceleratorTable * _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxAcceleratorTable * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxWindow_SetAcceleratorTable",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxWindow_SetAcceleratorTable",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetAcceleratorTable. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetAcceleratorTable. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxAcceleratorTable_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxAcceleratorTable_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetAcceleratorTable. Expected _wxAcceleratorTable_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetAcceleratorTable. Expected _wxAcceleratorTable_p.");
         return NULL;
         }


@@ -2303,14 +2435,15 @@ static PyObject *_wrap_wxWindow_SetAutoLayout(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxWindow_SetAutoLayout",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxWindow_SetAutoLayout",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetAutoLayout. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetAutoLayout. Expected _wxWindow_p.");
         return NULL;
         }


@@ -2331,20 +2464,22 @@ static PyObject *_wrap_wxWindow_SetBackgroundColour(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxColour * _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxColour * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxWindow_SetBackgroundColour",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxWindow_SetBackgroundColour",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetBackgroundColour. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetBackgroundColour. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxColour_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetBackgroundColour. Expected _wxColour_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetBackgroundColour. Expected _wxColour_p.");
         return NULL;
         }


@@ -2364,20 +2499,22 @@ static PyObject *_wrap_wxWindow_SetConstraints(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxLayoutConstraints * _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxLayoutConstraints * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxWindow_SetConstraints",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxWindow_SetConstraints",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetConstraints. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetConstraints. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxLayoutConstraints_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxLayoutConstraints_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetConstraints. Expected _wxLayoutConstraints_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetConstraints. Expected _wxLayoutConstraints_p.");
         return NULL;
         }


@@ -2396,13 +2533,14 @@ static PyObject *_wrap_wxWindow_SetConstraints(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxWindow_SetFocus(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;
 static PyObject *_wrap_wxWindow_SetFocus(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_SetFocus",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_SetFocus",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetFocus. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetFocus. Expected _wxWindow_p.");
         return NULL;
         }


@@ -2422,20 +2560,22 @@ static PyObject *_wrap_wxWindow_SetFont(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxFont * _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxFont * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxWindow_SetFont",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxWindow_SetFont",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetFont. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetFont. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxFont_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxFont_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetFont. Expected _wxFont_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetFont. Expected _wxFont_p.");
         return NULL;
         }


@@ -2455,20 +2595,22 @@ static PyObject *_wrap_wxWindow_SetForegroundColour(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxColour * _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxColour * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxWindow_SetForegroundColour",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxWindow_SetForegroundColour",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetForegroundColour. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetForegroundColour. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxColour_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetForegroundColour. Expected _wxColour_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetForegroundColour. Expected _wxColour_p.");
         return NULL;
         }


@@ -2488,13 +2630,14 @@ static PyObject *_wrap_wxWindow_SetId(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxWindow_SetId",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxWindow_SetId",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetId. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetId. Expected _wxWindow_p.");
         return NULL;
         }


@@ -2514,14 +2657,15 @@ static PyObject *_wrap_wxWindow_SetName(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxWindow_SetName",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxWindow_SetName",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetName. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetName. Expected _wxWindow_p.");
         return NULL;
         }


@@ -2555,15 +2699,16 @@ static PyObject *_wrap_wxWindow_SetScrollbar(PyObject *self, PyObject *args) {
     int  _arg2;
     int  _arg3;
     int  _arg4;
     int  _arg2;
     int  _arg3;
     int  _arg4;

-    bool  _arg5 = (1);
-    char * _argc0 = 0;
-    int tempbool5;
+    bool  _arg5 = (bool ) TRUE;
+    PyObject * _argo0 = 0;
+    int tempbool5 = (int) TRUE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siiii|i:wxWindow_SetScrollbar",&_argc0,&_arg1,&_arg2,&_arg3,&_arg4,&tempbool5)) 
+    if(!PyArg_ParseTuple(args,"Oiiii|i:wxWindow_SetScrollbar",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&tempbool5)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetScrollbar. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetScrollbar. Expected _wxWindow_p.");
         return NULL;
         }


@@ -2585,15 +2730,16 @@ static PyObject *_wrap_wxWindow_SetScrollPos(PyObject *self, PyObject *args) {
     wxWindow * _arg0;
     int  _arg1;
     int  _arg2;
     wxWindow * _arg0;
     int  _arg1;
     int  _arg2;

-    bool  _arg3 = (1);
-    char * _argc0 = 0;
-    int tempbool3;
+    bool  _arg3 = (bool ) TRUE;
+    PyObject * _argo0 = 0;
+    int tempbool3 = (int) TRUE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii|i:wxWindow_SetScrollPos",&_argc0,&_arg1,&_arg2,&tempbool3)) 
+    if(!PyArg_ParseTuple(args,"Oii|i:wxWindow_SetScrollPos",&_argo0,&_arg1,&_arg2,&tempbool3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetScrollPos. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetScrollPos. Expected _wxWindow_p.");
         return NULL;
         }


@@ -2617,14 +2763,15 @@ static PyObject *_wrap_wxWindow_SetDimensions(PyObject *self, PyObject *args) {
     int  _arg2;
     int  _arg3;
     int  _arg4;
     int  _arg2;
     int  _arg3;
     int  _arg4;

-    int  _arg5 = (wxSIZE_AUTO);
-    char * _argc0 = 0;
+    int  _arg5 = (int ) wxSIZE_AUTO;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siiii|i:wxWindow_SetDimensions",&_argc0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTuple(args,"Oiiii|i:wxWindow_SetDimensions",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetDimensions. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetDimensions. Expected _wxWindow_p.");
         return NULL;
         }


@@ -2646,20 +2793,22 @@ static PyObject *_wrap_wxWindow_SetSize(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxSize * _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxSize * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxWindow_SetSize",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxWindow_SetSize",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetSize. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetSize. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxSize_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetSize. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetSize. Expected _wxSize_p.");
         return NULL;
         }


@@ -2681,20 +2830,22 @@ static PyObject *_wrap_wxWindow_SetPosition(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxPoint * _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxPoint * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxWindow_SetPosition",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxWindow_SetPosition",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetPosition. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetPosition. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPoint_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetPosition. Expected _wxPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetPosition. Expected _wxPoint_p.");
         return NULL;
         }


@@ -2713,19 +2864,20 @@ static PyObject *_wrap_wxWindow_SetPosition(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxWindow_SetSizeHints(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;
 static PyObject *_wrap_wxWindow_SetSizeHints(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;

-    int  _arg1 = -1;
-    int  _arg2 = -1;
-    int  _arg3 = -1;
-    int  _arg4 = -1;
-    int  _arg5 = -1;
-    int  _arg6 = -1;
-    char * _argc0 = 0;
+    int  _arg1 = (int ) -1;
+    int  _arg2 = (int ) -1;
+    int  _arg3 = (int ) -1;
+    int  _arg4 = (int ) -1;
+    int  _arg5 = (int ) -1;
+    int  _arg6 = (int ) -1;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|iiiiii:wxWindow_SetSizeHints",&_argc0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6)) 
+    if(!PyArg_ParseTuple(args,"O|iiiiii:wxWindow_SetSizeHints",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetSizeHints. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetSizeHints. Expected _wxWindow_p.");
         return NULL;
         }


@@ -2746,13 +2898,14 @@ static PyObject *_wrap_wxWindow_SetClientSizeWH(PyObject *self, PyObject *args)
     wxWindow * _arg0;
     int  _arg1;
     int  _arg2;
     wxWindow * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxWindow_SetClientSizeWH",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxWindow_SetClientSizeWH",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetClientSizeWH. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetClientSizeWH. Expected _wxWindow_p.");
         return NULL;
         }


@@ -2772,20 +2925,22 @@ static PyObject *_wrap_wxWindow_SetClientSize(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxSize * _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxSize * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxWindow_SetClientSize",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxWindow_SetClientSize",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetClientSize. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetClientSize. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxSize_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetClientSize. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetClientSize. Expected _wxSize_p.");
         return NULL;
         }


@@ -2805,20 +2960,22 @@ static PyObject *_wrap_wxWindow_SetCursor(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxCursor * _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxCursor * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxWindow_SetCursor",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxWindow_SetCursor",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetCursor. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetCursor. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxCursor_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxCursor_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetCursor. Expected _wxCursor_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetCursor. Expected _wxCursor_p.");
         return NULL;
         }


@@ -2838,14 +2995,15 @@ static PyObject *_wrap_wxWindow_SetTitle(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxWindow_SetTitle",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxWindow_SetTitle",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetTitle. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetTitle. Expected _wxWindow_p.");
         return NULL;
         }


@@ -2877,14 +3035,15 @@ static PyObject *_wrap_wxWindow_Show(PyObject *self, PyObject *args) {
     bool  _result;
     wxWindow * _arg0;
     bool  _arg1;
     bool  _result;
     wxWindow * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxWindow_Show",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxWindow_Show",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Show. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Show. Expected _wxWindow_p.");
         return NULL;
         }


@@ -2904,13 +3063,14 @@ static PyObject *_wrap_wxWindow_TransferDataFromWindow(PyObject *self, PyObject
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_TransferDataFromWindow",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_TransferDataFromWindow",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_TransferDataFromWindow. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_TransferDataFromWindow. Expected _wxWindow_p.");
         return NULL;
         }


@@ -2929,13 +3089,14 @@ static PyObject *_wrap_wxWindow_TransferDataToWindow(PyObject *self, PyObject *a
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_TransferDataToWindow",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_TransferDataToWindow",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_TransferDataToWindow. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_TransferDataToWindow. Expected _wxWindow_p.");
         return NULL;
         }


@@ -2954,13 +3115,14 @@ static PyObject *_wrap_wxWindow_Validate(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_Validate",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_Validate",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Validate. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Validate. Expected _wxWindow_p.");
         return NULL;
         }


@@ -2980,13 +3142,14 @@ static PyObject *_wrap_wxWindow_WarpPointer(PyObject *self, PyObject *args) {
     wxWindow * _arg0;
     int  _arg1;
     int  _arg2;
     wxWindow * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxWindow_WarpPointer",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxWindow_WarpPointer",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_WarpPointer. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_WarpPointer. Expected _wxWindow_p.");
         return NULL;
         }


@@ -3007,21 +3170,23 @@ static PyObject *_wrap_wxWindow_ConvertDialogPointToPixels(PyObject *self, PyObj
     wxPoint * _result;
     wxWindow * _arg0;
     wxPoint * _arg1;
     wxPoint * _result;
     wxWindow * _arg0;
     wxPoint * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxWindow_ConvertDialogPointToPixels",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxWindow_ConvertDialogPointToPixels",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ConvertDialogPointToPixels. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ConvertDialogPointToPixels. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPoint_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_ConvertDialogPointToPixels. Expected _wxPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_ConvertDialogPointToPixels. Expected _wxPoint_p.");
         return NULL;
         }


@@ -3042,21 +3207,23 @@ static PyObject *_wrap_wxWindow_ConvertDialogSizeToPixels(PyObject *self, PyObje
     wxSize * _result;
     wxWindow * _arg0;
     wxSize * _arg1;
     wxSize * _result;
     wxWindow * _arg0;
     wxSize * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxWindow_ConvertDialogSizeToPixels",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxWindow_ConvertDialogSizeToPixels",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ConvertDialogSizeToPixels. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ConvertDialogSizeToPixels. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxSize_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_ConvertDialogSizeToPixels. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_ConvertDialogSizeToPixels. Expected _wxSize_p.");
         return NULL;
         }


@@ -3077,21 +3244,23 @@ static PyObject *_wrap_wxWindow_ConvertPixelPointToDialog(PyObject *self, PyObje
     wxPoint * _result;
     wxWindow * _arg0;
     wxPoint * _arg1;
     wxPoint * _result;
     wxWindow * _arg0;
     wxPoint * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxWindow_ConvertPixelPointToDialog",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxWindow_ConvertPixelPointToDialog",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ConvertPixelPointToDialog. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ConvertPixelPointToDialog. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPoint_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_ConvertPixelPointToDialog. Expected _wxPoint_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_ConvertPixelPointToDialog. Expected _wxPoint_p.");
         return NULL;
         }


@@ -3112,21 +3281,23 @@ static PyObject *_wrap_wxWindow_ConvertPixelSizeToDialog(PyObject *self, PyObjec
     wxSize * _result;
     wxWindow * _arg0;
     wxSize * _arg1;
     wxSize * _result;
     wxWindow * _arg0;
     wxSize * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxWindow_ConvertPixelSizeToDialog",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxWindow_ConvertPixelSizeToDialog",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ConvertPixelSizeToDialog. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ConvertPixelSizeToDialog. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxSize_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_ConvertPixelSizeToDialog. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_ConvertPixelSizeToDialog. Expected _wxSize_p.");
         return NULL;
         }


@@ -3146,14 +3317,15 @@ static PyObject *_wrap_wxWindow_SetToolTipString(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxWindow_SetToolTipString",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxWindow_SetToolTipString",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetToolTipString. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetToolTipString. Expected _wxWindow_p.");
         return NULL;
         }


@@ -3184,20 +3356,22 @@ static PyObject *_wrap_wxWindow_SetToolTip(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxToolTip * _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxToolTip * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxWindow_SetToolTip",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxWindow_SetToolTip",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetToolTip. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetToolTip. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxToolTip_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxToolTip_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetToolTip. Expected _wxToolTip_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetToolTip. Expected _wxToolTip_p.");
         return NULL;
         }


@@ -3217,14 +3391,15 @@ static PyObject *_wrap_wxWindow_GetToolTip(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxToolTip * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxToolTip * _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetToolTip",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxWindow_GetToolTip",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetToolTip. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetToolTip. Expected _wxWindow_p.");
         return NULL;
         }


@@ -3234,8 +3409,13 @@ static PyObject *_wrap_wxWindow_GetToolTip(PyObject *self, PyObject *args) {
         _result = (wxToolTip *)wxWindow_GetToolTip(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxToolTip *)wxWindow_GetToolTip(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolTip_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolTip_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3261,32 +3441,35 @@ static PyObject *_wrap_new_wxPanel(PyObject *self, PyObject *args) {
     wxPanel * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxPanel * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;

-    wxPoint * _arg2 = &wxPyDefaultPosition;
-    wxSize * _arg3 = &wxPyDefaultSize;
-    long  _arg4 = (wxTAB_TRAVERSAL);
-    char * _arg5 = "panel";
-    char * _argc0 = 0;
-    char * _argc2 = 0;
-    char * _argc3 = 0;
+    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    long  _arg4 = (long ) wxTAB_TRAVERSAL;
+    char * _arg5 = (char *) "panel";
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;
+    PyObject * _argo3 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si|ssls:new_wxPanel",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTuple(args,"Oi|OOls:new_wxPanel",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPanel. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPanel. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxPanel. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxPanel. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxSize_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxPanel. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxPanel. Expected _wxSize_p.");
         return NULL;
         }


@@ -3296,8 +3479,13 @@ static PyObject *_wrap_new_wxPanel(PyObject *self, PyObject *args) {
         _result = (wxPanel *)new_wxPanel(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxPanel *)new_wxPanel(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPanel_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPanel_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3305,13 +3493,14 @@ static PyObject *_wrap_new_wxPanel(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxPanel_InitDialog(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPanel * _arg0;
 static PyObject *_wrap_wxPanel_InitDialog(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPanel * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPanel_InitDialog",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPanel_InitDialog",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPanel_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPanel_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPanel_InitDialog. Expected _wxPanel_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPanel_InitDialog. Expected _wxPanel_p.");
         return NULL;
         }


@@ -3331,14 +3520,15 @@ static PyObject *_wrap_wxPanel_GetDefaultItem(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxButton * _result;
     wxPanel * _arg0;
     PyObject * _resultobj;
     wxButton * _result;
     wxPanel * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPanel_GetDefaultItem",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPanel_GetDefaultItem",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPanel_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPanel_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPanel_GetDefaultItem. Expected _wxPanel_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPanel_GetDefaultItem. Expected _wxPanel_p.");
         return NULL;
         }


@@ -3348,8 +3538,13 @@ static PyObject *_wrap_wxPanel_GetDefaultItem(PyObject *self, PyObject *args) {
         _result = (wxButton *)wxPanel_GetDefaultItem(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxButton *)wxPanel_GetDefaultItem(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxButton_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxButton_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3358,20 +3553,22 @@ static PyObject *_wrap_wxPanel_SetDefaultItem(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPanel * _arg0;
     wxButton * _arg1;
     PyObject * _resultobj;
     wxPanel * _arg0;
     wxButton * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxPanel_SetDefaultItem",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxPanel_SetDefaultItem",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPanel_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPanel_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPanel_SetDefaultItem. Expected _wxPanel_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPanel_SetDefaultItem. Expected _wxPanel_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxButton_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxButton_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPanel_SetDefaultItem. Expected _wxButton_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPanel_SetDefaultItem. Expected _wxButton_p.");
         return NULL;
         }


@@ -3417,21 +3614,22 @@ static PyObject *_wrap_new_wxDialog(PyObject *self, PyObject *args) {
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;

-    wxPoint * _arg3 = &wxPyDefaultPosition;
-    wxSize * _arg4 = &wxPyDefaultSize;
-    long  _arg5 = (wxDEFAULT_DIALOG_STYLE);
-    char * _arg6 = "dialogBox";
-    char * _argc0 = 0;
+    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    long  _arg5 = (long ) wxDEFAULT_DIALOG_STYLE;
+    char * _arg6 = (char *) "dialogBox";
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
     PyObject * _obj2 = 0;

-    char * _argc3 = 0;
-    char * _argc4 = 0;
+    PyObject * _argo3 = 0;
+    PyObject * _argo4 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siO|ssls:new_wxDialog",&_argc0,&_arg1,&_obj2,&_argc3,&_argc4,&_arg5,&_arg6)) 
+    if(!PyArg_ParseTuple(args,"OiO|OOls:new_wxDialog",&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxDialog. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxDialog. Expected _wxWindow_p.");
         return NULL;
         }


@@ -3443,14 +3641,16 @@ static PyObject *_wrap_new_wxDialog(PyObject *self, PyObject *args) {
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxPoint_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxDialog. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxDialog. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_wxSize_p")) {
+    if (_argo4) {
+        if (_argo4 == Py_None) { _arg4 = NULL; }
+        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxDialog. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxDialog. Expected _wxSize_p.");
         return NULL;
         }


@@ -3460,8 +3660,13 @@ static PyObject *_wrap_new_wxDialog(PyObject *self, PyObject *args) {
         _result = (wxDialog *)new_wxDialog(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxDialog *)new_wxDialog(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxDialog_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxDialog_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     if (_obj2)
         delete _arg2;
 {
     if (_obj2)
         delete _arg2;


@@ -3473,14 +3678,15 @@ static PyObject *_wrap_new_wxDialog(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxDialog_Centre(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDialog * _arg0;
 static PyObject *_wrap_wxDialog_Centre(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDialog * _arg0;

-    int  _arg1 = (wxBOTH);
-    char * _argc0 = 0;
+    int  _arg1 = (int ) wxBOTH;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxDialog_Centre",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"O|i:wxDialog_Centre",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_Centre. Expected _wxDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_Centre. Expected _wxDialog_p.");
         return NULL;
         }


@@ -3500,13 +3706,14 @@ static PyObject *_wrap_wxDialog_EndModal(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDialog * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxDialog * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxDialog_EndModal",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxDialog_EndModal",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_EndModal. Expected _wxDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_EndModal. Expected _wxDialog_p.");
         return NULL;
         }


@@ -3526,13 +3733,14 @@ static PyObject *_wrap_wxDialog_GetTitle(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxDialog * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDialog_GetTitle",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDialog_GetTitle",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_GetTitle. Expected _wxDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_GetTitle. Expected _wxDialog_p.");
         return NULL;
         }


@@ -3556,14 +3764,15 @@ static PyObject *_wrap_wxDialog_Iconize(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDialog * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxDialog * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxDialog_Iconize",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxDialog_Iconize",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_Iconize. Expected _wxDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_Iconize. Expected _wxDialog_p.");
         return NULL;
         }


@@ -3584,13 +3793,14 @@ static PyObject *_wrap_wxDialog_IsIconized(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxDialog * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDialog_IsIconized",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDialog_IsIconized",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_IsIconized. Expected _wxDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_IsIconized. Expected _wxDialog_p.");
         return NULL;
         }


@@ -3609,14 +3819,15 @@ static PyObject *_wrap_wxDialog_SetModal(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDialog * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxDialog * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxDialog_SetModal",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxDialog_SetModal",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_SetModal. Expected _wxDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_SetModal. Expected _wxDialog_p.");
         return NULL;
         }


@@ -3637,13 +3848,14 @@ static PyObject *_wrap_wxDialog_IsModal(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxDialog * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDialog_IsModal",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDialog_IsModal",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_IsModal. Expected _wxDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_IsModal. Expected _wxDialog_p.");
         return NULL;
         }


@@ -3662,14 +3874,15 @@ static PyObject *_wrap_wxDialog_SetTitle(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDialog * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxDialog * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxDialog_SetTitle",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxDialog_SetTitle",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_SetTitle. Expected _wxDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_SetTitle. Expected _wxDialog_p.");
         return NULL;
         }


@@ -3701,14 +3914,15 @@ static PyObject *_wrap_wxDialog_Show(PyObject *self, PyObject *args) {
     bool  _result;
     wxDialog * _arg0;
     bool  _arg1;
     bool  _result;
     wxDialog * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxDialog_Show",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxDialog_Show",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_Show. Expected _wxDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_Show. Expected _wxDialog_p.");
         return NULL;
         }


@@ -3728,13 +3942,14 @@ static PyObject *_wrap_wxDialog_ShowModal(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxDialog * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDialog_ShowModal",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDialog_ShowModal",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_ShowModal. Expected _wxDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_ShowModal. Expected _wxDialog_p.");
         return NULL;
         }


@@ -3753,13 +3968,14 @@ static PyObject *_wrap_wxDialog_GetReturnCode(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxDialog * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDialog_GetReturnCode",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDialog_GetReturnCode",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_GetReturnCode. Expected _wxDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_GetReturnCode. Expected _wxDialog_p.");
         return NULL;
         }


@@ -3778,13 +3994,14 @@ static PyObject *_wrap_wxDialog_SetReturnCode(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDialog * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxDialog * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxDialog_SetReturnCode",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxDialog_SetReturnCode",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_SetReturnCode. Expected _wxDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_SetReturnCode. Expected _wxDialog_p.");
         return NULL;
         }


@@ -3828,33 +4045,36 @@ static PyObject *_wrap_new_wxScrolledWindow(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxScrolledWindow * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxScrolledWindow * _result;
     wxWindow * _arg0;

-    wxWindowID  _arg1 = -1;
-    wxPoint * _arg2 = &wxPyDefaultPosition;
-    wxSize * _arg3 = &wxPyDefaultSize;
-    long  _arg4 = (wxHSCROLL)|(wxVSCROLL);
-    char * _arg5 = "scrolledWindow";
-    char * _argc0 = 0;
-    char * _argc2 = 0;
-    char * _argc3 = 0;
+    wxWindowID  _arg1 = (wxWindowID ) -1;
+    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    long  _arg4 = (long ) wxHSCROLL|wxVSCROLL;
+    char * _arg5 = (char *) "scrolledWindow";
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;
+    PyObject * _argo3 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|issls:new_wxScrolledWindow",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTuple(args,"O|iOOls:new_wxScrolledWindow",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxScrolledWindow. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxScrolledWindow. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxScrolledWindow. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxScrolledWindow. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxSize_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxScrolledWindow. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxScrolledWindow. Expected _wxSize_p.");
         return NULL;
         }


@@ -3864,8 +4084,13 @@ static PyObject *_wrap_new_wxScrolledWindow(PyObject *self, PyObject *args) {
         _result = (wxScrolledWindow *)new_wxScrolledWindow(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxScrolledWindow *)new_wxScrolledWindow(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxScrolledWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxScrolledWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3875,15 +4100,16 @@ static PyObject *_wrap_wxScrolledWindow_EnableScrolling(PyObject *self, PyObject
     wxScrolledWindow * _arg0;
     bool  _arg1;
     bool  _arg2;
     wxScrolledWindow * _arg0;
     bool  _arg1;
     bool  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
     int tempbool2;
 
     self = self;
     int tempbool1;
     int tempbool2;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxScrolledWindow_EnableScrolling",&_argc0,&tempbool1,&tempbool2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxScrolledWindow_EnableScrolling",&_argo0,&tempbool1,&tempbool2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScrolledWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScrolledWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrolledWindow_EnableScrolling. Expected _wxScrolledWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrolledWindow_EnableScrolling. Expected _wxScrolledWindow_p.");
         return NULL;
         }


@@ -3908,7 +4134,7 @@ static PyObject *_wrap_wxScrolledWindow_GetScrollPixelsPerUnit(PyObject *self, P
     int  temp;
     int * _arg2;
     int  temp0;
     int  temp;
     int * _arg2;
     int  temp0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 {
 
     self = self;
 {


@@ -3917,10 +4143,11 @@ static PyObject *_wrap_wxScrolledWindow_GetScrollPixelsPerUnit(PyObject *self, P
 {
   _arg2 = &temp0;
 }
 {
   _arg2 = &temp0;
 }

-    if(!PyArg_ParseTuple(args,"s:wxScrolledWindow_GetScrollPixelsPerUnit",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxScrolledWindow_GetScrollPixelsPerUnit",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScrolledWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScrolledWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrolledWindow_GetScrollPixelsPerUnit. Expected _wxScrolledWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrolledWindow_GetScrollPixelsPerUnit. Expected _wxScrolledWindow_p.");
         return NULL;
         }


@@ -3953,7 +4180,7 @@ static PyObject *_wrap_wxScrolledWindow_GetVirtualSize(PyObject *self, PyObject
     int  temp;
     int * _arg2;
     int  temp0;
     int  temp;
     int * _arg2;
     int  temp0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 {
 
     self = self;
 {


@@ -3962,10 +4189,11 @@ static PyObject *_wrap_wxScrolledWindow_GetVirtualSize(PyObject *self, PyObject
 {
   _arg2 = &temp0;
 }
 {
   _arg2 = &temp0;
 }

-    if(!PyArg_ParseTuple(args,"s:wxScrolledWindow_GetVirtualSize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxScrolledWindow_GetVirtualSize",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScrolledWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScrolledWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrolledWindow_GetVirtualSize. Expected _wxScrolledWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrolledWindow_GetVirtualSize. Expected _wxScrolledWindow_p.");
         return NULL;
         }


@@ -3995,13 +4223,14 @@ static PyObject *_wrap_wxScrolledWindow_IsRetained(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     bool  _result;
     wxScrolledWindow * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxScrolledWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxScrolledWindow_IsRetained",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxScrolledWindow_IsRetained",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScrolledWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScrolledWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrolledWindow_IsRetained. Expected _wxScrolledWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrolledWindow_IsRetained. Expected _wxScrolledWindow_p.");
         return NULL;
         }


@@ -4020,20 +4249,22 @@ static PyObject *_wrap_wxScrolledWindow_PrepareDC(PyObject *self, PyObject *args
     PyObject * _resultobj;
     wxScrolledWindow * _arg0;
     wxDC * _arg1;
     PyObject * _resultobj;
     wxScrolledWindow * _arg0;
     wxDC * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxScrolledWindow_PrepareDC",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxScrolledWindow_PrepareDC",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScrolledWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScrolledWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrolledWindow_PrepareDC. Expected _wxScrolledWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrolledWindow_PrepareDC. Expected _wxScrolledWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxDC_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxScrolledWindow_PrepareDC. Expected _wxDC_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxScrolledWindow_PrepareDC. Expected _wxDC_p.");
         return NULL;
         }


@@ -4054,13 +4285,14 @@ static PyObject *_wrap_wxScrolledWindow_Scroll(PyObject *self, PyObject *args) {
     wxScrolledWindow * _arg0;
     int  _arg1;
     int  _arg2;
     wxScrolledWindow * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxScrolledWindow_Scroll",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxScrolledWindow_Scroll",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScrolledWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScrolledWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrolledWindow_Scroll. Expected _wxScrolledWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrolledWindow_Scroll. Expected _wxScrolledWindow_p.");
         return NULL;
         }


@@ -4083,15 +4315,16 @@ static PyObject *_wrap_wxScrolledWindow_SetScrollbars(PyObject *self, PyObject *
     int  _arg2;
     int  _arg3;
     int  _arg4;
     int  _arg2;
     int  _arg3;
     int  _arg4;

-    int  _arg5 = 0;
-    int  _arg6 = 0;
-    char * _argc0 = 0;
+    int  _arg5 = (int ) 0;
+    int  _arg6 = (int ) 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siiii|ii:wxScrolledWindow_SetScrollbars",&_argc0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6)) 
+    if(!PyArg_ParseTuple(args,"Oiiii|ii:wxScrolledWindow_SetScrollbars",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScrolledWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScrolledWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrolledWindow_SetScrollbars. Expected _wxScrolledWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrolledWindow_SetScrollbars. Expected _wxScrolledWindow_p.");
         return NULL;
         }


@@ -4114,7 +4347,7 @@ static PyObject *_wrap_wxScrolledWindow_ViewStart(PyObject *self, PyObject *args
     int  temp;
     int * _arg2;
     int  temp0;
     int  temp;
     int * _arg2;
     int  temp0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 {
 
     self = self;
 {


@@ -4123,10 +4356,11 @@ static PyObject *_wrap_wxScrolledWindow_ViewStart(PyObject *self, PyObject *args
 {
   _arg2 = &temp0;
 }
 {
   _arg2 = &temp0;
 }

-    if(!PyArg_ParseTuple(args,"s:wxScrolledWindow_ViewStart",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxScrolledWindow_ViewStart",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScrolledWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScrolledWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrolledWindow_ViewStart. Expected _wxScrolledWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrolledWindow_ViewStart. Expected _wxScrolledWindow_p.");
         return NULL;
         }


@@ -4163,8 +4397,8 @@ static void *SwigwxMenuTowxEvtHandler(void *ptr) {
 static PyObject *_wrap_new_wxMenu(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMenu * _result;
 static PyObject *_wrap_new_wxMenu(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMenu * _result;

-    wxString * _arg0 = &wxPyEmptyStr;
-    long  _arg1 = 0;
+    wxString * _arg0 = (wxString *) &wxPyEmptyStr;
+    long  _arg1 = (long ) 0;

     PyObject * _obj0 = 0;
     char _ptemp[128];
 
     PyObject * _obj0 = 0;
     char _ptemp[128];
 


@@ -4184,8 +4418,13 @@ static PyObject *_wrap_new_wxMenu(PyObject *self, PyObject *args) {
         _result = (wxMenu *)new_wxMenu(*_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxMenu *)new_wxMenu(*_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenu_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenu_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     if (_obj0)
         delete _arg0;
 {
     if (_obj0)
         delete _arg0;


@@ -4199,17 +4438,18 @@ static PyObject *_wrap_wxMenu_Append(PyObject *self, PyObject *args) {
     wxMenu * _arg0;
     int  _arg1;
     wxString * _arg2;
     wxMenu * _arg0;
     int  _arg1;
     wxString * _arg2;

-    wxString * _arg3 = &wxPyEmptyStr;
-    int  _arg4 = (0);
-    char * _argc0 = 0;
+    wxString * _arg3 = (wxString *) &wxPyEmptyStr;
+    int  _arg4 = (int ) FALSE;
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
     PyObject * _obj3 = 0;
 
     self = self;
     PyObject * _obj2 = 0;
     PyObject * _obj3 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siO|Oi:wxMenu_Append",&_argc0,&_arg1,&_obj2,&_obj3,&_arg4)) 
+    if(!PyArg_ParseTuple(args,"OiO|Oi:wxMenu_Append",&_argo0,&_arg1,&_obj2,&_obj3,&_arg4)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_Append. Expected _wxMenu_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_Append. Expected _wxMenu_p.");
         return NULL;
         }


@@ -4254,17 +4494,18 @@ static PyObject *_wrap_wxMenu_AppendMenu(PyObject *self, PyObject *args) {
     int  _arg1;
     wxString * _arg2;
     wxMenu * _arg3;
     int  _arg1;
     wxString * _arg2;
     wxMenu * _arg3;

-    wxString * _arg4 = &wxPyEmptyStr;
-    char * _argc0 = 0;
+    wxString * _arg4 = (wxString *) &wxPyEmptyStr;
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
     PyObject * _obj2 = 0;

-    char * _argc3 = 0;
+    PyObject * _argo3 = 0;

     PyObject * _obj4 = 0;
 
     self = self;
     PyObject * _obj4 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siOs|O:wxMenu_AppendMenu",&_argc0,&_arg1,&_obj2,&_argc3,&_obj4)) 
+    if(!PyArg_ParseTuple(args,"OiOO|O:wxMenu_AppendMenu",&_argo0,&_arg1,&_obj2,&_argo3,&_obj4)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_AppendMenu. Expected _wxMenu_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_AppendMenu. Expected _wxMenu_p.");
         return NULL;
         }


@@ -4276,8 +4517,9 @@ static PyObject *_wrap_wxMenu_AppendMenu(PyObject *self, PyObject *args) {
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxMenu_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxMenu_AppendMenu. Expected _wxMenu_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxMenu_AppendMenu. Expected _wxMenu_p.");
         return NULL;
         }


@@ -4313,20 +4555,22 @@ static PyObject *_wrap_wxMenu_AppendItem(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMenu * _arg0;
     wxMenuItem * _arg1;
     PyObject * _resultobj;
     wxMenu * _arg0;
     wxMenuItem * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxMenu_AppendItem",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxMenu_AppendItem",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_AppendItem. Expected _wxMenu_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_AppendItem. Expected _wxMenu_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxMenuItem_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMenu_AppendItem. Expected _wxMenuItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMenu_AppendItem. Expected _wxMenuItem_p.");
         return NULL;
         }


@@ -4345,13 +4589,14 @@ static PyObject *_wrap_wxMenu_AppendItem(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxMenu_AppendSeparator(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMenu * _arg0;
 static PyObject *_wrap_wxMenu_AppendSeparator(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMenu * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMenu_AppendSeparator",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMenu_AppendSeparator",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_AppendSeparator. Expected _wxMenu_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_AppendSeparator. Expected _wxMenu_p.");
         return NULL;
         }


@@ -4370,13 +4615,14 @@ static PyObject *_wrap_wxMenu_AppendSeparator(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxMenu_Break(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMenu * _arg0;
 static PyObject *_wrap_wxMenu_Break(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMenu * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMenu_Break",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMenu_Break",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_Break. Expected _wxMenu_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_Break. Expected _wxMenu_p.");
         return NULL;
         }


@@ -4397,14 +4643,15 @@ static PyObject *_wrap_wxMenu_Check(PyObject *self, PyObject *args) {
     wxMenu * _arg0;
     int  _arg1;
     bool  _arg2;
     wxMenu * _arg0;
     int  _arg1;
     bool  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool2;
 
     self = self;
     int tempbool2;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxMenu_Check",&_argc0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxMenu_Check",&_argo0,&_arg1,&tempbool2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_Check. Expected _wxMenu_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_Check. Expected _wxMenu_p.");
         return NULL;
         }


@@ -4426,14 +4673,15 @@ static PyObject *_wrap_wxMenu_Enable(PyObject *self, PyObject *args) {
     wxMenu * _arg0;
     int  _arg1;
     bool  _arg2;
     wxMenu * _arg0;
     int  _arg1;
     bool  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool2;
 
     self = self;
     int tempbool2;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxMenu_Enable",&_argc0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxMenu_Enable",&_argo0,&_arg1,&tempbool2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_Enable. Expected _wxMenu_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_Enable. Expected _wxMenu_p.");
         return NULL;
         }


@@ -4455,14 +4703,15 @@ static PyObject *_wrap_wxMenu_FindItem(PyObject *self, PyObject *args) {
     int  _result;
     wxMenu * _arg0;
     wxString * _arg1;
     int  _result;
     wxMenu * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxMenu_FindItem",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxMenu_FindItem",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_FindItem. Expected _wxMenu_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_FindItem. Expected _wxMenu_p.");
         return NULL;
         }


@@ -4492,13 +4741,14 @@ static PyObject *_wrap_wxMenu_GetTitle(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxMenu * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxMenu * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMenu_GetTitle",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMenu_GetTitle",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_GetTitle. Expected _wxMenu_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_GetTitle. Expected _wxMenu_p.");
         return NULL;
         }


@@ -4522,14 +4772,15 @@ static PyObject *_wrap_wxMenu_SetTitle(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMenu * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxMenu * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxMenu_SetTitle",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxMenu_SetTitle",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_SetTitle. Expected _wxMenu_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_SetTitle. Expected _wxMenu_p.");
         return NULL;
         }


@@ -4561,14 +4812,15 @@ static PyObject *_wrap_wxMenu_FindItemForId(PyObject *self, PyObject *args) {
     wxMenuItem * _result;
     wxMenu * _arg0;
     int  _arg1;
     wxMenuItem * _result;
     wxMenu * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxMenu_FindItemForId",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxMenu_FindItemForId",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_FindItemForId. Expected _wxMenu_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_FindItemForId. Expected _wxMenu_p.");
         return NULL;
         }


@@ -4578,8 +4830,13 @@ static PyObject *_wrap_wxMenu_FindItemForId(PyObject *self, PyObject *args) {
         _result = (wxMenuItem *)wxMenu_FindItemForId(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxMenuItem *)wxMenu_FindItemForId(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenuItem_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenuItem_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -4589,13 +4846,14 @@ static PyObject *_wrap_wxMenu_GetHelpString(PyObject *self, PyObject *args) {
     wxString * _result;
     wxMenu * _arg0;
     int  _arg1;
     wxString * _result;
     wxMenu * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxMenu_GetHelpString",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxMenu_GetHelpString",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_GetHelpString. Expected _wxMenu_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_GetHelpString. Expected _wxMenu_p.");
         return NULL;
         }


@@ -4620,13 +4878,14 @@ static PyObject *_wrap_wxMenu_GetLabel(PyObject *self, PyObject *args) {
     wxString * _result;
     wxMenu * _arg0;
     int  _arg1;
     wxString * _result;
     wxMenu * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxMenu_GetLabel",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxMenu_GetLabel",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_GetLabel. Expected _wxMenu_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_GetLabel. Expected _wxMenu_p.");
         return NULL;
         }


@@ -4651,14 +4910,15 @@ static PyObject *_wrap_wxMenu_SetHelpString(PyObject *self, PyObject *args) {
     wxMenu * _arg0;
     int  _arg1;
     wxString * _arg2;
     wxMenu * _arg0;
     int  _arg1;
     wxString * _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
 
     self = self;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siO:wxMenu_SetHelpString",&_argc0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"OiO:wxMenu_SetHelpString",&_argo0,&_arg1,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_SetHelpString. Expected _wxMenu_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_SetHelpString. Expected _wxMenu_p.");
         return NULL;
         }


@@ -4690,13 +4950,14 @@ static PyObject *_wrap_wxMenu_IsChecked(PyObject *self, PyObject *args) {
     bool  _result;
     wxMenu * _arg0;
     int  _arg1;
     bool  _result;
     wxMenu * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxMenu_IsChecked",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxMenu_IsChecked",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_IsChecked. Expected _wxMenu_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_IsChecked. Expected _wxMenu_p.");
         return NULL;
         }


@@ -4716,13 +4977,14 @@ static PyObject *_wrap_wxMenu_IsEnabled(PyObject *self, PyObject *args) {
     bool  _result;
     wxMenu * _arg0;
     int  _arg1;
     bool  _result;
     wxMenu * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxMenu_IsEnabled",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxMenu_IsEnabled",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_IsEnabled. Expected _wxMenu_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_IsEnabled. Expected _wxMenu_p.");
         return NULL;
         }


@@ -4742,14 +5004,15 @@ static PyObject *_wrap_wxMenu_SetLabel(PyObject *self, PyObject *args) {
     wxMenu * _arg0;
     int  _arg1;
     wxString * _arg2;
     wxMenu * _arg0;
     int  _arg1;
     wxString * _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
 
     self = self;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siO:wxMenu_SetLabel",&_argc0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"OiO:wxMenu_SetLabel",&_argo0,&_arg1,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_SetLabel. Expected _wxMenu_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_SetLabel. Expected _wxMenu_p.");
         return NULL;
         }


@@ -4779,21 +5042,23 @@ static PyObject *_wrap_wxMenu_SetLabel(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxMenu_UpdateUI(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMenu * _arg0;
 static PyObject *_wrap_wxMenu_UpdateUI(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMenu * _arg0;

-    wxEvtHandler * _arg1 = NULL;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    wxEvtHandler * _arg1 = (wxEvtHandler *) NULL;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|s:wxMenu_UpdateUI",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"O|O:wxMenu_UpdateUI",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_UpdateUI. Expected _wxMenu_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_UpdateUI. Expected _wxMenu_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxEvtHandler_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxEvtHandler_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMenu_UpdateUI. Expected _wxEvtHandler_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMenu_UpdateUI. Expected _wxEvtHandler_p.");
         return NULL;
         }


@@ -4830,8 +5095,13 @@ static PyObject *_wrap_new_wxMenuBar(PyObject *self, PyObject *args) {
         _result = (wxMenuBar *)new_wxMenuBar();
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxMenuBar *)new_wxMenuBar();
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenuBar_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenuBar_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -4841,21 +5111,23 @@ static PyObject *_wrap_wxMenuBar_Append(PyObject *self, PyObject *args) {
     wxMenuBar * _arg0;
     wxMenu * _arg1;
     wxString * _arg2;
     wxMenuBar * _arg0;
     wxMenu * _arg1;
     wxString * _arg2;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     PyObject * _obj2 = 0;
 
     self = self;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ssO:wxMenuBar_Append",&_argc0,&_argc1,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"OOO:wxMenuBar_Append",&_argo0,&_argo1,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_Append. Expected _wxMenuBar_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_Append. Expected _wxMenuBar_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxMenu_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMenuBar_Append. Expected _wxMenu_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMenuBar_Append. Expected _wxMenu_p.");
         return NULL;
         }


@@ -4887,14 +5159,15 @@ static PyObject *_wrap_wxMenuBar_Check(PyObject *self, PyObject *args) {
     wxMenuBar * _arg0;
     int  _arg1;
     bool  _arg2;
     wxMenuBar * _arg0;
     int  _arg1;
     bool  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool2;
 
     self = self;
     int tempbool2;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxMenuBar_Check",&_argc0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxMenuBar_Check",&_argo0,&_arg1,&tempbool2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_Check. Expected _wxMenuBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_Check. Expected _wxMenuBar_p.");
         return NULL;
         }


@@ -4916,13 +5189,14 @@ static PyObject *_wrap_wxMenuBar_Checked(PyObject *self, PyObject *args) {
     bool  _result;
     wxMenuBar * _arg0;
     int  _arg1;
     bool  _result;
     wxMenuBar * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxMenuBar_Checked",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxMenuBar_Checked",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_Checked. Expected _wxMenuBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_Checked. Expected _wxMenuBar_p.");
         return NULL;
         }


@@ -4942,14 +5216,15 @@ static PyObject *_wrap_wxMenuBar_Enable(PyObject *self, PyObject *args) {
     wxMenuBar * _arg0;
     int  _arg1;
     bool  _arg2;
     wxMenuBar * _arg0;
     int  _arg1;
     bool  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool2;
 
     self = self;
     int tempbool2;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxMenuBar_Enable",&_argc0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxMenuBar_Enable",&_argo0,&_arg1,&tempbool2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_Enable. Expected _wxMenuBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_Enable. Expected _wxMenuBar_p.");
         return NULL;
         }


@@ -4971,13 +5246,14 @@ static PyObject *_wrap_wxMenuBar_Enabled(PyObject *self, PyObject *args) {
     bool  _result;
     wxMenuBar * _arg0;
     int  _arg1;
     bool  _result;
     wxMenuBar * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxMenuBar_Enabled",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxMenuBar_Enabled",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_Enabled. Expected _wxMenuBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_Enabled. Expected _wxMenuBar_p.");
         return NULL;
         }


@@ -4998,15 +5274,16 @@ static PyObject *_wrap_wxMenuBar_FindMenuItem(PyObject *self, PyObject *args) {
     wxMenuBar * _arg0;
     wxString * _arg1;
     wxString * _arg2;
     wxMenuBar * _arg0;
     wxString * _arg1;
     wxString * _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sOO:wxMenuBar_FindMenuItem",&_argc0,&_obj1,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"OOO:wxMenuBar_FindMenuItem",&_argo0,&_obj1,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_FindMenuItem. Expected _wxMenuBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_FindMenuItem. Expected _wxMenuBar_p.");
         return NULL;
         }


@@ -5048,14 +5325,15 @@ static PyObject *_wrap_wxMenuBar_FindItemForId(PyObject *self, PyObject *args) {
     wxMenuItem * _result;
     wxMenuBar * _arg0;
     int  _arg1;
     wxMenuItem * _result;
     wxMenuBar * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxMenuBar_FindItemForId",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxMenuBar_FindItemForId",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_FindItemForId. Expected _wxMenuBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_FindItemForId. Expected _wxMenuBar_p.");
         return NULL;
         }


@@ -5065,8 +5343,13 @@ static PyObject *_wrap_wxMenuBar_FindItemForId(PyObject *self, PyObject *args) {
         _result = (wxMenuItem *)wxMenuBar_FindItemForId(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxMenuItem *)wxMenuBar_FindItemForId(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenuItem_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenuItem_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -5076,14 +5359,15 @@ static PyObject *_wrap_wxMenuBar_EnableTop(PyObject *self, PyObject *args) {
     wxMenuBar * _arg0;
     int  _arg1;
     bool  _arg2;
     wxMenuBar * _arg0;
     int  _arg1;
     bool  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool2;
 
     self = self;
     int tempbool2;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxMenuBar_EnableTop",&_argc0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxMenuBar_EnableTop",&_argo0,&_arg1,&tempbool2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_EnableTop. Expected _wxMenuBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_EnableTop. Expected _wxMenuBar_p.");
         return NULL;
         }


@@ -5105,13 +5389,14 @@ static PyObject *_wrap_wxMenuBar_GetHelpString(PyObject *self, PyObject *args) {
     wxString * _result;
     wxMenuBar * _arg0;
     int  _arg1;
     wxString * _result;
     wxMenuBar * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxMenuBar_GetHelpString",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxMenuBar_GetHelpString",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_GetHelpString. Expected _wxMenuBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_GetHelpString. Expected _wxMenuBar_p.");
         return NULL;
         }


@@ -5136,13 +5421,14 @@ static PyObject *_wrap_wxMenuBar_GetLabel(PyObject *self, PyObject *args) {
     wxString * _result;
     wxMenuBar * _arg0;
     int  _arg1;
     wxString * _result;
     wxMenuBar * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxMenuBar_GetLabel",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxMenuBar_GetLabel",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_GetLabel. Expected _wxMenuBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_GetLabel. Expected _wxMenuBar_p.");
         return NULL;
         }


@@ -5167,14 +5453,15 @@ static PyObject *_wrap_wxMenuBar_SetHelpString(PyObject *self, PyObject *args) {
     wxMenuBar * _arg0;
     int  _arg1;
     wxString * _arg2;
     wxMenuBar * _arg0;
     int  _arg1;
     wxString * _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
 
     self = self;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siO:wxMenuBar_SetHelpString",&_argc0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"OiO:wxMenuBar_SetHelpString",&_argo0,&_arg1,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_SetHelpString. Expected _wxMenuBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_SetHelpString. Expected _wxMenuBar_p.");
         return NULL;
         }


@@ -5206,14 +5493,15 @@ static PyObject *_wrap_wxMenuBar_SetLabel(PyObject *self, PyObject *args) {
     wxMenuBar * _arg0;
     int  _arg1;
     wxString * _arg2;
     wxMenuBar * _arg0;
     int  _arg1;
     wxString * _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
 
     self = self;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siO:wxMenuBar_SetLabel",&_argc0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"OiO:wxMenuBar_SetLabel",&_argo0,&_arg1,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_SetLabel. Expected _wxMenuBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_SetLabel. Expected _wxMenuBar_p.");
         return NULL;
         }


@@ -5245,13 +5533,14 @@ static PyObject *_wrap_wxMenuBar_GetLabelTop(PyObject *self, PyObject *args) {
     wxString * _result;
     wxMenuBar * _arg0;
     int  _arg1;
     wxString * _result;
     wxMenuBar * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxMenuBar_GetLabelTop",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxMenuBar_GetLabelTop",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_GetLabelTop. Expected _wxMenuBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_GetLabelTop. Expected _wxMenuBar_p.");
         return NULL;
         }


@@ -5276,14 +5565,15 @@ static PyObject *_wrap_wxMenuBar_SetLabelTop(PyObject *self, PyObject *args) {
     wxMenuBar * _arg0;
     int  _arg1;
     wxString * _arg2;
     wxMenuBar * _arg0;
     int  _arg1;
     wxString * _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
 
     self = self;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siO:wxMenuBar_SetLabelTop",&_argc0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"OiO:wxMenuBar_SetLabelTop",&_argo0,&_arg1,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_SetLabelTop. Expected _wxMenuBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_SetLabelTop. Expected _wxMenuBar_p.");
         return NULL;
         }


@@ -5314,13 +5604,14 @@ static PyObject *_wrap_wxMenuBar_GetMenuCount(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxMenuBar * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxMenuBar * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMenuBar_GetMenuCount",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMenuBar_GetMenuCount",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_GetMenuCount. Expected _wxMenuBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_GetMenuCount. Expected _wxMenuBar_p.");
         return NULL;
         }


@@ -5340,14 +5631,15 @@ static PyObject *_wrap_wxMenuBar_GetMenu(PyObject *self, PyObject *args) {
     wxMenu * _result;
     wxMenuBar * _arg0;
     int  _arg1;
     wxMenu * _result;
     wxMenuBar * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxMenuBar_GetMenu",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxMenuBar_GetMenu",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_GetMenu. Expected _wxMenuBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_GetMenu. Expected _wxMenuBar_p.");
         return NULL;
         }


@@ -5357,8 +5649,13 @@ static PyObject *_wrap_wxMenuBar_GetMenu(PyObject *self, PyObject *args) {
         _result = (wxMenu *)wxMenuBar_GetMenu(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxMenu *)wxMenuBar_GetMenu(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenu_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenu_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -5366,24 +5663,25 @@ static PyObject *_wrap_wxMenuBar_GetMenu(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_wxMenuItem(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMenuItem * _result;
 static PyObject *_wrap_new_wxMenuItem(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMenuItem * _result;

-    wxMenu * _arg0 = NULL;
-    int  _arg1 = ID_SEPARATOR;
-    wxString * _arg2 = &wxPyEmptyStr;
-    wxString * _arg3 = &wxPyEmptyStr;
-    bool  _arg4 = (0);
-    wxMenu * _arg5 = NULL;
-    char * _argc0 = 0;
+    wxMenu * _arg0 = (wxMenu *) NULL;
+    int  _arg1 = (int ) ID_SEPARATOR;
+    wxString * _arg2 = (wxString *) &wxPyEmptyStr;
+    wxString * _arg3 = (wxString *) &wxPyEmptyStr;
+    bool  _arg4 = (bool ) FALSE;
+    wxMenu * _arg5 = (wxMenu *) NULL;
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
     PyObject * _obj3 = 0;
     PyObject * _obj2 = 0;
     PyObject * _obj3 = 0;

-    int tempbool4;
-    char * _argc5 = 0;
+    int tempbool4 = (int) FALSE;
+    PyObject * _argo5 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"|siOOis:new_wxMenuItem",&_argc0,&_arg1,&_obj2,&_obj3,&tempbool4,&_argc5)) 
+    if(!PyArg_ParseTuple(args,"|OiOOiO:new_wxMenuItem",&_argo0,&_arg1,&_obj2,&_obj3,&tempbool4,&_argo5)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxMenuItem. Expected _wxMenu_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxMenuItem. Expected _wxMenu_p.");
         return NULL;
         }


@@ -5405,8 +5703,9 @@ static PyObject *_wrap_new_wxMenuItem(PyObject *self, PyObject *args) {
     _arg3 = new wxString(PyString_AsString(_obj3), PyString_Size(_obj3));
 }
     _arg4 = (bool ) tempbool4;
     _arg3 = new wxString(PyString_AsString(_obj3), PyString_Size(_obj3));
 }
     _arg4 = (bool ) tempbool4;

-    if (_argc5) {
-        if (SWIG_GetPtr(_argc5,(void **) &_arg5,"_wxMenu_p")) {
+    if (_argo5) {
+        if (_argo5 == Py_None) { _arg5 = NULL; }
+        else if (SWIG_GetPtrObj(_argo5,(void **) &_arg5,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of new_wxMenuItem. Expected _wxMenu_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of new_wxMenuItem. Expected _wxMenu_p.");
         return NULL;
         }


@@ -5416,8 +5715,13 @@ static PyObject *_wrap_new_wxMenuItem(PyObject *self, PyObject *args) {
         _result = (wxMenuItem *)new_wxMenuItem(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxMenuItem *)new_wxMenuItem(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenuItem_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenuItem_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     if (_obj2)
         delete _arg2;
 {
     if (_obj2)
         delete _arg2;


@@ -5434,13 +5738,14 @@ static PyObject *_wrap_wxMenuItem_IsSeparator(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxMenuItem * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxMenuItem * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMenuItem_IsSeparator",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMenuItem_IsSeparator",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_IsSeparator. Expected _wxMenuItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_IsSeparator. Expected _wxMenuItem_p.");
         return NULL;
         }


@@ -5459,13 +5764,14 @@ static PyObject *_wrap_wxMenuItem_IsEnabled(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxMenuItem * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxMenuItem * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMenuItem_IsEnabled",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMenuItem_IsEnabled",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_IsEnabled. Expected _wxMenuItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_IsEnabled. Expected _wxMenuItem_p.");
         return NULL;
         }


@@ -5484,13 +5790,14 @@ static PyObject *_wrap_wxMenuItem_IsChecked(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxMenuItem * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxMenuItem * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMenuItem_IsChecked",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMenuItem_IsChecked",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_IsChecked. Expected _wxMenuItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_IsChecked. Expected _wxMenuItem_p.");
         return NULL;
         }


@@ -5509,13 +5816,14 @@ static PyObject *_wrap_wxMenuItem_IsCheckable(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxMenuItem * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxMenuItem * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMenuItem_IsCheckable",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMenuItem_IsCheckable",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_IsCheckable. Expected _wxMenuItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_IsCheckable. Expected _wxMenuItem_p.");
         return NULL;
         }


@@ -5534,13 +5842,14 @@ static PyObject *_wrap_wxMenuItem_GetId(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxMenuItem * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxMenuItem * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMenuItem_GetId",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMenuItem_GetId",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetId. Expected _wxMenuItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetId. Expected _wxMenuItem_p.");
         return NULL;
         }


@@ -5559,14 +5868,15 @@ static PyObject *_wrap_wxMenuItem_GetSubMenu(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMenu * _result;
     wxMenuItem * _arg0;
     PyObject * _resultobj;
     wxMenu * _result;
     wxMenuItem * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMenuItem_GetSubMenu",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMenuItem_GetSubMenu",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetSubMenu. Expected _wxMenuItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetSubMenu. Expected _wxMenuItem_p.");
         return NULL;
         }


@@ -5576,8 +5886,13 @@ static PyObject *_wrap_wxMenuItem_GetSubMenu(PyObject *self, PyObject *args) {
         _result = (wxMenu *)wxMenuItem_GetSubMenu(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxMenu *)wxMenuItem_GetSubMenu(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenu_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenu_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -5586,14 +5901,15 @@ static PyObject *_wrap_wxMenuItem_SetName(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMenuItem * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxMenuItem * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxMenuItem_SetName",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxMenuItem_SetName",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetName. Expected _wxMenuItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetName. Expected _wxMenuItem_p.");
         return NULL;
         }


@@ -5624,13 +5940,14 @@ static PyObject *_wrap_wxMenuItem_GetName(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxMenuItem * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxMenuItem * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMenuItem_GetName",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMenuItem_GetName",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetName. Expected _wxMenuItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetName. Expected _wxMenuItem_p.");
         return NULL;
         }


@@ -5654,13 +5971,14 @@ static PyObject *_wrap_wxMenuItem_GetHelp(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxMenuItem * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxMenuItem * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMenuItem_GetHelp",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMenuItem_GetHelp",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetHelp. Expected _wxMenuItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetHelp. Expected _wxMenuItem_p.");
         return NULL;
         }


@@ -5684,14 +6002,15 @@ static PyObject *_wrap_wxMenuItem_SetHelp(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMenuItem * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxMenuItem * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxMenuItem_SetHelp",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxMenuItem_SetHelp",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetHelp. Expected _wxMenuItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetHelp. Expected _wxMenuItem_p.");
         return NULL;
         }


@@ -5721,15 +6040,16 @@ static PyObject *_wrap_wxMenuItem_SetHelp(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxMenuItem_Enable(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMenuItem * _arg0;
 static PyObject *_wrap_wxMenuItem_Enable(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMenuItem * _arg0;

-    bool  _arg1 = (1);
-    char * _argc0 = 0;
-    int tempbool1;
+    bool  _arg1 = (bool ) TRUE;
+    PyObject * _argo0 = 0;
+    int tempbool1 = (int) TRUE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxMenuItem_Enable",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"O|i:wxMenuItem_Enable",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_Enable. Expected _wxMenuItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_Enable. Expected _wxMenuItem_p.");
         return NULL;
         }


@@ -5749,15 +6069,16 @@ static PyObject *_wrap_wxMenuItem_Enable(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxMenuItem_Check(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMenuItem * _arg0;
 static PyObject *_wrap_wxMenuItem_Check(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMenuItem * _arg0;

-    bool  _arg1 = (1);
-    char * _argc0 = 0;
-    int tempbool1;
+    bool  _arg1 = (bool ) TRUE;
+    PyObject * _argo0 = 0;
+    int tempbool1 = (int) TRUE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxMenuItem_Check",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"O|i:wxMenuItem_Check",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_Check. Expected _wxMenuItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_Check. Expected _wxMenuItem_p.");
         return NULL;
         }


@@ -5778,14 +6099,15 @@ static PyObject *_wrap_wxMenuItem_GetBackgroundColour(PyObject *self, PyObject *
     PyObject * _resultobj;
     wxColour * _result;
     wxMenuItem * _arg0;
     PyObject * _resultobj;
     wxColour * _result;
     wxMenuItem * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMenuItem_GetBackgroundColour",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMenuItem_GetBackgroundColour",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetBackgroundColour. Expected _wxMenuItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetBackgroundColour. Expected _wxMenuItem_p.");
         return NULL;
         }


@@ -5796,8 +6118,13 @@ static PyObject *_wrap_wxMenuItem_GetBackgroundColour(PyObject *self, PyObject *
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -5806,16 +6133,17 @@ static PyObject *_wrap_wxMenuItem_GetBitmap(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxBitmap * _result;
     wxMenuItem * _arg0;
     PyObject * _resultobj;
     wxBitmap * _result;
     wxMenuItem * _arg0;

-    bool  _arg1 = (1);
-    char * _argc0 = 0;
-    int tempbool1;
+    bool  _arg1 = (bool ) TRUE;
+    PyObject * _argo0 = 0;
+    int tempbool1 = (int) TRUE;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxMenuItem_GetBitmap",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"O|i:wxMenuItem_GetBitmap",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetBitmap. Expected _wxMenuItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetBitmap. Expected _wxMenuItem_p.");
         return NULL;
         }


@@ -5836,14 +6164,15 @@ static PyObject *_wrap_wxMenuItem_GetFont(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFont * _result;
     wxMenuItem * _arg0;
     PyObject * _resultobj;
     wxFont * _result;
     wxMenuItem * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMenuItem_GetFont",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMenuItem_GetFont",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetFont. Expected _wxMenuItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetFont. Expected _wxMenuItem_p.");
         return NULL;
         }


@@ -5854,8 +6183,13 @@ static PyObject *_wrap_wxMenuItem_GetFont(PyObject *self, PyObject *args) {
     _result = (wxFont *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxFont *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -5864,13 +6198,14 @@ static PyObject *_wrap_wxMenuItem_GetMarginWidth(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     int  _result;
     wxMenuItem * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxMenuItem * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMenuItem_GetMarginWidth",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMenuItem_GetMarginWidth",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetMarginWidth. Expected _wxMenuItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetMarginWidth. Expected _wxMenuItem_p.");
         return NULL;
         }


@@ -5889,14 +6224,15 @@ static PyObject *_wrap_wxMenuItem_GetTextColour(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxColour * _result;
     wxMenuItem * _arg0;
     PyObject * _resultobj;
     wxColour * _result;
     wxMenuItem * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMenuItem_GetTextColour",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMenuItem_GetTextColour",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetTextColour. Expected _wxMenuItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetTextColour. Expected _wxMenuItem_p.");
         return NULL;
         }


@@ -5907,8 +6243,13 @@ static PyObject *_wrap_wxMenuItem_GetTextColour(PyObject *self, PyObject *args)
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -5917,20 +6258,22 @@ static PyObject *_wrap_wxMenuItem_SetBackgroundColour(PyObject *self, PyObject *
     PyObject * _resultobj;
     wxMenuItem * _arg0;
     wxColour * _arg1;
     PyObject * _resultobj;
     wxMenuItem * _arg0;
     wxColour * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxMenuItem_SetBackgroundColour",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxMenuItem_SetBackgroundColour",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetBackgroundColour. Expected _wxMenuItem_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetBackgroundColour. Expected _wxMenuItem_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxColour_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMenuItem_SetBackgroundColour. Expected _wxColour_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMenuItem_SetBackgroundColour. Expected _wxColour_p.");
         return NULL;
         }


@@ -5950,28 +6293,31 @@ static PyObject *_wrap_wxMenuItem_SetBitmaps(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMenuItem * _arg0;
     wxBitmap * _arg1;
     PyObject * _resultobj;
     wxMenuItem * _arg0;
     wxBitmap * _arg1;

-    wxBitmap * _arg2 = &wxNullBitmap;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
-    char * _argc2 = 0;
+    wxBitmap * _arg2 = (wxBitmap *) &wxNullBitmap;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss|s:wxMenuItem_SetBitmaps",&_argc0,&_argc1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"OO|O:wxMenuItem_SetBitmaps",&_argo0,&_argo1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetBitmaps. Expected _wxMenuItem_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetBitmaps. Expected _wxMenuItem_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMenuItem_SetBitmaps. Expected _wxBitmap_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMenuItem_SetBitmaps. Expected _wxBitmap_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxBitmap_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxMenuItem_SetBitmaps. Expected _wxBitmap_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxMenuItem_SetBitmaps. Expected _wxBitmap_p.");
         return NULL;
         }


@@ -5991,20 +6337,22 @@ static PyObject *_wrap_wxMenuItem_SetFont(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMenuItem * _arg0;
     wxFont * _arg1;
     PyObject * _resultobj;
     wxMenuItem * _arg0;
     wxFont * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxMenuItem_SetFont",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxMenuItem_SetFont",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetFont. Expected _wxMenuItem_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetFont. Expected _wxMenuItem_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxFont_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxFont_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMenuItem_SetFont. Expected _wxFont_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMenuItem_SetFont. Expected _wxFont_p.");
         return NULL;
         }


@@ -6024,13 +6372,14 @@ static PyObject *_wrap_wxMenuItem_SetMarginWidth(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxMenuItem * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxMenuItem * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxMenuItem_SetMarginWidth",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxMenuItem_SetMarginWidth",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetMarginWidth. Expected _wxMenuItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetMarginWidth. Expected _wxMenuItem_p.");
         return NULL;
         }


@@ -6050,20 +6399,22 @@ static PyObject *_wrap_wxMenuItem_SetTextColour(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxMenuItem * _arg0;
     wxColour * _arg1;
     PyObject * _resultobj;
     wxMenuItem * _arg0;
     wxColour * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxMenuItem_SetTextColour",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxMenuItem_SetTextColour",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetTextColour. Expected _wxMenuItem_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetTextColour. Expected _wxMenuItem_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxColour_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMenuItem_SetTextColour. Expected _wxColour_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMenuItem_SetTextColour. Expected _wxColour_p.");
         return NULL;
         }


@@ -6082,13 +6433,14 @@ static PyObject *_wrap_wxMenuItem_SetTextColour(PyObject *self, PyObject *args)
 static PyObject *_wrap_wxMenuItem_DeleteSubMenu(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMenuItem * _arg0;
 static PyObject *_wrap_wxMenuItem_DeleteSubMenu(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMenuItem * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMenuItem_DeleteSubMenu",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMenuItem_DeleteSubMenu",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_DeleteSubMenu. Expected _wxMenuItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_DeleteSubMenu. Expected _wxMenuItem_p.");
         return NULL;
         }


@@ -6104,388 +6456,398 @@ static PyObject *_wrap_wxMenuItem_DeleteSubMenu(PyObject *self, PyObject *args)
 }
 
 static PyMethodDef windowscMethods[] = {
 }
 
 static PyMethodDef windowscMethods[] = {

-        { "wxMenuItem_DeleteSubMenu", _wrap_wxMenuItem_DeleteSubMenu, 1 },
-        { "wxMenuItem_SetTextColour", _wrap_wxMenuItem_SetTextColour, 1 },
-        { "wxMenuItem_SetMarginWidth", _wrap_wxMenuItem_SetMarginWidth, 1 },
-        { "wxMenuItem_SetFont", _wrap_wxMenuItem_SetFont, 1 },
-        { "wxMenuItem_SetBitmaps", _wrap_wxMenuItem_SetBitmaps, 1 },
-        { "wxMenuItem_SetBackgroundColour", _wrap_wxMenuItem_SetBackgroundColour, 1 },
-        { "wxMenuItem_GetTextColour", _wrap_wxMenuItem_GetTextColour, 1 },
-        { "wxMenuItem_GetMarginWidth", _wrap_wxMenuItem_GetMarginWidth, 1 },
-        { "wxMenuItem_GetFont", _wrap_wxMenuItem_GetFont, 1 },
-        { "wxMenuItem_GetBitmap", _wrap_wxMenuItem_GetBitmap, 1 },
-        { "wxMenuItem_GetBackgroundColour", _wrap_wxMenuItem_GetBackgroundColour, 1 },
-        { "wxMenuItem_Check", _wrap_wxMenuItem_Check, 1 },
-        { "wxMenuItem_Enable", _wrap_wxMenuItem_Enable, 1 },
-        { "wxMenuItem_SetHelp", _wrap_wxMenuItem_SetHelp, 1 },
-        { "wxMenuItem_GetHelp", _wrap_wxMenuItem_GetHelp, 1 },
-        { "wxMenuItem_GetName", _wrap_wxMenuItem_GetName, 1 },
-        { "wxMenuItem_SetName", _wrap_wxMenuItem_SetName, 1 },
-        { "wxMenuItem_GetSubMenu", _wrap_wxMenuItem_GetSubMenu, 1 },
-        { "wxMenuItem_GetId", _wrap_wxMenuItem_GetId, 1 },
-        { "wxMenuItem_IsCheckable", _wrap_wxMenuItem_IsCheckable, 1 },
-        { "wxMenuItem_IsChecked", _wrap_wxMenuItem_IsChecked, 1 },
-        { "wxMenuItem_IsEnabled", _wrap_wxMenuItem_IsEnabled, 1 },
-        { "wxMenuItem_IsSeparator", _wrap_wxMenuItem_IsSeparator, 1 },
-        { "new_wxMenuItem", _wrap_new_wxMenuItem, 1 },
-        { "wxMenuBar_GetMenu", _wrap_wxMenuBar_GetMenu, 1 },
-        { "wxMenuBar_GetMenuCount", _wrap_wxMenuBar_GetMenuCount, 1 },
-        { "wxMenuBar_SetLabelTop", _wrap_wxMenuBar_SetLabelTop, 1 },
-        { "wxMenuBar_GetLabelTop", _wrap_wxMenuBar_GetLabelTop, 1 },
-        { "wxMenuBar_SetLabel", _wrap_wxMenuBar_SetLabel, 1 },
-        { "wxMenuBar_SetHelpString", _wrap_wxMenuBar_SetHelpString, 1 },
-        { "wxMenuBar_GetLabel", _wrap_wxMenuBar_GetLabel, 1 },
-        { "wxMenuBar_GetHelpString", _wrap_wxMenuBar_GetHelpString, 1 },
-        { "wxMenuBar_EnableTop", _wrap_wxMenuBar_EnableTop, 1 },
-        { "wxMenuBar_FindItemForId", _wrap_wxMenuBar_FindItemForId, 1 },
-        { "wxMenuBar_FindMenuItem", _wrap_wxMenuBar_FindMenuItem, 1 },
-        { "wxMenuBar_Enabled", _wrap_wxMenuBar_Enabled, 1 },
-        { "wxMenuBar_Enable", _wrap_wxMenuBar_Enable, 1 },
-        { "wxMenuBar_Checked", _wrap_wxMenuBar_Checked, 1 },
-        { "wxMenuBar_Check", _wrap_wxMenuBar_Check, 1 },
-        { "wxMenuBar_Append", _wrap_wxMenuBar_Append, 1 },
-        { "new_wxMenuBar", _wrap_new_wxMenuBar, 1 },
-        { "wxMenu_UpdateUI", _wrap_wxMenu_UpdateUI, 1 },
-        { "wxMenu_SetLabel", _wrap_wxMenu_SetLabel, 1 },
-        { "wxMenu_IsEnabled", _wrap_wxMenu_IsEnabled, 1 },
-        { "wxMenu_IsChecked", _wrap_wxMenu_IsChecked, 1 },
-        { "wxMenu_SetHelpString", _wrap_wxMenu_SetHelpString, 1 },
-        { "wxMenu_GetLabel", _wrap_wxMenu_GetLabel, 1 },
-        { "wxMenu_GetHelpString", _wrap_wxMenu_GetHelpString, 1 },
-        { "wxMenu_FindItemForId", _wrap_wxMenu_FindItemForId, 1 },
-        { "wxMenu_SetTitle", _wrap_wxMenu_SetTitle, 1 },
-        { "wxMenu_GetTitle", _wrap_wxMenu_GetTitle, 1 },
-        { "wxMenu_FindItem", _wrap_wxMenu_FindItem, 1 },
-        { "wxMenu_Enable", _wrap_wxMenu_Enable, 1 },
-        { "wxMenu_Check", _wrap_wxMenu_Check, 1 },
-        { "wxMenu_Break", _wrap_wxMenu_Break, 1 },
-        { "wxMenu_AppendSeparator", _wrap_wxMenu_AppendSeparator, 1 },
-        { "wxMenu_AppendItem", _wrap_wxMenu_AppendItem, 1 },
-        { "wxMenu_AppendMenu", _wrap_wxMenu_AppendMenu, 1 },
-        { "wxMenu_Append", _wrap_wxMenu_Append, 1 },
-        { "new_wxMenu", _wrap_new_wxMenu, 1 },
-        { "wxScrolledWindow_ViewStart", _wrap_wxScrolledWindow_ViewStart, 1 },
-        { "wxScrolledWindow_SetScrollbars", _wrap_wxScrolledWindow_SetScrollbars, 1 },
-        { "wxScrolledWindow_Scroll", _wrap_wxScrolledWindow_Scroll, 1 },
-        { "wxScrolledWindow_PrepareDC", _wrap_wxScrolledWindow_PrepareDC, 1 },
-        { "wxScrolledWindow_IsRetained", _wrap_wxScrolledWindow_IsRetained, 1 },
-        { "wxScrolledWindow_GetVirtualSize", _wrap_wxScrolledWindow_GetVirtualSize, 1 },
-        { "wxScrolledWindow_GetScrollPixelsPerUnit", _wrap_wxScrolledWindow_GetScrollPixelsPerUnit, 1 },
-        { "wxScrolledWindow_EnableScrolling", _wrap_wxScrolledWindow_EnableScrolling, 1 },
-        { "new_wxScrolledWindow", _wrap_new_wxScrolledWindow, 1 },
-        { "wxDialog_SetReturnCode", _wrap_wxDialog_SetReturnCode, 1 },
-        { "wxDialog_GetReturnCode", _wrap_wxDialog_GetReturnCode, 1 },
-        { "wxDialog_ShowModal", _wrap_wxDialog_ShowModal, 1 },
-        { "wxDialog_Show", _wrap_wxDialog_Show, 1 },
-        { "wxDialog_SetTitle", _wrap_wxDialog_SetTitle, 1 },
-        { "wxDialog_IsModal", _wrap_wxDialog_IsModal, 1 },
-        { "wxDialog_SetModal", _wrap_wxDialog_SetModal, 1 },
-        { "wxDialog_IsIconized", _wrap_wxDialog_IsIconized, 1 },
-        { "wxDialog_Iconize", _wrap_wxDialog_Iconize, 1 },
-        { "wxDialog_GetTitle", _wrap_wxDialog_GetTitle, 1 },
-        { "wxDialog_EndModal", _wrap_wxDialog_EndModal, 1 },
-        { "wxDialog_Centre", _wrap_wxDialog_Centre, 1 },
-        { "new_wxDialog", _wrap_new_wxDialog, 1 },
-        { "wxPanel_SetDefaultItem", _wrap_wxPanel_SetDefaultItem, 1 },
-        { "wxPanel_GetDefaultItem", _wrap_wxPanel_GetDefaultItem, 1 },
-        { "wxPanel_InitDialog", _wrap_wxPanel_InitDialog, 1 },
-        { "new_wxPanel", _wrap_new_wxPanel, 1 },
-        { "wxWindow_GetToolTip", _wrap_wxWindow_GetToolTip, 1 },
-        { "wxWindow_SetToolTip", _wrap_wxWindow_SetToolTip, 1 },
-        { "wxWindow_SetToolTipString", _wrap_wxWindow_SetToolTipString, 1 },
-        { "wxWindow_ConvertPixelSizeToDialog", _wrap_wxWindow_ConvertPixelSizeToDialog, 1 },
-        { "wxWindow_ConvertPixelPointToDialog", _wrap_wxWindow_ConvertPixelPointToDialog, 1 },
-        { "wxWindow_DLG_SZE", _wrap_wxWindow_ConvertDialogSizeToPixels, 1 },
-        { "wxWindow_DLG_PNT", _wrap_wxWindow_ConvertDialogPointToPixels, 1 },
-        { "wxWindow_ConvertDialogSizeToPixels", _wrap_wxWindow_ConvertDialogSizeToPixels, 1 },
-        { "wxWindow_ConvertDialogPointToPixels", _wrap_wxWindow_ConvertDialogPointToPixels, 1 },
-        { "wxWindow_WarpPointer", _wrap_wxWindow_WarpPointer, 1 },
-        { "wxWindow_Validate", _wrap_wxWindow_Validate, 1 },
-        { "wxWindow_TransferDataToWindow", _wrap_wxWindow_TransferDataToWindow, 1 },
-        { "wxWindow_TransferDataFromWindow", _wrap_wxWindow_TransferDataFromWindow, 1 },
-        { "wxWindow_Show", _wrap_wxWindow_Show, 1 },
-        { "wxWindow_SetTitle", _wrap_wxWindow_SetTitle, 1 },
-        { "wxWindow_SetCursor", _wrap_wxWindow_SetCursor, 1 },
-        { "wxWindow_SetClientSize", _wrap_wxWindow_SetClientSize, 1 },
-        { "wxWindow_SetClientSizeWH", _wrap_wxWindow_SetClientSizeWH, 1 },
-        { "wxWindow_SetSizeHints", _wrap_wxWindow_SetSizeHints, 1 },
-        { "wxWindow_SetPosition", _wrap_wxWindow_SetPosition, 1 },
-        { "wxWindow_SetSize", _wrap_wxWindow_SetSize, 1 },
-        { "wxWindow_SetDimensions", _wrap_wxWindow_SetDimensions, 1 },
-        { "wxWindow_SetScrollPos", _wrap_wxWindow_SetScrollPos, 1 },
-        { "wxWindow_SetScrollbar", _wrap_wxWindow_SetScrollbar, 1 },
-        { "wxWindow_SetName", _wrap_wxWindow_SetName, 1 },
-        { "wxWindow_SetId", _wrap_wxWindow_SetId, 1 },
-        { "wxWindow_SetForegroundColour", _wrap_wxWindow_SetForegroundColour, 1 },
-        { "wxWindow_SetFont", _wrap_wxWindow_SetFont, 1 },
-        { "wxWindow_SetFocus", _wrap_wxWindow_SetFocus, 1 },
-        { "wxWindow_SetConstraints", _wrap_wxWindow_SetConstraints, 1 },
-        { "wxWindow_SetBackgroundColour", _wrap_wxWindow_SetBackgroundColour, 1 },
-        { "wxWindow_SetAutoLayout", _wrap_wxWindow_SetAutoLayout, 1 },
-        { "wxWindow_SetAcceleratorTable", _wrap_wxWindow_SetAcceleratorTable, 1 },
-        { "wxWindow_ScrollWindow", _wrap_wxWindow_ScrollWindow, 1 },
-        { "wxWindow_ScreenToClient", _wrap_wxWindow_ScreenToClient, 1 },
-        { "wxWindow_ScreenToClientXY", _wrap_wxWindow_ScreenToClientXY, 1 },
-        { "wxWindow_Reparent", _wrap_wxWindow_Reparent, 1 },
-        { "wxWindow_ReleaseMouse", _wrap_wxWindow_ReleaseMouse, 1 },
-        { "wxWindow_Refresh", _wrap_wxWindow_Refresh, 1 },
-        { "wxWindow_Raise", _wrap_wxWindow_Raise, 1 },
-        { "wxWindow_PopupMenu", _wrap_wxWindow_PopupMenu, 1 },
-        { "wxWindow_PopupMenuXY", _wrap_wxWindow_PopupMenuXY, 1 },
-        { "wxWindow_Move", _wrap_wxWindow_Move, 1 },
-        { "wxWindow_MoveXY", _wrap_wxWindow_MoveXY, 1 },
-        { "wxWindow_MakeModal", _wrap_wxWindow_MakeModal, 1 },
-        { "wxWindow_Lower", _wrap_wxWindow_Lower, 1 },
-        { "wxWindow_LoadFromResource", _wrap_wxWindow_LoadFromResource, 1 },
-        { "wxWindow_Layout", _wrap_wxWindow_Layout, 1 },
-        { "wxWindow_IsTopLevel", _wrap_wxWindow_IsTopLevel, 1 },
-        { "wxWindow_IsShown", _wrap_wxWindow_IsShown, 1 },
-        { "wxWindow_IsRetained", _wrap_wxWindow_IsRetained, 1 },
-        { "wxWindow_IsEnabled", _wrap_wxWindow_IsEnabled, 1 },
-        { "wxWindow_InitDialog", _wrap_wxWindow_InitDialog, 1 },
-        { "wxWindow_Hide", _wrap_wxWindow_Hide, 1 },
-        { "wxWindow_GetWindowStyleFlag", _wrap_wxWindow_GetWindowStyleFlag, 1 },
-        { "wxWindow_GetUpdateRegion", _wrap_wxWindow_GetUpdateRegion, 1 },
-        { "wxWindow_GetTitle", _wrap_wxWindow_GetTitle, 1 },
-        { "wxWindow_GetFullTextExtent", _wrap_wxWindow_GetFullTextExtent, 1 },
-        { "wxWindow_GetTextExtent", _wrap_wxWindow_GetTextExtent, 1 },
-        { "wxWindow_GetSize", _wrap_wxWindow_GetSize, 1 },
-        { "wxWindow_GetSizeTuple", _wrap_wxWindow_GetSizeTuple, 1 },
-        { "wxWindow_GetScrollRange", _wrap_wxWindow_GetScrollRange, 1 },
-        { "wxWindow_GetScrollPos", _wrap_wxWindow_GetScrollPos, 1 },
-        { "wxWindow_GetScrollThumb", _wrap_wxWindow_GetScrollThumb, 1 },
-        { "wxWindow_GetRect", _wrap_wxWindow_GetRect, 1 },
-        { "wxWindow_GetPosition", _wrap_wxWindow_GetPosition, 1 },
-        { "wxWindow_GetPositionTuple", _wrap_wxWindow_GetPositionTuple, 1 },
-        { "wxWindow_GetParent", _wrap_wxWindow_GetParent, 1 },
-        { "wxWindow_GetName", _wrap_wxWindow_GetName, 1 },
-        { "wxWindow_SetLabel", _wrap_wxWindow_SetLabel, 1 },
-        { "wxWindow_GetLabel", _wrap_wxWindow_GetLabel, 1 },
-        { "wxWindow_GetId", _wrap_wxWindow_GetId, 1 },
-        { "wxWindow_GetGrandParent", _wrap_wxWindow_GetGrandParent, 1 },
-        { "wxWindow_GetForegroundColour", _wrap_wxWindow_GetForegroundColour, 1 },
-        { "wxWindow_GetFont", _wrap_wxWindow_GetFont, 1 },
-        { "wxWindow_GetConstraints", _wrap_wxWindow_GetConstraints, 1 },
-        { "wxWindow_GetClientSize", _wrap_wxWindow_GetClientSize, 1 },
-        { "wxWindow_GetClientSizeTuple", _wrap_wxWindow_GetClientSizeTuple, 1 },
-        { "wxWindow_GetCharWidth", _wrap_wxWindow_GetCharWidth, 1 },
-        { "wxWindow_GetCharHeight", _wrap_wxWindow_GetCharHeight, 1 },
-        { "wxWindow_GetBackgroundColour", _wrap_wxWindow_GetBackgroundColour, 1 },
-        { "wxWindow_Fit", _wrap_wxWindow_Fit, 1 },
-        { "wxWindow_FindWindowByName", _wrap_wxWindow_FindWindowByName, 1 },
-        { "wxWindow_FindWindowById", _wrap_wxWindow_FindWindowById, 1 },
-        { "wxWindow_Enable", _wrap_wxWindow_Enable, 1 },
-        { "wxWindow_DragAcceptFiles", _wrap_wxWindow_DragAcceptFiles, 1 },
-        { "wxWindow_DestroyChildren", _wrap_wxWindow_DestroyChildren, 1 },
-        { "wxWindow_Destroy", _wrap_wxWindow_Destroy, 1 },
-        { "wxWindow_Close", _wrap_wxWindow_Close, 1 },
-        { "wxWindow_ClientToScreen", _wrap_wxWindow_ClientToScreen, 1 },
-        { "wxWindow_ClientToScreenXY", _wrap_wxWindow_ClientToScreenXY, 1 },
-        { "wxWindow_CenterOnParent", _wrap_wxWindow_CenterOnParent, 1 },
-        { "wxWindow_CentreOnParent", _wrap_wxWindow_CentreOnParent, 1 },
-        { "wxWindow_Centre", _wrap_wxWindow_Centre, 1 },
-        { "wxWindow_Center", _wrap_wxWindow_Center, 1 },
-        { "wxWindow_CaptureMouse", _wrap_wxWindow_CaptureMouse, 1 },
-        { "new_wxWindow", _wrap_new_wxWindow, 1 },
-        { "wxEvtHandler_Connect", _wrap_wxEvtHandler_Connect, 1 },
-        { "wxEvtHandler_ProcessEvent", _wrap_wxEvtHandler_ProcessEvent, 1 },
-        { "wxWindow_FromHWND", _wrap_wxWindow_FromHWND, 1 },
-        { "wxWindow_FindFocus", _wrap_wxWindow_FindFocus, 1 },
+        { "wxMenuItem_DeleteSubMenu", _wrap_wxMenuItem_DeleteSubMenu, METH_VARARGS },
+        { "wxMenuItem_SetTextColour", _wrap_wxMenuItem_SetTextColour, METH_VARARGS },
+        { "wxMenuItem_SetMarginWidth", _wrap_wxMenuItem_SetMarginWidth, METH_VARARGS },
+        { "wxMenuItem_SetFont", _wrap_wxMenuItem_SetFont, METH_VARARGS },
+        { "wxMenuItem_SetBitmaps", _wrap_wxMenuItem_SetBitmaps, METH_VARARGS },
+        { "wxMenuItem_SetBackgroundColour", _wrap_wxMenuItem_SetBackgroundColour, METH_VARARGS },
+        { "wxMenuItem_GetTextColour", _wrap_wxMenuItem_GetTextColour, METH_VARARGS },
+        { "wxMenuItem_GetMarginWidth", _wrap_wxMenuItem_GetMarginWidth, METH_VARARGS },
+        { "wxMenuItem_GetFont", _wrap_wxMenuItem_GetFont, METH_VARARGS },
+        { "wxMenuItem_GetBitmap", _wrap_wxMenuItem_GetBitmap, METH_VARARGS },
+        { "wxMenuItem_GetBackgroundColour", _wrap_wxMenuItem_GetBackgroundColour, METH_VARARGS },
+        { "wxMenuItem_Check", _wrap_wxMenuItem_Check, METH_VARARGS },
+        { "wxMenuItem_Enable", _wrap_wxMenuItem_Enable, METH_VARARGS },
+        { "wxMenuItem_SetHelp", _wrap_wxMenuItem_SetHelp, METH_VARARGS },
+        { "wxMenuItem_GetHelp", _wrap_wxMenuItem_GetHelp, METH_VARARGS },
+        { "wxMenuItem_GetName", _wrap_wxMenuItem_GetName, METH_VARARGS },
+        { "wxMenuItem_SetName", _wrap_wxMenuItem_SetName, METH_VARARGS },
+        { "wxMenuItem_GetSubMenu", _wrap_wxMenuItem_GetSubMenu, METH_VARARGS },
+        { "wxMenuItem_GetId", _wrap_wxMenuItem_GetId, METH_VARARGS },
+        { "wxMenuItem_IsCheckable", _wrap_wxMenuItem_IsCheckable, METH_VARARGS },
+        { "wxMenuItem_IsChecked", _wrap_wxMenuItem_IsChecked, METH_VARARGS },
+        { "wxMenuItem_IsEnabled", _wrap_wxMenuItem_IsEnabled, METH_VARARGS },
+        { "wxMenuItem_IsSeparator", _wrap_wxMenuItem_IsSeparator, METH_VARARGS },
+        { "new_wxMenuItem", _wrap_new_wxMenuItem, METH_VARARGS },
+        { "wxMenuBar_GetMenu", _wrap_wxMenuBar_GetMenu, METH_VARARGS },
+        { "wxMenuBar_GetMenuCount", _wrap_wxMenuBar_GetMenuCount, METH_VARARGS },
+        { "wxMenuBar_SetLabelTop", _wrap_wxMenuBar_SetLabelTop, METH_VARARGS },
+        { "wxMenuBar_GetLabelTop", _wrap_wxMenuBar_GetLabelTop, METH_VARARGS },
+        { "wxMenuBar_SetLabel", _wrap_wxMenuBar_SetLabel, METH_VARARGS },
+        { "wxMenuBar_SetHelpString", _wrap_wxMenuBar_SetHelpString, METH_VARARGS },
+        { "wxMenuBar_GetLabel", _wrap_wxMenuBar_GetLabel, METH_VARARGS },
+        { "wxMenuBar_GetHelpString", _wrap_wxMenuBar_GetHelpString, METH_VARARGS },
+        { "wxMenuBar_EnableTop", _wrap_wxMenuBar_EnableTop, METH_VARARGS },
+        { "wxMenuBar_FindItemForId", _wrap_wxMenuBar_FindItemForId, METH_VARARGS },
+        { "wxMenuBar_FindMenuItem", _wrap_wxMenuBar_FindMenuItem, METH_VARARGS },
+        { "wxMenuBar_Enabled", _wrap_wxMenuBar_Enabled, METH_VARARGS },
+        { "wxMenuBar_Enable", _wrap_wxMenuBar_Enable, METH_VARARGS },
+        { "wxMenuBar_Checked", _wrap_wxMenuBar_Checked, METH_VARARGS },
+        { "wxMenuBar_Check", _wrap_wxMenuBar_Check, METH_VARARGS },
+        { "wxMenuBar_Append", _wrap_wxMenuBar_Append, METH_VARARGS },
+        { "new_wxMenuBar", _wrap_new_wxMenuBar, METH_VARARGS },
+        { "wxMenu_UpdateUI", _wrap_wxMenu_UpdateUI, METH_VARARGS },
+        { "wxMenu_SetLabel", _wrap_wxMenu_SetLabel, METH_VARARGS },
+        { "wxMenu_IsEnabled", _wrap_wxMenu_IsEnabled, METH_VARARGS },
+        { "wxMenu_IsChecked", _wrap_wxMenu_IsChecked, METH_VARARGS },
+        { "wxMenu_SetHelpString", _wrap_wxMenu_SetHelpString, METH_VARARGS },
+        { "wxMenu_GetLabel", _wrap_wxMenu_GetLabel, METH_VARARGS },
+        { "wxMenu_GetHelpString", _wrap_wxMenu_GetHelpString, METH_VARARGS },
+        { "wxMenu_FindItemForId", _wrap_wxMenu_FindItemForId, METH_VARARGS },
+        { "wxMenu_SetTitle", _wrap_wxMenu_SetTitle, METH_VARARGS },
+        { "wxMenu_GetTitle", _wrap_wxMenu_GetTitle, METH_VARARGS },
+        { "wxMenu_FindItem", _wrap_wxMenu_FindItem, METH_VARARGS },
+        { "wxMenu_Enable", _wrap_wxMenu_Enable, METH_VARARGS },
+        { "wxMenu_Check", _wrap_wxMenu_Check, METH_VARARGS },
+        { "wxMenu_Break", _wrap_wxMenu_Break, METH_VARARGS },
+        { "wxMenu_AppendSeparator", _wrap_wxMenu_AppendSeparator, METH_VARARGS },
+        { "wxMenu_AppendItem", _wrap_wxMenu_AppendItem, METH_VARARGS },
+        { "wxMenu_AppendMenu", _wrap_wxMenu_AppendMenu, METH_VARARGS },
+        { "wxMenu_Append", _wrap_wxMenu_Append, METH_VARARGS },
+        { "new_wxMenu", _wrap_new_wxMenu, METH_VARARGS },
+        { "wxScrolledWindow_ViewStart", _wrap_wxScrolledWindow_ViewStart, METH_VARARGS },
+        { "wxScrolledWindow_SetScrollbars", _wrap_wxScrolledWindow_SetScrollbars, METH_VARARGS },
+        { "wxScrolledWindow_Scroll", _wrap_wxScrolledWindow_Scroll, METH_VARARGS },
+        { "wxScrolledWindow_PrepareDC", _wrap_wxScrolledWindow_PrepareDC, METH_VARARGS },
+        { "wxScrolledWindow_IsRetained", _wrap_wxScrolledWindow_IsRetained, METH_VARARGS },
+        { "wxScrolledWindow_GetVirtualSize", _wrap_wxScrolledWindow_GetVirtualSize, METH_VARARGS },
+        { "wxScrolledWindow_GetScrollPixelsPerUnit", _wrap_wxScrolledWindow_GetScrollPixelsPerUnit, METH_VARARGS },
+        { "wxScrolledWindow_EnableScrolling", _wrap_wxScrolledWindow_EnableScrolling, METH_VARARGS },
+        { "new_wxScrolledWindow", _wrap_new_wxScrolledWindow, METH_VARARGS },
+        { "wxDialog_SetReturnCode", _wrap_wxDialog_SetReturnCode, METH_VARARGS },
+        { "wxDialog_GetReturnCode", _wrap_wxDialog_GetReturnCode, METH_VARARGS },
+        { "wxDialog_ShowModal", _wrap_wxDialog_ShowModal, METH_VARARGS },
+        { "wxDialog_Show", _wrap_wxDialog_Show, METH_VARARGS },
+        { "wxDialog_SetTitle", _wrap_wxDialog_SetTitle, METH_VARARGS },
+        { "wxDialog_IsModal", _wrap_wxDialog_IsModal, METH_VARARGS },
+        { "wxDialog_SetModal", _wrap_wxDialog_SetModal, METH_VARARGS },
+        { "wxDialog_IsIconized", _wrap_wxDialog_IsIconized, METH_VARARGS },
+        { "wxDialog_Iconize", _wrap_wxDialog_Iconize, METH_VARARGS },
+        { "wxDialog_GetTitle", _wrap_wxDialog_GetTitle, METH_VARARGS },
+        { "wxDialog_EndModal", _wrap_wxDialog_EndModal, METH_VARARGS },
+        { "wxDialog_Centre", _wrap_wxDialog_Centre, METH_VARARGS },
+        { "new_wxDialog", _wrap_new_wxDialog, METH_VARARGS },
+        { "wxPanel_SetDefaultItem", _wrap_wxPanel_SetDefaultItem, METH_VARARGS },
+        { "wxPanel_GetDefaultItem", _wrap_wxPanel_GetDefaultItem, METH_VARARGS },
+        { "wxPanel_InitDialog", _wrap_wxPanel_InitDialog, METH_VARARGS },
+        { "new_wxPanel", _wrap_new_wxPanel, METH_VARARGS },
+        { "wxWindow_GetToolTip", _wrap_wxWindow_GetToolTip, METH_VARARGS },
+        { "wxWindow_SetToolTip", _wrap_wxWindow_SetToolTip, METH_VARARGS },
+        { "wxWindow_SetToolTipString", _wrap_wxWindow_SetToolTipString, METH_VARARGS },
+        { "wxWindow_ConvertPixelSizeToDialog", _wrap_wxWindow_ConvertPixelSizeToDialog, METH_VARARGS },
+        { "wxWindow_ConvertPixelPointToDialog", _wrap_wxWindow_ConvertPixelPointToDialog, METH_VARARGS },
+        { "wxWindow_DLG_SZE", _wrap_wxWindow_ConvertDialogSizeToPixels, METH_VARARGS },
+        { "wxWindow_DLG_PNT", _wrap_wxWindow_ConvertDialogPointToPixels, METH_VARARGS },
+        { "wxWindow_ConvertDialogSizeToPixels", _wrap_wxWindow_ConvertDialogSizeToPixels, METH_VARARGS },
+        { "wxWindow_ConvertDialogPointToPixels", _wrap_wxWindow_ConvertDialogPointToPixels, METH_VARARGS },
+        { "wxWindow_WarpPointer", _wrap_wxWindow_WarpPointer, METH_VARARGS },
+        { "wxWindow_Validate", _wrap_wxWindow_Validate, METH_VARARGS },
+        { "wxWindow_TransferDataToWindow", _wrap_wxWindow_TransferDataToWindow, METH_VARARGS },
+        { "wxWindow_TransferDataFromWindow", _wrap_wxWindow_TransferDataFromWindow, METH_VARARGS },
+        { "wxWindow_Show", _wrap_wxWindow_Show, METH_VARARGS },
+        { "wxWindow_SetTitle", _wrap_wxWindow_SetTitle, METH_VARARGS },
+        { "wxWindow_SetCursor", _wrap_wxWindow_SetCursor, METH_VARARGS },
+        { "wxWindow_SetClientSize", _wrap_wxWindow_SetClientSize, METH_VARARGS },
+        { "wxWindow_SetClientSizeWH", _wrap_wxWindow_SetClientSizeWH, METH_VARARGS },
+        { "wxWindow_SetSizeHints", _wrap_wxWindow_SetSizeHints, METH_VARARGS },
+        { "wxWindow_SetPosition", _wrap_wxWindow_SetPosition, METH_VARARGS },
+        { "wxWindow_SetSize", _wrap_wxWindow_SetSize, METH_VARARGS },
+        { "wxWindow_SetDimensions", _wrap_wxWindow_SetDimensions, METH_VARARGS },
+        { "wxWindow_SetScrollPos", _wrap_wxWindow_SetScrollPos, METH_VARARGS },
+        { "wxWindow_SetScrollbar", _wrap_wxWindow_SetScrollbar, METH_VARARGS },
+        { "wxWindow_SetName", _wrap_wxWindow_SetName, METH_VARARGS },
+        { "wxWindow_SetId", _wrap_wxWindow_SetId, METH_VARARGS },
+        { "wxWindow_SetForegroundColour", _wrap_wxWindow_SetForegroundColour, METH_VARARGS },
+        { "wxWindow_SetFont", _wrap_wxWindow_SetFont, METH_VARARGS },
+        { "wxWindow_SetFocus", _wrap_wxWindow_SetFocus, METH_VARARGS },
+        { "wxWindow_SetConstraints", _wrap_wxWindow_SetConstraints, METH_VARARGS },
+        { "wxWindow_SetBackgroundColour", _wrap_wxWindow_SetBackgroundColour, METH_VARARGS },
+        { "wxWindow_SetAutoLayout", _wrap_wxWindow_SetAutoLayout, METH_VARARGS },
+        { "wxWindow_SetAcceleratorTable", _wrap_wxWindow_SetAcceleratorTable, METH_VARARGS },
+        { "wxWindow_ScrollWindow", _wrap_wxWindow_ScrollWindow, METH_VARARGS },
+        { "wxWindow_ScreenToClient", _wrap_wxWindow_ScreenToClient, METH_VARARGS },
+        { "wxWindow_ScreenToClientXY", _wrap_wxWindow_ScreenToClientXY, METH_VARARGS },
+        { "wxWindow_Reparent", _wrap_wxWindow_Reparent, METH_VARARGS },
+        { "wxWindow_ReleaseMouse", _wrap_wxWindow_ReleaseMouse, METH_VARARGS },
+        { "wxWindow_Refresh", _wrap_wxWindow_Refresh, METH_VARARGS },
+        { "wxWindow_Raise", _wrap_wxWindow_Raise, METH_VARARGS },
+        { "wxWindow_PopupMenu", _wrap_wxWindow_PopupMenu, METH_VARARGS },
+        { "wxWindow_PopupMenuXY", _wrap_wxWindow_PopupMenuXY, METH_VARARGS },
+        { "wxWindow_Move", _wrap_wxWindow_Move, METH_VARARGS },
+        { "wxWindow_MoveXY", _wrap_wxWindow_MoveXY, METH_VARARGS },
+        { "wxWindow_MakeModal", _wrap_wxWindow_MakeModal, METH_VARARGS },
+        { "wxWindow_Lower", _wrap_wxWindow_Lower, METH_VARARGS },
+        { "wxWindow_LoadFromResource", _wrap_wxWindow_LoadFromResource, METH_VARARGS },
+        { "wxWindow_Layout", _wrap_wxWindow_Layout, METH_VARARGS },
+        { "wxWindow_IsTopLevel", _wrap_wxWindow_IsTopLevel, METH_VARARGS },
+        { "wxWindow_IsShown", _wrap_wxWindow_IsShown, METH_VARARGS },
+        { "wxWindow_IsRetained", _wrap_wxWindow_IsRetained, METH_VARARGS },
+        { "wxWindow_IsEnabled", _wrap_wxWindow_IsEnabled, METH_VARARGS },
+        { "wxWindow_InitDialog", _wrap_wxWindow_InitDialog, METH_VARARGS },
+        { "wxWindow_Hide", _wrap_wxWindow_Hide, METH_VARARGS },
+        { "wxWindow_GetWindowStyleFlag", _wrap_wxWindow_GetWindowStyleFlag, METH_VARARGS },
+        { "wxWindow_GetUpdateRegion", _wrap_wxWindow_GetUpdateRegion, METH_VARARGS },
+        { "wxWindow_GetTitle", _wrap_wxWindow_GetTitle, METH_VARARGS },
+        { "wxWindow_GetFullTextExtent", _wrap_wxWindow_GetFullTextExtent, METH_VARARGS },
+        { "wxWindow_GetTextExtent", _wrap_wxWindow_GetTextExtent, METH_VARARGS },
+        { "wxWindow_GetSize", _wrap_wxWindow_GetSize, METH_VARARGS },
+        { "wxWindow_GetSizeTuple", _wrap_wxWindow_GetSizeTuple, METH_VARARGS },
+        { "wxWindow_GetScrollRange", _wrap_wxWindow_GetScrollRange, METH_VARARGS },
+        { "wxWindow_GetScrollPos", _wrap_wxWindow_GetScrollPos, METH_VARARGS },
+        { "wxWindow_GetScrollThumb", _wrap_wxWindow_GetScrollThumb, METH_VARARGS },
+        { "wxWindow_GetRect", _wrap_wxWindow_GetRect, METH_VARARGS },
+        { "wxWindow_GetPosition", _wrap_wxWindow_GetPosition, METH_VARARGS },
+        { "wxWindow_GetPositionTuple", _wrap_wxWindow_GetPositionTuple, METH_VARARGS },
+        { "wxWindow_GetParent", _wrap_wxWindow_GetParent, METH_VARARGS },
+        { "wxWindow_GetName", _wrap_wxWindow_GetName, METH_VARARGS },
+        { "wxWindow_SetLabel", _wrap_wxWindow_SetLabel, METH_VARARGS },
+        { "wxWindow_GetLabel", _wrap_wxWindow_GetLabel, METH_VARARGS },
+        { "wxWindow_GetId", _wrap_wxWindow_GetId, METH_VARARGS },
+        { "wxWindow_GetGrandParent", _wrap_wxWindow_GetGrandParent, METH_VARARGS },
+        { "wxWindow_GetForegroundColour", _wrap_wxWindow_GetForegroundColour, METH_VARARGS },
+        { "wxWindow_GetFont", _wrap_wxWindow_GetFont, METH_VARARGS },
+        { "wxWindow_GetConstraints", _wrap_wxWindow_GetConstraints, METH_VARARGS },
+        { "wxWindow_GetClientSize", _wrap_wxWindow_GetClientSize, METH_VARARGS },
+        { "wxWindow_GetClientSizeTuple", _wrap_wxWindow_GetClientSizeTuple, METH_VARARGS },
+        { "wxWindow_GetCharWidth", _wrap_wxWindow_GetCharWidth, METH_VARARGS },
+        { "wxWindow_GetCharHeight", _wrap_wxWindow_GetCharHeight, METH_VARARGS },
+        { "wxWindow_GetBackgroundColour", _wrap_wxWindow_GetBackgroundColour, METH_VARARGS },
+        { "wxWindow_Fit", _wrap_wxWindow_Fit, METH_VARARGS },
+        { "wxWindow_FindWindowByName", _wrap_wxWindow_FindWindowByName, METH_VARARGS },
+        { "wxWindow_FindWindowById", _wrap_wxWindow_FindWindowById, METH_VARARGS },
+        { "wxWindow_Enable", _wrap_wxWindow_Enable, METH_VARARGS },
+        { "wxWindow_DragAcceptFiles", _wrap_wxWindow_DragAcceptFiles, METH_VARARGS },
+        { "wxWindow_DestroyChildren", _wrap_wxWindow_DestroyChildren, METH_VARARGS },
+        { "wxWindow_Destroy", _wrap_wxWindow_Destroy, METH_VARARGS },
+        { "wxWindow_Close", _wrap_wxWindow_Close, METH_VARARGS },
+        { "wxWindow_ClientToScreen", _wrap_wxWindow_ClientToScreen, METH_VARARGS },
+        { "wxWindow_ClientToScreenXY", _wrap_wxWindow_ClientToScreenXY, METH_VARARGS },
+        { "wxWindow_CenterOnParent", _wrap_wxWindow_CenterOnParent, METH_VARARGS },
+        { "wxWindow_CentreOnParent", _wrap_wxWindow_CentreOnParent, METH_VARARGS },
+        { "wxWindow_Centre", _wrap_wxWindow_Centre, METH_VARARGS },
+        { "wxWindow_Center", _wrap_wxWindow_Center, METH_VARARGS },
+        { "wxWindow_CaptureMouse", _wrap_wxWindow_CaptureMouse, METH_VARARGS },
+        { "new_wxWindow", _wrap_new_wxWindow, METH_VARARGS },
+        { "wxEvtHandler_Connect", _wrap_wxEvtHandler_Connect, METH_VARARGS },
+        { "wxEvtHandler_ProcessEvent", _wrap_wxEvtHandler_ProcessEvent, METH_VARARGS },
+        { "wxWindow_FromHWND", _wrap_wxWindow_FromHWND, METH_VARARGS },
+        { "wxWindow_FindFocus", _wrap_wxWindow_FindFocus, METH_VARARGS },

         { NULL, NULL }
 };
         { NULL, NULL }
 };

+#ifdef __cplusplus
+}
+#endif
+/*
+ * This table is used by the pointer type-checker
+ */
+static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
+    { "_wxAcceleratorTable","_class_wxAcceleratorTable",0},
+    { "_signed_long","_long",0},
+    { "_wxPrintQuality","_int",0},
+    { "_wxPrintQuality","_signed_int",0},
+    { "_wxPrintQuality","_unsigned_int",0},
+    { "_wxPrintQuality","_wxWindowID",0},
+    { "_wxPrintQuality","_uint",0},
+    { "_wxPrintQuality","_EBool",0},
+    { "_wxPrintQuality","_size_t",0},
+    { "_class_wxRegionIterator","_wxRegionIterator",0},
+    { "_class_wxMenuBar","_wxMenuBar",0},
+    { "_class_wxEvtHandler","_class_wxMenuBar",SwigwxMenuBarTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxMenuBar",SwigwxMenuBarTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxMenu",SwigwxMenuTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxMenu",SwigwxMenuTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxScrolledWindow",SwigwxScrolledWindowTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxScrolledWindow",SwigwxScrolledWindowTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxDialog",SwigwxDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxDialog",SwigwxDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxPanel",SwigwxPanelTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxPanel",SwigwxPanelTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxWindow",SwigwxWindowTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxWindow",SwigwxWindowTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxEvtHandler",0},
+    { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
+    { "_wxCursor","_class_wxCursor",0},
+    { "_wxMask","_class_wxMask",0},
+    { "_wxPen","_class_wxPen",0},
+    { "_byte","_unsigned_char",0},
+    { "_long","_wxDash",0},
+    { "_long","_unsigned_long",0},
+    { "_long","_signed_long",0},
+    { "_wxImageList","_class_wxImageList",0},
+    { "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
+    { "_wxDC","_class_wxDC",0},
+    { "_size_t","_wxPrintQuality",0},
+    { "_size_t","_unsigned_int",0},
+    { "_size_t","_int",0},
+    { "_size_t","_wxWindowID",0},
+    { "_size_t","_uint",0},
+    { "_class_wxRealPoint","_wxRealPoint",0},
+    { "_wxPrinterDC","_class_wxPrinterDC",0},
+    { "_class_wxMenuItem","_wxMenuItem",0},
+    { "_wxPanel","_class_wxScrolledWindow",SwigwxScrolledWindowTowxPanel},
+    { "_wxPanel","_wxScrolledWindow",SwigwxScrolledWindowTowxPanel},
+    { "_wxPanel","_class_wxDialog",SwigwxDialogTowxPanel},
+    { "_wxPanel","_wxDialog",SwigwxDialogTowxPanel},
+    { "_wxPanel","_class_wxPanel",0},
+    { "_class_wxMask","_wxMask",0},
+    { "_wxColour","_class_wxColour",0},
+    { "_class_wxDialog","_wxDialog",0},
+    { "_wxBrush","_class_wxBrush",0},
+    { "_uint","_wxPrintQuality",0},
+    { "_uint","_size_t",0},
+    { "_uint","_unsigned_int",0},
+    { "_uint","_int",0},
+    { "_uint","_wxWindowID",0},
+    { "_wxRect","_class_wxRect",0},
+    { "_wxPoint","_class_wxPoint",0},
+    { "_wxBitmap","_class_wxBitmap",0},
+    { "_wxPyTimer","_class_wxPyTimer",0},
+    { "_wxWindowDC","_class_wxWindowDC",0},
+    { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
+    { "_EBool","_wxPrintQuality",0},
+    { "_EBool","_signed_int",0},
+    { "_EBool","_int",0},
+    { "_EBool","_wxWindowID",0},
+    { "_class_wxRegion","_wxRegion",0},
+    { "_wxFont","_class_wxFont",0},
+    { "_unsigned_long","_wxDash",0},
+    { "_unsigned_long","_long",0},
+    { "_class_wxRect","_wxRect",0},
+    { "_class_wxDC","_wxDC",0},
+    { "_class_wxPyTimer","_wxPyTimer",0},
+    { "_wxAcceleratorEntry","_class_wxAcceleratorEntry",0},
+    { "_class_wxPanel","_class_wxScrolledWindow",SwigwxScrolledWindowTowxPanel},
+    { "_class_wxPanel","_wxScrolledWindow",SwigwxScrolledWindowTowxPanel},
+    { "_class_wxPanel","_class_wxDialog",SwigwxDialogTowxPanel},
+    { "_class_wxPanel","_wxDialog",SwigwxDialogTowxPanel},
+    { "_class_wxPanel","_wxPanel",0},
+    { "_signed_int","_wxPrintQuality",0},
+    { "_signed_int","_EBool",0},
+    { "_signed_int","_wxWindowID",0},
+    { "_signed_int","_int",0},
+    { "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
+    { "_wxMetaFileDC","_class_wxMetaFileDC",0},
+    { "_wxMenu","_class_wxMenu",0},
+    { "_wxScreenDC","_class_wxScreenDC",0},
+    { "_WXTYPE","_short",0},
+    { "_WXTYPE","_signed_short",0},
+    { "_WXTYPE","_unsigned_short",0},
+    { "_class_wxBrush","_wxBrush",0},
+    { "_unsigned_short","_WXTYPE",0},
+    { "_unsigned_short","_short",0},
+    { "_class_wxWindow","_class_wxScrolledWindow",SwigwxScrolledWindowTowxWindow},
+    { "_class_wxWindow","_wxScrolledWindow",SwigwxScrolledWindowTowxWindow},
+    { "_class_wxWindow","_class_wxDialog",SwigwxDialogTowxWindow},
+    { "_class_wxWindow","_wxDialog",SwigwxDialogTowxWindow},
+    { "_class_wxWindow","_class_wxPanel",SwigwxPanelTowxWindow},
+    { "_class_wxWindow","_wxPanel",SwigwxPanelTowxWindow},
+    { "_class_wxWindow","_wxWindow",0},
+    { "_class_wxFont","_wxFont",0},
+    { "_wxClientDC","_class_wxClientDC",0},
+    { "_class_wxPoint","_wxPoint",0},
+    { "_wxRealPoint","_class_wxRealPoint",0},
+    { "_signed_short","_WXTYPE",0},
+    { "_signed_short","_short",0},
+    { "_wxMemoryDC","_class_wxMemoryDC",0},
+    { "_wxPaintDC","_class_wxPaintDC",0},
+    { "_class_wxWindowDC","_wxWindowDC",0},
+    { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
+    { "_class_wxCursor","_wxCursor",0},
+    { "_wxScrolledWindow","_class_wxScrolledWindow",0},
+    { "_unsigned_char","_byte",0},
+    { "_class_wxMetaFileDC","_wxMetaFileDC",0},
+    { "_class_wxMenu","_wxMenu",0},
+    { "_unsigned_int","_wxPrintQuality",0},
+    { "_unsigned_int","_size_t",0},
+    { "_unsigned_int","_uint",0},
+    { "_unsigned_int","_wxWindowID",0},
+    { "_unsigned_int","_int",0},
+    { "_wxIcon","_class_wxIcon",0},
+    { "_wxDialog","_class_wxDialog",0},
+    { "_class_wxPen","_wxPen",0},
+    { "_short","_WXTYPE",0},
+    { "_short","_unsigned_short",0},
+    { "_short","_signed_short",0},
+    { "_class_wxImageList","_wxImageList",0},
+    { "_wxWindowID","_wxPrintQuality",0},
+    { "_wxWindowID","_size_t",0},
+    { "_wxWindowID","_EBool",0},
+    { "_wxWindowID","_uint",0},
+    { "_wxWindowID","_int",0},
+    { "_wxWindowID","_signed_int",0},
+    { "_wxWindowID","_unsigned_int",0},
+    { "_int","_wxPrintQuality",0},
+    { "_int","_size_t",0},
+    { "_int","_EBool",0},
+    { "_int","_uint",0},
+    { "_int","_wxWindowID",0},
+    { "_int","_unsigned_int",0},
+    { "_int","_signed_int",0},
+    { "_wxSize","_class_wxSize",0},
+    { "_wxRegionIterator","_class_wxRegionIterator",0},
+    { "_class_wxPrinterDC","_wxPrinterDC",0},
+    { "_class_wxPaintDC","_wxPaintDC",0},
+    { "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
+    { "_class_wxIcon","_wxIcon",0},
+    { "_class_wxColour","_wxColour",0},
+    { "_class_wxScreenDC","_wxScreenDC",0},
+    { "_wxPalette","_class_wxPalette",0},
+    { "_wxRegion","_class_wxRegion",0},
+    { "_class_wxClientDC","_wxClientDC",0},
+    { "_class_wxSize","_wxSize",0},
+    { "_class_wxBitmap","_wxBitmap",0},
+    { "_class_wxMemoryDC","_wxMemoryDC",0},
+    { "_wxMenuBar","_class_wxMenuBar",0},
+    { "_wxEvtHandler","_class_wxMenuBar",SwigwxMenuBarTowxEvtHandler},
+    { "_wxEvtHandler","_wxMenuBar",SwigwxMenuBarTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxMenu",SwigwxMenuTowxEvtHandler},
+    { "_wxEvtHandler","_wxMenu",SwigwxMenuTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxScrolledWindow",SwigwxScrolledWindowTowxEvtHandler},
+    { "_wxEvtHandler","_wxScrolledWindow",SwigwxScrolledWindowTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxDialog",SwigwxDialogTowxEvtHandler},
+    { "_wxEvtHandler","_wxDialog",SwigwxDialogTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxPanel",SwigwxPanelTowxEvtHandler},
+    { "_wxEvtHandler","_wxPanel",SwigwxPanelTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxWindow",SwigwxWindowTowxEvtHandler},
+    { "_wxEvtHandler","_wxWindow",SwigwxWindowTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxEvtHandler",0},
+    { "_wxMenuItem","_class_wxMenuItem",0},
+    { "_wxDash","_unsigned_long",0},
+    { "_wxDash","_long",0},
+    { "_class_wxScrolledWindow","_wxScrolledWindow",0},
+    { "_class_wxPalette","_wxPalette",0},
+    { "_wxWindow","_class_wxScrolledWindow",SwigwxScrolledWindowTowxWindow},
+    { "_wxWindow","_wxScrolledWindow",SwigwxScrolledWindowTowxWindow},
+    { "_wxWindow","_class_wxDialog",SwigwxDialogTowxWindow},
+    { "_wxWindow","_wxDialog",SwigwxDialogTowxWindow},
+    { "_wxWindow","_class_wxPanel",SwigwxPanelTowxWindow},
+    { "_wxWindow","_wxPanel",SwigwxPanelTowxWindow},
+    { "_wxWindow","_class_wxWindow",0},
+{0,0,0}};
+

 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif
 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif

-SWIGEXPORT(void,initwindowsc)() {
+SWIGEXPORT(void) initwindowsc() {

         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("windowsc", windowscMethods);
         d = PyModule_GetDict(m);
         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("windowsc", windowscMethods);
         d = PyModule_GetDict(m);

-/*
- * These are the pointer type-equivalency mappings. 
- * (Used by the SWIG pointer type-checker).
- */
-        SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_signed_long","_long",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_signed_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_unsigned_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_wxWindowID",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_uint",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_EBool",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_size_t",0);
-        SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
-        SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxMenuBar",SwigwxMenuBarTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxMenuBar",SwigwxMenuBarTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxMenu",SwigwxMenuTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxMenu",SwigwxMenuTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxScrolledWindow",SwigwxScrolledWindowTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxScrolledWindow",SwigwxScrolledWindowTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxDialog",SwigwxDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxDialog",SwigwxDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxPanel",SwigwxPanelTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxPanel",SwigwxPanelTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxWindow",SwigwxWindowTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxWindow",SwigwxWindowTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxEvtHandler",0);
-        SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
-        SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
-        SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
-        SWIG_RegisterMapping("_byte","_unsigned_char",0);
-        SWIG_RegisterMapping("_long","_wxDash",0);
-        SWIG_RegisterMapping("_long","_unsigned_long",0);
-        SWIG_RegisterMapping("_long","_signed_long",0);
-        SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
-        SWIG_RegisterMapping("_size_t","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_size_t","_unsigned_int",0);
-        SWIG_RegisterMapping("_size_t","_int",0);
-        SWIG_RegisterMapping("_size_t","_wxWindowID",0);
-        SWIG_RegisterMapping("_size_t","_uint",0);
-        SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
-        SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0);
-        SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0);
-        SWIG_RegisterMapping("_wxPanel","_class_wxScrolledWindow",SwigwxScrolledWindowTowxPanel);
-        SWIG_RegisterMapping("_wxPanel","_wxScrolledWindow",SwigwxScrolledWindowTowxPanel);
-        SWIG_RegisterMapping("_wxPanel","_class_wxDialog",SwigwxDialogTowxPanel);
-        SWIG_RegisterMapping("_wxPanel","_wxDialog",SwigwxDialogTowxPanel);
-        SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);
-        SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
-        SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
-        SWIG_RegisterMapping("_class_wxDialog","_wxDialog",0);
-        SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
-        SWIG_RegisterMapping("_uint","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_uint","_size_t",0);
-        SWIG_RegisterMapping("_uint","_unsigned_int",0);
-        SWIG_RegisterMapping("_uint","_int",0);
-        SWIG_RegisterMapping("_uint","_wxWindowID",0);
-        SWIG_RegisterMapping("_wxRect","_class_wxRect",0);
-        SWIG_RegisterMapping("_wxPoint","_class_wxPoint",0);
-        SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
-        SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0);
-        SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_EBool","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_EBool","_signed_int",0);
-        SWIG_RegisterMapping("_EBool","_int",0);
-        SWIG_RegisterMapping("_EBool","_wxWindowID",0);
-        SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
-        SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
-        SWIG_RegisterMapping("_unsigned_long","_wxDash",0);
-        SWIG_RegisterMapping("_unsigned_long","_long",0);
-        SWIG_RegisterMapping("_class_wxRect","_wxRect",0);
-        SWIG_RegisterMapping("_class_wxDC","_wxDC",0);
-        SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxAcceleratorEntry","_class_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_class_wxPanel","_class_wxScrolledWindow",SwigwxScrolledWindowTowxPanel);
-        SWIG_RegisterMapping("_class_wxPanel","_wxScrolledWindow",SwigwxScrolledWindowTowxPanel);
-        SWIG_RegisterMapping("_class_wxPanel","_class_wxDialog",SwigwxDialogTowxPanel);
-        SWIG_RegisterMapping("_class_wxPanel","_wxDialog",SwigwxDialogTowxPanel);
-        SWIG_RegisterMapping("_class_wxPanel","_wxPanel",0);
-        SWIG_RegisterMapping("_signed_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_signed_int","_EBool",0);
-        SWIG_RegisterMapping("_signed_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_signed_int","_int",0);
-        SWIG_RegisterMapping("_wxLayoutConstraints","_class_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_wxMetaFileDC","_class_wxMetaFileDC",0);
-        SWIG_RegisterMapping("_wxMenu","_class_wxMenu",0);
-        SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0);
-        SWIG_RegisterMapping("_WXTYPE","_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_signed_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_unsigned_short",0);
-        SWIG_RegisterMapping("_class_wxBrush","_wxBrush",0);
-        SWIG_RegisterMapping("_unsigned_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_unsigned_short","_short",0);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxScrolledWindow",SwigwxScrolledWindowTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxScrolledWindow",SwigwxScrolledWindowTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxDialog",SwigwxDialogTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxDialog",SwigwxDialogTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxPanel",SwigwxPanelTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxPanel",SwigwxPanelTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxWindow",0);
-        SWIG_RegisterMapping("_class_wxFont","_wxFont",0);
-        SWIG_RegisterMapping("_wxClientDC","_class_wxClientDC",0);
-        SWIG_RegisterMapping("_class_wxPoint","_wxPoint",0);
-        SWIG_RegisterMapping("_wxRealPoint","_class_wxRealPoint",0);
-        SWIG_RegisterMapping("_signed_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_signed_short","_short",0);
-        SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0);
-        SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
-        SWIG_RegisterMapping("_class_wxWindowDC","_wxWindowDC",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
-        SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0);
-        SWIG_RegisterMapping("_unsigned_char","_byte",0);
-        SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0);
-        SWIG_RegisterMapping("_class_wxMenu","_wxMenu",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_unsigned_int","_size_t",0);
-        SWIG_RegisterMapping("_unsigned_int","_uint",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_unsigned_int","_int",0);
-        SWIG_RegisterMapping("_wxIcon","_class_wxIcon",0);
-        SWIG_RegisterMapping("_wxDialog","_class_wxDialog",0);
-        SWIG_RegisterMapping("_class_wxPen","_wxPen",0);
-        SWIG_RegisterMapping("_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_short","_unsigned_short",0);
-        SWIG_RegisterMapping("_short","_signed_short",0);
-        SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0);
-        SWIG_RegisterMapping("_wxWindowID","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_wxWindowID","_size_t",0);
-        SWIG_RegisterMapping("_wxWindowID","_EBool",0);
-        SWIG_RegisterMapping("_wxWindowID","_uint",0);
-        SWIG_RegisterMapping("_wxWindowID","_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_signed_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_int","_size_t",0);
-        SWIG_RegisterMapping("_int","_EBool",0);
-        SWIG_RegisterMapping("_int","_uint",0);
-        SWIG_RegisterMapping("_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_int","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_signed_int",0);
-        SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
-        SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
-        SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
-        SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
-        SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
-        SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
-        SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
-        SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
-        SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
-        SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
-        SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
-        SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0);
-        SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0);
-        SWIG_RegisterMapping("_wxMenuBar","_class_wxMenuBar",0);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxMenuBar",SwigwxMenuBarTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxMenuBar",SwigwxMenuBarTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxMenu",SwigwxMenuTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxMenu",SwigwxMenuTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxScrolledWindow",SwigwxScrolledWindowTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxScrolledWindow",SwigwxScrolledWindowTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxDialog",SwigwxDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxDialog",SwigwxDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxPanel",SwigwxPanelTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxPanel",SwigwxPanelTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxWindow",SwigwxWindowTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxWindow",SwigwxWindowTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxEvtHandler",0);
-        SWIG_RegisterMapping("_wxMenuItem","_class_wxMenuItem",0);
-        SWIG_RegisterMapping("_wxDash","_unsigned_long",0);
-        SWIG_RegisterMapping("_wxDash","_long",0);
-        SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
-        SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
-        SWIG_RegisterMapping("_wxWindow","_class_wxScrolledWindow",SwigwxScrolledWindowTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxScrolledWindow",SwigwxScrolledWindowTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxDialog",SwigwxDialogTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxDialog",SwigwxDialogTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxPanel",SwigwxPanelTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxPanel",SwigwxPanelTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxWindow",0);
+{
+   int i;
+   for (i = 0; _swig_mapping[i].n1; i++)
+        SWIG_RegisterMapping(_swig_mapping[i].n1,_swig_mapping[i].n2,_swig_mapping[i].pcnv);
+}

 }
 }

diff --git a/utils/wxPython/src/msw/windows.py b/utils/wxPython/src/msw/windows.py
index 59becc1aa2cdddaf1ff9461ceadcf912f3b75d05..8ae94d6bb07f2d5e814e380775d48bffb2515caa 100644 (file)
--- a/utils/wxPython/src/msw/windows.py
+++ b/utils/wxPython/src/msw/windows.py
@@ -22,14 +22,14 @@ class wxEvtHandlerPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def ProcessEvent(self,arg0):
-        val = windowsc.wxEvtHandler_ProcessEvent(self.this,arg0.this)
+    def ProcessEvent(self, *_args, **_kwargs):
+        val = apply(windowsc.wxEvtHandler_ProcessEvent,(self,) + _args, _kwargs)

         return val
         return val

-    def Connect(self,arg0,arg1,arg2,arg3):
-        val = windowsc.wxEvtHandler_Connect(self.this,arg0,arg1,arg2,arg3)
+    def Connect(self, *_args, **_kwargs):
+        val = apply(windowsc.wxEvtHandler_Connect,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxEvtHandler instance>"
+        return "<C wxEvtHandler instance at %s>" % (self.this,)

 class wxEvtHandler(wxEvtHandlerPtr):
     def __init__(self,this):
         self.this = this
 class wxEvtHandler(wxEvtHandlerPtr):
     def __init__(self,this):
         self.this = this


@@ -41,354 +41,321 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def CaptureMouse(self):
-        val = windowsc.wxWindow_CaptureMouse(self.this)
+    def CaptureMouse(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_CaptureMouse,(self,) + _args, _kwargs)

         return val
         return val

-    def Center(self,*args):
-        val = apply(windowsc.wxWindow_Center,(self.this,)+args)
+    def Center(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_Center,(self,) + _args, _kwargs)

         return val
         return val

-    def Centre(self,*args):
-        val = apply(windowsc.wxWindow_Centre,(self.this,)+args)
+    def Centre(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_Centre,(self,) + _args, _kwargs)

         return val
         return val

-    def CentreOnParent(self,*args):
-        val = apply(windowsc.wxWindow_CentreOnParent,(self.this,)+args)
+    def CentreOnParent(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_CentreOnParent,(self,) + _args, _kwargs)

         return val
         return val

-    def CenterOnParent(self,*args):
-        val = apply(windowsc.wxWindow_CenterOnParent,(self.this,)+args)
+    def CenterOnParent(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_CenterOnParent,(self,) + _args, _kwargs)

         return val
         return val

-    def ClientToScreenXY(self,arg0,arg1):
-        val = windowsc.wxWindow_ClientToScreenXY(self.this,arg0,arg1)
+    def ClientToScreenXY(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_ClientToScreenXY,(self,) + _args, _kwargs)

         return val
         return val

-    def ClientToScreen(self,arg0):
-        val = windowsc.wxWindow_ClientToScreen(self.this,arg0.this)
-        val = wxPointPtr(val)
-        val.thisown = 1
+    def ClientToScreen(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_ClientToScreen,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1

         return val
         return val

-    def Close(self,*args):
-        val = apply(windowsc.wxWindow_Close,(self.this,)+args)
+    def Close(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_Close,(self,) + _args, _kwargs)

         return val
         return val

-    def Destroy(self):
-        val = windowsc.wxWindow_Destroy(self.this)
+    def Destroy(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_Destroy,(self,) + _args, _kwargs)

         return val
         return val

-    def DestroyChildren(self):
-        val = windowsc.wxWindow_DestroyChildren(self.this)
+    def DestroyChildren(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_DestroyChildren,(self,) + _args, _kwargs)

         return val
         return val

-    def DragAcceptFiles(self,arg0):
-        val = windowsc.wxWindow_DragAcceptFiles(self.this,arg0)
+    def DragAcceptFiles(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_DragAcceptFiles,(self,) + _args, _kwargs)

         return val
         return val

-    def Enable(self,arg0):
-        val = windowsc.wxWindow_Enable(self.this,arg0)
+    def Enable(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_Enable,(self,) + _args, _kwargs)

         return val
         return val

-    def FindWindowById(self,arg0):
-        val = windowsc.wxWindow_FindWindowById(self.this,arg0)
-        val = wxWindowPtr(val)
+    def FindWindowById(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_FindWindowById,(self,) + _args, _kwargs)
+        if val: val = wxWindowPtr(val) 

         return val
         return val

-    def FindWindowByName(self,arg0):
-        val = windowsc.wxWindow_FindWindowByName(self.this,arg0)
-        val = wxWindowPtr(val)
+    def FindWindowByName(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_FindWindowByName,(self,) + _args, _kwargs)
+        if val: val = wxWindowPtr(val) 

         return val
         return val

-    def Fit(self):
-        val = windowsc.wxWindow_Fit(self.this)
+    def Fit(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_Fit,(self,) + _args, _kwargs)

         return val
         return val

-    def GetBackgroundColour(self):
-        val = windowsc.wxWindow_GetBackgroundColour(self.this)
-        val = wxColourPtr(val)
-        val.thisown = 1
+    def GetBackgroundColour(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetBackgroundColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetCharHeight(self):
-        val = windowsc.wxWindow_GetCharHeight(self.this)
+    def GetCharHeight(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetCharHeight,(self,) + _args, _kwargs)

         return val
         return val

-    def GetCharWidth(self):
-        val = windowsc.wxWindow_GetCharWidth(self.this)
+    def GetCharWidth(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetCharWidth,(self,) + _args, _kwargs)

         return val
         return val

-    def GetClientSizeTuple(self):
-        val = windowsc.wxWindow_GetClientSizeTuple(self.this)
+    def GetClientSizeTuple(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetClientSizeTuple,(self,) + _args, _kwargs)

         return val
         return val

-    def GetClientSize(self):
-        val = windowsc.wxWindow_GetClientSize(self.this)
-        val = wxSizePtr(val)
-        val.thisown = 1
+    def GetClientSize(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetClientSize,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1

         return val
         return val

-    def GetConstraints(self):
-        val = windowsc.wxWindow_GetConstraints(self.this)
-        val = wxLayoutConstraintsPtr(val)
+    def GetConstraints(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetConstraints,(self,) + _args, _kwargs)
+        if val: val = wxLayoutConstraintsPtr(val) 

         return val
         return val

-    def GetFont(self):
-        val = windowsc.wxWindow_GetFont(self.this)
-        val = wxFontPtr(val)
+    def GetFont(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetFont,(self,) + _args, _kwargs)
+        if val: val = wxFontPtr(val) 

         return val
         return val

-    def GetForegroundColour(self):
-        val = windowsc.wxWindow_GetForegroundColour(self.this)
-        val = wxColourPtr(val)
-        val.thisown = 1
+    def GetForegroundColour(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetForegroundColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetGrandParent(self):
-        val = windowsc.wxWindow_GetGrandParent(self.this)
-        val = wxWindowPtr(val)
+    def GetGrandParent(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetGrandParent,(self,) + _args, _kwargs)
+        if val: val = wxWindowPtr(val) 

         return val
         return val

-    def GetId(self):
-        val = windowsc.wxWindow_GetId(self.this)
+    def GetId(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetId,(self,) + _args, _kwargs)

         return val
         return val

-    def GetLabel(self):
-        val = windowsc.wxWindow_GetLabel(self.this)
+    def GetLabel(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetLabel,(self,) + _args, _kwargs)

         return val
         return val

-    def SetLabel(self,arg0):
-        val = windowsc.wxWindow_SetLabel(self.this,arg0)
+    def SetLabel(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetLabel,(self,) + _args, _kwargs)

         return val
         return val

-    def GetName(self):
-        val = windowsc.wxWindow_GetName(self.this)
+    def GetName(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetName,(self,) + _args, _kwargs)

         return val
         return val

-    def GetParent(self):
-        val = windowsc.wxWindow_GetParent(self.this)
-        val = wxWindowPtr(val)
+    def GetParent(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetParent,(self,) + _args, _kwargs)
+        if val: val = wxWindowPtr(val) 

         return val
         return val

-    def GetPositionTuple(self):
-        val = windowsc.wxWindow_GetPositionTuple(self.this)
+    def GetPositionTuple(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetPositionTuple,(self,) + _args, _kwargs)

         return val
         return val

-    def GetPosition(self):
-        val = windowsc.wxWindow_GetPosition(self.this)
-        val = wxPointPtr(val)
-        val.thisown = 1
+    def GetPosition(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetPosition,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetRect(self):
-        val = windowsc.wxWindow_GetRect(self.this)
-        val = wxRectPtr(val)
-        val.thisown = 1
+    def GetRect(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetRect,(self,) + _args, _kwargs)
+        if val: val = wxRectPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetScrollThumb(self,arg0):
-        val = windowsc.wxWindow_GetScrollThumb(self.this,arg0)
+    def GetScrollThumb(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetScrollThumb,(self,) + _args, _kwargs)

         return val
         return val

-    def GetScrollPos(self,arg0):
-        val = windowsc.wxWindow_GetScrollPos(self.this,arg0)
+    def GetScrollPos(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetScrollPos,(self,) + _args, _kwargs)

         return val
         return val

-    def GetScrollRange(self,arg0):
-        val = windowsc.wxWindow_GetScrollRange(self.this,arg0)
+    def GetScrollRange(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetScrollRange,(self,) + _args, _kwargs)

         return val
         return val

-    def GetSizeTuple(self):
-        val = windowsc.wxWindow_GetSizeTuple(self.this)
+    def GetSizeTuple(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetSizeTuple,(self,) + _args, _kwargs)

         return val
         return val

-    def GetSize(self):
-        val = windowsc.wxWindow_GetSize(self.this)
-        val = wxSizePtr(val)
-        val.thisown = 1
+    def GetSize(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetSize,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1

         return val
         return val

-    def GetTextExtent(self,arg0):
-        val = windowsc.wxWindow_GetTextExtent(self.this,arg0)
+    def GetTextExtent(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetTextExtent,(self,) + _args, _kwargs)

         return val
         return val

-    def GetFullTextExtent(self,arg0,*args):
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        args = tuple(argl)
-        val = apply(windowsc.wxWindow_GetFullTextExtent,(self.this,arg0,)+args)
+    def GetFullTextExtent(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetFullTextExtent,(self,) + _args, _kwargs)

         return val
         return val

-    def GetTitle(self):
-        val = windowsc.wxWindow_GetTitle(self.this)
+    def GetTitle(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetTitle,(self,) + _args, _kwargs)

         return val
         return val

-    def GetUpdateRegion(self):
-        val = windowsc.wxWindow_GetUpdateRegion(self.this)
-        val = wxRegionPtr(val)
-        val.thisown = 1
+    def GetUpdateRegion(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetUpdateRegion,(self,) + _args, _kwargs)
+        if val: val = wxRegionPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetWindowStyleFlag(self):
-        val = windowsc.wxWindow_GetWindowStyleFlag(self.this)
+    def GetWindowStyleFlag(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetWindowStyleFlag,(self,) + _args, _kwargs)

         return val
         return val

-    def Hide(self):
-        val = windowsc.wxWindow_Hide(self.this)
+    def Hide(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_Hide,(self,) + _args, _kwargs)

         return val
         return val

-    def InitDialog(self):
-        val = windowsc.wxWindow_InitDialog(self.this)
+    def InitDialog(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_InitDialog,(self,) + _args, _kwargs)

         return val
         return val

-    def IsEnabled(self):
-        val = windowsc.wxWindow_IsEnabled(self.this)
+    def IsEnabled(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_IsEnabled,(self,) + _args, _kwargs)

         return val
         return val

-    def IsRetained(self):
-        val = windowsc.wxWindow_IsRetained(self.this)
+    def IsRetained(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_IsRetained,(self,) + _args, _kwargs)

         return val
         return val

-    def IsShown(self):
-        val = windowsc.wxWindow_IsShown(self.this)
+    def IsShown(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_IsShown,(self,) + _args, _kwargs)

         return val
         return val

-    def IsTopLevel(self):
-        val = windowsc.wxWindow_IsTopLevel(self.this)
+    def IsTopLevel(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_IsTopLevel,(self,) + _args, _kwargs)

         return val
         return val

-    def Layout(self):
-        val = windowsc.wxWindow_Layout(self.this)
+    def Layout(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_Layout,(self,) + _args, _kwargs)

         return val
         return val

-    def LoadFromResource(self,arg0,arg1,*args):
-        val = apply(windowsc.wxWindow_LoadFromResource,(self.this,arg0.this,arg1,)+args)
+    def LoadFromResource(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_LoadFromResource,(self,) + _args, _kwargs)

         return val
         return val

-    def Lower(self):
-        val = windowsc.wxWindow_Lower(self.this)
+    def Lower(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_Lower,(self,) + _args, _kwargs)

         return val
         return val

-    def MakeModal(self,arg0):
-        val = windowsc.wxWindow_MakeModal(self.this,arg0)
+    def MakeModal(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_MakeModal,(self,) + _args, _kwargs)

         return val
         return val

-    def MoveXY(self,arg0,arg1):
-        val = windowsc.wxWindow_MoveXY(self.this,arg0,arg1)
+    def MoveXY(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_MoveXY,(self,) + _args, _kwargs)

         return val
         return val

-    def Move(self,arg0):
-        val = windowsc.wxWindow_Move(self.this,arg0.this)
+    def Move(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_Move,(self,) + _args, _kwargs)

         return val
         return val

-    def PopupMenuXY(self,arg0,arg1,arg2):
-        val = windowsc.wxWindow_PopupMenuXY(self.this,arg0.this,arg1,arg2)
+    def PopupMenuXY(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_PopupMenuXY,(self,) + _args, _kwargs)

         return val
         return val

-    def PopupMenu(self,arg0,arg1):
-        val = windowsc.wxWindow_PopupMenu(self.this,arg0.this,arg1.this)
+    def PopupMenu(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_PopupMenu,(self,) + _args, _kwargs)

         return val
         return val

-    def Raise(self):
-        val = windowsc.wxWindow_Raise(self.this)
+    def Raise(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_Raise,(self,) + _args, _kwargs)

         return val
         return val

-    def Refresh(self,*args):
-        argl = map(None,args)
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        val = apply(windowsc.wxWindow_Refresh,(self.this,)+args)
+    def Refresh(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_Refresh,(self,) + _args, _kwargs)

         return val
         return val

-    def ReleaseMouse(self):
-        val = windowsc.wxWindow_ReleaseMouse(self.this)
+    def ReleaseMouse(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_ReleaseMouse,(self,) + _args, _kwargs)

         return val
         return val

-    def Reparent(self,arg0):
-        val = windowsc.wxWindow_Reparent(self.this,arg0.this)
+    def Reparent(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_Reparent,(self,) + _args, _kwargs)

         return val
         return val

-    def ScreenToClientXY(self,arg0,arg1):
-        val = windowsc.wxWindow_ScreenToClientXY(self.this,arg0,arg1)
+    def ScreenToClientXY(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_ScreenToClientXY,(self,) + _args, _kwargs)

         return val
         return val

-    def ScreenToClient(self,arg0):
-        val = windowsc.wxWindow_ScreenToClient(self.this,arg0.this)
-        val = wxPointPtr(val)
-        val.thisown = 1
+    def ScreenToClient(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_ScreenToClient,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1

         return val
         return val

-    def ScrollWindow(self,arg0,arg1,*args):
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        args = tuple(argl)
-        val = apply(windowsc.wxWindow_ScrollWindow,(self.this,arg0,arg1,)+args)
+    def ScrollWindow(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_ScrollWindow,(self,) + _args, _kwargs)

         return val
         return val

-    def SetAcceleratorTable(self,arg0):
-        val = windowsc.wxWindow_SetAcceleratorTable(self.this,arg0.this)
+    def SetAcceleratorTable(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetAcceleratorTable,(self,) + _args, _kwargs)

         return val
         return val

-    def SetAutoLayout(self,arg0):
-        val = windowsc.wxWindow_SetAutoLayout(self.this,arg0)
+    def SetAutoLayout(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetAutoLayout,(self,) + _args, _kwargs)

         return val
         return val

-    def SetBackgroundColour(self,arg0):
-        val = windowsc.wxWindow_SetBackgroundColour(self.this,arg0.this)
+    def SetBackgroundColour(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetBackgroundColour,(self,) + _args, _kwargs)

         return val
         return val

-    def SetConstraints(self,arg0):
-        val = windowsc.wxWindow_SetConstraints(self.this,arg0.this)
+    def SetConstraints(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetConstraints,(self,) + _args, _kwargs)

         return val
         return val

-    def SetFocus(self):
-        val = windowsc.wxWindow_SetFocus(self.this)
+    def SetFocus(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetFocus,(self,) + _args, _kwargs)

         return val
         return val

-    def SetFont(self,arg0):
-        val = windowsc.wxWindow_SetFont(self.this,arg0.this)
+    def SetFont(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetFont,(self,) + _args, _kwargs)

         return val
         return val

-    def SetForegroundColour(self,arg0):
-        val = windowsc.wxWindow_SetForegroundColour(self.this,arg0.this)
+    def SetForegroundColour(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetForegroundColour,(self,) + _args, _kwargs)

         return val
         return val

-    def SetId(self,arg0):
-        val = windowsc.wxWindow_SetId(self.this,arg0)
+    def SetId(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetId,(self,) + _args, _kwargs)

         return val
         return val

-    def SetName(self,arg0):
-        val = windowsc.wxWindow_SetName(self.this,arg0)
+    def SetName(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetName,(self,) + _args, _kwargs)

         return val
         return val

-    def SetScrollbar(self,arg0,arg1,arg2,arg3,*args):
-        val = apply(windowsc.wxWindow_SetScrollbar,(self.this,arg0,arg1,arg2,arg3,)+args)
+    def SetScrollbar(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetScrollbar,(self,) + _args, _kwargs)

         return val
         return val

-    def SetScrollPos(self,arg0,arg1,*args):
-        val = apply(windowsc.wxWindow_SetScrollPos,(self.this,arg0,arg1,)+args)
+    def SetScrollPos(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetScrollPos,(self,) + _args, _kwargs)

         return val
         return val

-    def SetDimensions(self,arg0,arg1,arg2,arg3,*args):
-        val = apply(windowsc.wxWindow_SetDimensions,(self.this,arg0,arg1,arg2,arg3,)+args)
+    def SetDimensions(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetDimensions,(self,) + _args, _kwargs)

         return val
         return val

-    def SetSize(self,arg0):
-        val = windowsc.wxWindow_SetSize(self.this,arg0.this)
+    def SetSize(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetSize,(self,) + _args, _kwargs)

         return val
         return val

-    def SetPosition(self,arg0):
-        val = windowsc.wxWindow_SetPosition(self.this,arg0.this)
+    def SetPosition(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetPosition,(self,) + _args, _kwargs)

         return val
         return val

-    def SetSizeHints(self,*args):
-        val = apply(windowsc.wxWindow_SetSizeHints,(self.this,)+args)
+    def SetSizeHints(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetSizeHints,(self,) + _args, _kwargs)

         return val
         return val

-    def SetClientSizeWH(self,arg0,arg1):
-        val = windowsc.wxWindow_SetClientSizeWH(self.this,arg0,arg1)
+    def SetClientSizeWH(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetClientSizeWH,(self,) + _args, _kwargs)

         return val
         return val

-    def SetClientSize(self,arg0):
-        val = windowsc.wxWindow_SetClientSize(self.this,arg0.this)
+    def SetClientSize(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetClientSize,(self,) + _args, _kwargs)

         return val
         return val

-    def SetCursor(self,arg0):
-        val = windowsc.wxWindow_SetCursor(self.this,arg0.this)
+    def SetCursor(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetCursor,(self,) + _args, _kwargs)

         return val
         return val

-    def SetTitle(self,arg0):
-        val = windowsc.wxWindow_SetTitle(self.this,arg0)
+    def SetTitle(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetTitle,(self,) + _args, _kwargs)

         return val
         return val

-    def Show(self,arg0):
-        val = windowsc.wxWindow_Show(self.this,arg0)
+    def Show(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_Show,(self,) + _args, _kwargs)

         return val
         return val

-    def TransferDataFromWindow(self):
-        val = windowsc.wxWindow_TransferDataFromWindow(self.this)
+    def TransferDataFromWindow(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_TransferDataFromWindow,(self,) + _args, _kwargs)

         return val
         return val

-    def TransferDataToWindow(self):
-        val = windowsc.wxWindow_TransferDataToWindow(self.this)
+    def TransferDataToWindow(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_TransferDataToWindow,(self,) + _args, _kwargs)

         return val
         return val

-    def Validate(self):
-        val = windowsc.wxWindow_Validate(self.this)
+    def Validate(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_Validate,(self,) + _args, _kwargs)

         return val
         return val

-    def WarpPointer(self,arg0,arg1):
-        val = windowsc.wxWindow_WarpPointer(self.this,arg0,arg1)
+    def WarpPointer(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_WarpPointer,(self,) + _args, _kwargs)

         return val
         return val

-    def ConvertDialogPointToPixels(self,arg0):
-        val = windowsc.wxWindow_ConvertDialogPointToPixels(self.this,arg0.this)
-        val = wxPointPtr(val)
-        val.thisown = 1
+    def ConvertDialogPointToPixels(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_ConvertDialogPointToPixels,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1

         return val
         return val

-    def ConvertDialogSizeToPixels(self,arg0):
-        val = windowsc.wxWindow_ConvertDialogSizeToPixels(self.this,arg0.this)
-        val = wxSizePtr(val)
-        val.thisown = 1
+    def ConvertDialogSizeToPixels(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_ConvertDialogSizeToPixels,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1

         return val
         return val

-    def DLG_PNT(self,arg0):
-        val = windowsc.wxWindow_DLG_PNT(self.this,arg0.this)
-        val = wxPointPtr(val)
-        val.thisown = 1
+    def DLG_PNT(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_DLG_PNT,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1

         return val
         return val

-    def DLG_SZE(self,arg0):
-        val = windowsc.wxWindow_DLG_SZE(self.this,arg0.this)
-        val = wxSizePtr(val)
-        val.thisown = 1
+    def DLG_SZE(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_DLG_SZE,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1

         return val
         return val

-    def ConvertPixelPointToDialog(self,arg0):
-        val = windowsc.wxWindow_ConvertPixelPointToDialog(self.this,arg0.this)
-        val = wxPointPtr(val)
-        val.thisown = 1
+    def ConvertPixelPointToDialog(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_ConvertPixelPointToDialog,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1

         return val
         return val

-    def ConvertPixelSizeToDialog(self,arg0):
-        val = windowsc.wxWindow_ConvertPixelSizeToDialog(self.this,arg0.this)
-        val = wxSizePtr(val)
-        val.thisown = 1
+    def ConvertPixelSizeToDialog(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_ConvertPixelSizeToDialog,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1

         return val
         return val

-    def SetToolTipString(self,arg0):
-        val = windowsc.wxWindow_SetToolTipString(self.this,arg0)
+    def SetToolTipString(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetToolTipString,(self,) + _args, _kwargs)

         return val
         return val

-    def SetToolTip(self,arg0):
-        val = windowsc.wxWindow_SetToolTip(self.this,arg0.this)
+    def SetToolTip(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetToolTip,(self,) + _args, _kwargs)

         return val
         return val

-    def GetToolTip(self):
-        val = windowsc.wxWindow_GetToolTip(self.this)
-        val = wxToolTipPtr(val)
+    def GetToolTip(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetToolTip,(self,) + _args, _kwargs)
+        if val: val = wxToolTipPtr(val) 

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxWindow instance>"
+        return "<C wxWindow instance at %s>" % (self.this,)

 class wxWindow(wxWindowPtr):
 class wxWindow(wxWindowPtr):

-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(windowsc.new_wxWindow,(arg0.this,arg1,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(windowsc.new_wxWindow,_args,_kwargs)

         self.thisown = 1
         wx._StdWindowCallbacks(self)
 
         self.thisown = 1
         wx._StdWindowCallbacks(self)
 


@@ -399,18 +366,18 @@ class wxPanelPtr(wxWindowPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def InitDialog(self):
-        val = windowsc.wxPanel_InitDialog(self.this)
+    def InitDialog(self, *_args, **_kwargs):
+        val = apply(windowsc.wxPanel_InitDialog,(self,) + _args, _kwargs)

         return val
         return val

-    def GetDefaultItem(self):
-        val = windowsc.wxPanel_GetDefaultItem(self.this)
-        val = wxButtonPtr(val)
+    def GetDefaultItem(self, *_args, **_kwargs):
+        val = apply(windowsc.wxPanel_GetDefaultItem,(self,) + _args, _kwargs)
+        if val: val = wxButtonPtr(val) 

         return val
         return val

-    def SetDefaultItem(self,arg0):
-        val = windowsc.wxPanel_SetDefaultItem(self.this,arg0.this)
+    def SetDefaultItem(self, *_args, **_kwargs):
+        val = apply(windowsc.wxPanel_SetDefaultItem,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxPanel instance>"
+        return "<C wxPanel instance at %s>" % (self.this,)

     
     def GetDefaultItem(self):
         import controls
     
     def GetDefaultItem(self):
         import controls


@@ -419,14 +386,8 @@ class wxPanelPtr(wxWindowPtr):
         return val
 
 class wxPanel(wxPanelPtr):
         return val
 
 class wxPanel(wxPanelPtr):

-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(windowsc.new_wxPanel,(arg0.this,arg1,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(windowsc.new_wxPanel,_args,_kwargs)

         self.thisown = 1
         wx._StdWindowCallbacks(self)
 
         self.thisown = 1
         wx._StdWindowCallbacks(self)
 


@@ -437,53 +398,47 @@ class wxDialogPtr(wxPanelPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def Centre(self,*args):
-        val = apply(windowsc.wxDialog_Centre,(self.this,)+args)
+    def Centre(self, *_args, **_kwargs):
+        val = apply(windowsc.wxDialog_Centre,(self,) + _args, _kwargs)

         return val
         return val

-    def EndModal(self,arg0):
-        val = windowsc.wxDialog_EndModal(self.this,arg0)
+    def EndModal(self, *_args, **_kwargs):
+        val = apply(windowsc.wxDialog_EndModal,(self,) + _args, _kwargs)

         return val
         return val

-    def GetTitle(self):
-        val = windowsc.wxDialog_GetTitle(self.this)
+    def GetTitle(self, *_args, **_kwargs):
+        val = apply(windowsc.wxDialog_GetTitle,(self,) + _args, _kwargs)

         return val
         return val

-    def Iconize(self,arg0):
-        val = windowsc.wxDialog_Iconize(self.this,arg0)
+    def Iconize(self, *_args, **_kwargs):
+        val = apply(windowsc.wxDialog_Iconize,(self,) + _args, _kwargs)

         return val
         return val

-    def IsIconized(self):
-        val = windowsc.wxDialog_IsIconized(self.this)
+    def IsIconized(self, *_args, **_kwargs):
+        val = apply(windowsc.wxDialog_IsIconized,(self,) + _args, _kwargs)

         return val
         return val

-    def SetModal(self,arg0):
-        val = windowsc.wxDialog_SetModal(self.this,arg0)
+    def SetModal(self, *_args, **_kwargs):
+        val = apply(windowsc.wxDialog_SetModal,(self,) + _args, _kwargs)

         return val
         return val

-    def IsModal(self):
-        val = windowsc.wxDialog_IsModal(self.this)
+    def IsModal(self, *_args, **_kwargs):
+        val = apply(windowsc.wxDialog_IsModal,(self,) + _args, _kwargs)

         return val
         return val

-    def SetTitle(self,arg0):
-        val = windowsc.wxDialog_SetTitle(self.this,arg0)
+    def SetTitle(self, *_args, **_kwargs):
+        val = apply(windowsc.wxDialog_SetTitle,(self,) + _args, _kwargs)

         return val
         return val

-    def Show(self,arg0):
-        val = windowsc.wxDialog_Show(self.this,arg0)
+    def Show(self, *_args, **_kwargs):
+        val = apply(windowsc.wxDialog_Show,(self,) + _args, _kwargs)

         return val
         return val

-    def ShowModal(self):
-        val = windowsc.wxDialog_ShowModal(self.this)
+    def ShowModal(self, *_args, **_kwargs):
+        val = apply(windowsc.wxDialog_ShowModal,(self,) + _args, _kwargs)

         return val
         return val

-    def GetReturnCode(self):
-        val = windowsc.wxDialog_GetReturnCode(self.this)
+    def GetReturnCode(self, *_args, **_kwargs):
+        val = apply(windowsc.wxDialog_GetReturnCode,(self,) + _args, _kwargs)

         return val
         return val

-    def SetReturnCode(self,arg0):
-        val = windowsc.wxDialog_SetReturnCode(self.this,arg0)
+    def SetReturnCode(self, *_args, **_kwargs):
+        val = apply(windowsc.wxDialog_SetReturnCode,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxDialog instance>"
+        return "<C wxDialog instance at %s>" % (self.this,)

 class wxDialog(wxDialogPtr):
 class wxDialog(wxDialogPtr):

-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(windowsc.new_wxDialog,(arg0.this,arg1,arg2,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(windowsc.new_wxDialog,_args,_kwargs)

         self.thisown = 1
         wx._StdDialogCallbacks(self)
 
         self.thisown = 1
         wx._StdDialogCallbacks(self)
 


@@ -494,41 +449,35 @@ class wxScrolledWindowPtr(wxPanelPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def EnableScrolling(self,arg0,arg1):
-        val = windowsc.wxScrolledWindow_EnableScrolling(self.this,arg0,arg1)
+    def EnableScrolling(self, *_args, **_kwargs):
+        val = apply(windowsc.wxScrolledWindow_EnableScrolling,(self,) + _args, _kwargs)

         return val
         return val

-    def GetScrollPixelsPerUnit(self):
-        val = windowsc.wxScrolledWindow_GetScrollPixelsPerUnit(self.this)
+    def GetScrollPixelsPerUnit(self, *_args, **_kwargs):
+        val = apply(windowsc.wxScrolledWindow_GetScrollPixelsPerUnit,(self,) + _args, _kwargs)

         return val
         return val

-    def GetVirtualSize(self):
-        val = windowsc.wxScrolledWindow_GetVirtualSize(self.this)
+    def GetVirtualSize(self, *_args, **_kwargs):
+        val = apply(windowsc.wxScrolledWindow_GetVirtualSize,(self,) + _args, _kwargs)

         return val
         return val

-    def IsRetained(self):
-        val = windowsc.wxScrolledWindow_IsRetained(self.this)
+    def IsRetained(self, *_args, **_kwargs):
+        val = apply(windowsc.wxScrolledWindow_IsRetained,(self,) + _args, _kwargs)

         return val
         return val

-    def PrepareDC(self,arg0):
-        val = windowsc.wxScrolledWindow_PrepareDC(self.this,arg0.this)
+    def PrepareDC(self, *_args, **_kwargs):
+        val = apply(windowsc.wxScrolledWindow_PrepareDC,(self,) + _args, _kwargs)

         return val
         return val

-    def Scroll(self,arg0,arg1):
-        val = windowsc.wxScrolledWindow_Scroll(self.this,arg0,arg1)
+    def Scroll(self, *_args, **_kwargs):
+        val = apply(windowsc.wxScrolledWindow_Scroll,(self,) + _args, _kwargs)

         return val
         return val

-    def SetScrollbars(self,arg0,arg1,arg2,arg3,*args):
-        val = apply(windowsc.wxScrolledWindow_SetScrollbars,(self.this,arg0,arg1,arg2,arg3,)+args)
+    def SetScrollbars(self, *_args, **_kwargs):
+        val = apply(windowsc.wxScrolledWindow_SetScrollbars,(self,) + _args, _kwargs)

         return val
         return val

-    def ViewStart(self):
-        val = windowsc.wxScrolledWindow_ViewStart(self.this)
+    def ViewStart(self, *_args, **_kwargs):
+        val = apply(windowsc.wxScrolledWindow_ViewStart,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxScrolledWindow instance>"
+        return "<C wxScrolledWindow instance at %s>" % (self.this,)

 class wxScrolledWindow(wxScrolledWindowPtr):
 class wxScrolledWindow(wxScrolledWindowPtr):

-    def __init__(self,arg0,*args) :
-        argl = map(None,args)
-        try: argl[1] = argl[1].this
-        except: pass
-        try: argl[2] = argl[2].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(windowsc.new_wxScrolledWindow,(arg0.this,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(windowsc.new_wxScrolledWindow,_args,_kwargs)

         self.thisown = 1
         wx._StdWindowCallbacks(self)
         wx._StdOnScrollCallbacks(self)
         self.thisown = 1
         wx._StdWindowCallbacks(self)
         wx._StdOnScrollCallbacks(self)


@@ -540,70 +489,66 @@ class wxMenuPtr(wxEvtHandlerPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def Append(self,arg0,arg1,*args):
-        val = apply(windowsc.wxMenu_Append,(self.this,arg0,arg1,)+args)
+    def Append(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_Append,(self,) + _args, _kwargs)

         return val
         return val

-    def AppendMenu(self,arg0,arg1,arg2,*args):
-        val = apply(windowsc.wxMenu_AppendMenu,(self.this,arg0,arg1,arg2.this,)+args)
+    def AppendMenu(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_AppendMenu,(self,) + _args, _kwargs)

         return val
         return val

-    def AppendItem(self,arg0):
-        val = windowsc.wxMenu_AppendItem(self.this,arg0.this)
+    def AppendItem(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_AppendItem,(self,) + _args, _kwargs)

         return val
         return val

-    def AppendSeparator(self):
-        val = windowsc.wxMenu_AppendSeparator(self.this)
+    def AppendSeparator(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_AppendSeparator,(self,) + _args, _kwargs)

         return val
         return val

-    def Break(self):
-        val = windowsc.wxMenu_Break(self.this)
+    def Break(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_Break,(self,) + _args, _kwargs)

         return val
         return val

-    def Check(self,arg0,arg1):
-        val = windowsc.wxMenu_Check(self.this,arg0,arg1)
+    def Check(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_Check,(self,) + _args, _kwargs)

         return val
         return val

-    def Enable(self,arg0,arg1):
-        val = windowsc.wxMenu_Enable(self.this,arg0,arg1)
+    def Enable(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_Enable,(self,) + _args, _kwargs)

         return val
         return val

-    def FindItem(self,arg0):
-        val = windowsc.wxMenu_FindItem(self.this,arg0)
+    def FindItem(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_FindItem,(self,) + _args, _kwargs)

         return val
         return val

-    def GetTitle(self):
-        val = windowsc.wxMenu_GetTitle(self.this)
+    def GetTitle(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_GetTitle,(self,) + _args, _kwargs)

         return val
         return val

-    def SetTitle(self,arg0):
-        val = windowsc.wxMenu_SetTitle(self.this,arg0)
+    def SetTitle(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_SetTitle,(self,) + _args, _kwargs)

         return val
         return val

-    def FindItemForId(self,arg0):
-        val = windowsc.wxMenu_FindItemForId(self.this,arg0)
-        val = wxMenuItemPtr(val)
+    def FindItemForId(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_FindItemForId,(self,) + _args, _kwargs)
+        if val: val = wxMenuItemPtr(val) 

         return val
         return val

-    def GetHelpString(self,arg0):
-        val = windowsc.wxMenu_GetHelpString(self.this,arg0)
+    def GetHelpString(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_GetHelpString,(self,) + _args, _kwargs)

         return val
         return val

-    def GetLabel(self,arg0):
-        val = windowsc.wxMenu_GetLabel(self.this,arg0)
+    def GetLabel(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_GetLabel,(self,) + _args, _kwargs)

         return val
         return val

-    def SetHelpString(self,arg0,arg1):
-        val = windowsc.wxMenu_SetHelpString(self.this,arg0,arg1)
+    def SetHelpString(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_SetHelpString,(self,) + _args, _kwargs)

         return val
         return val

-    def IsChecked(self,arg0):
-        val = windowsc.wxMenu_IsChecked(self.this,arg0)
+    def IsChecked(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_IsChecked,(self,) + _args, _kwargs)

         return val
         return val

-    def IsEnabled(self,arg0):
-        val = windowsc.wxMenu_IsEnabled(self.this,arg0)
+    def IsEnabled(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_IsEnabled,(self,) + _args, _kwargs)

         return val
         return val

-    def SetLabel(self,arg0,arg1):
-        val = windowsc.wxMenu_SetLabel(self.this,arg0,arg1)
+    def SetLabel(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_SetLabel,(self,) + _args, _kwargs)

         return val
         return val

-    def UpdateUI(self,*args):
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        args = tuple(argl)
-        val = apply(windowsc.wxMenu_UpdateUI,(self.this,)+args)
+    def UpdateUI(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_UpdateUI,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxMenu instance>"
+        return "<C wxMenu instance at %s>" % (self.this,)

 class wxMenu(wxMenuPtr):
 class wxMenu(wxMenuPtr):

-    def __init__(self,*args) :
-        self.this = apply(windowsc.new_wxMenu,()+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(windowsc.new_wxMenu,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -613,61 +558,61 @@ class wxMenuBarPtr(wxEvtHandlerPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def Append(self,arg0,arg1):
-        val = windowsc.wxMenuBar_Append(self.this,arg0.this,arg1)
+    def Append(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_Append,(self,) + _args, _kwargs)

         return val
         return val

-    def Check(self,arg0,arg1):
-        val = windowsc.wxMenuBar_Check(self.this,arg0,arg1)
+    def Check(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_Check,(self,) + _args, _kwargs)

         return val
         return val

-    def Checked(self,arg0):
-        val = windowsc.wxMenuBar_Checked(self.this,arg0)
+    def Checked(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_Checked,(self,) + _args, _kwargs)

         return val
         return val

-    def Enable(self,arg0,arg1):
-        val = windowsc.wxMenuBar_Enable(self.this,arg0,arg1)
+    def Enable(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_Enable,(self,) + _args, _kwargs)

         return val
         return val

-    def Enabled(self,arg0):
-        val = windowsc.wxMenuBar_Enabled(self.this,arg0)
+    def Enabled(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_Enabled,(self,) + _args, _kwargs)

         return val
         return val

-    def FindMenuItem(self,arg0,arg1):
-        val = windowsc.wxMenuBar_FindMenuItem(self.this,arg0,arg1)
+    def FindMenuItem(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_FindMenuItem,(self,) + _args, _kwargs)

         return val
         return val

-    def FindItemForId(self,arg0):
-        val = windowsc.wxMenuBar_FindItemForId(self.this,arg0)
-        val = wxMenuItemPtr(val)
+    def FindItemForId(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_FindItemForId,(self,) + _args, _kwargs)
+        if val: val = wxMenuItemPtr(val) 

         return val
         return val

-    def EnableTop(self,arg0,arg1):
-        val = windowsc.wxMenuBar_EnableTop(self.this,arg0,arg1)
+    def EnableTop(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_EnableTop,(self,) + _args, _kwargs)

         return val
         return val

-    def GetHelpString(self,arg0):
-        val = windowsc.wxMenuBar_GetHelpString(self.this,arg0)
+    def GetHelpString(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_GetHelpString,(self,) + _args, _kwargs)

         return val
         return val

-    def GetLabel(self,arg0):
-        val = windowsc.wxMenuBar_GetLabel(self.this,arg0)
+    def GetLabel(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_GetLabel,(self,) + _args, _kwargs)

         return val
         return val

-    def SetHelpString(self,arg0,arg1):
-        val = windowsc.wxMenuBar_SetHelpString(self.this,arg0,arg1)
+    def SetHelpString(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_SetHelpString,(self,) + _args, _kwargs)

         return val
         return val

-    def SetLabel(self,arg0,arg1):
-        val = windowsc.wxMenuBar_SetLabel(self.this,arg0,arg1)
+    def SetLabel(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_SetLabel,(self,) + _args, _kwargs)

         return val
         return val

-    def GetLabelTop(self,arg0):
-        val = windowsc.wxMenuBar_GetLabelTop(self.this,arg0)
+    def GetLabelTop(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_GetLabelTop,(self,) + _args, _kwargs)

         return val
         return val

-    def SetLabelTop(self,arg0,arg1):
-        val = windowsc.wxMenuBar_SetLabelTop(self.this,arg0,arg1)
+    def SetLabelTop(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_SetLabelTop,(self,) + _args, _kwargs)

         return val
         return val

-    def GetMenuCount(self):
-        val = windowsc.wxMenuBar_GetMenuCount(self.this)
+    def GetMenuCount(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_GetMenuCount,(self,) + _args, _kwargs)

         return val
         return val

-    def GetMenu(self,arg0):
-        val = windowsc.wxMenuBar_GetMenu(self.this,arg0)
-        val = wxMenuPtr(val)
+    def GetMenu(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_GetMenu,(self,) + _args, _kwargs)
+        if val: val = wxMenuPtr(val) 

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxMenuBar instance>"
+        return "<C wxMenuBar instance at %s>" % (self.this,)

 class wxMenuBar(wxMenuBarPtr):
 class wxMenuBar(wxMenuBarPtr):

-    def __init__(self) :
-        self.this = windowsc.new_wxMenuBar()
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(windowsc.new_wxMenuBar,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -677,96 +622,85 @@ class wxMenuItemPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def IsSeparator(self):
-        val = windowsc.wxMenuItem_IsSeparator(self.this)
+    def IsSeparator(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_IsSeparator,(self,) + _args, _kwargs)

         return val
         return val

-    def IsEnabled(self):
-        val = windowsc.wxMenuItem_IsEnabled(self.this)
+    def IsEnabled(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_IsEnabled,(self,) + _args, _kwargs)

         return val
         return val

-    def IsChecked(self):
-        val = windowsc.wxMenuItem_IsChecked(self.this)
+    def IsChecked(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_IsChecked,(self,) + _args, _kwargs)

         return val
         return val

-    def IsCheckable(self):
-        val = windowsc.wxMenuItem_IsCheckable(self.this)
+    def IsCheckable(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_IsCheckable,(self,) + _args, _kwargs)

         return val
         return val

-    def GetId(self):
-        val = windowsc.wxMenuItem_GetId(self.this)
+    def GetId(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_GetId,(self,) + _args, _kwargs)

         return val
         return val

-    def GetSubMenu(self):
-        val = windowsc.wxMenuItem_GetSubMenu(self.this)
-        val = wxMenuPtr(val)
+    def GetSubMenu(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_GetSubMenu,(self,) + _args, _kwargs)
+        if val: val = wxMenuPtr(val) 

         return val
         return val

-    def SetName(self,arg0):
-        val = windowsc.wxMenuItem_SetName(self.this,arg0)
+    def SetName(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_SetName,(self,) + _args, _kwargs)

         return val
         return val

-    def GetName(self):
-        val = windowsc.wxMenuItem_GetName(self.this)
+    def GetName(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_GetName,(self,) + _args, _kwargs)

         return val
         return val

-    def GetHelp(self):
-        val = windowsc.wxMenuItem_GetHelp(self.this)
+    def GetHelp(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_GetHelp,(self,) + _args, _kwargs)

         return val
         return val

-    def SetHelp(self,arg0):
-        val = windowsc.wxMenuItem_SetHelp(self.this,arg0)
+    def SetHelp(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_SetHelp,(self,) + _args, _kwargs)

         return val
         return val

-    def Enable(self,*args):
-        val = apply(windowsc.wxMenuItem_Enable,(self.this,)+args)
+    def Enable(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_Enable,(self,) + _args, _kwargs)

         return val
         return val

-    def Check(self,*args):
-        val = apply(windowsc.wxMenuItem_Check,(self.this,)+args)
+    def Check(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_Check,(self,) + _args, _kwargs)

         return val
         return val

-    def GetBackgroundColour(self):
-        val = windowsc.wxMenuItem_GetBackgroundColour(self.this)
-        val = wxColourPtr(val)
+    def GetBackgroundColour(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_GetBackgroundColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) 

         return val
         return val

-    def GetBitmap(self,*args):
-        val = apply(windowsc.wxMenuItem_GetBitmap,(self.this,)+args)
-        val = wxBitmapPtr(val)
-        val.thisown = 1
+    def GetBitmap(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_GetBitmap,(self,) + _args, _kwargs)
+        if val: val = wxBitmapPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetFont(self):
-        val = windowsc.wxMenuItem_GetFont(self.this)
-        val = wxFontPtr(val)
+    def GetFont(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_GetFont,(self,) + _args, _kwargs)
+        if val: val = wxFontPtr(val) 

         return val
         return val

-    def GetMarginWidth(self):
-        val = windowsc.wxMenuItem_GetMarginWidth(self.this)
+    def GetMarginWidth(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_GetMarginWidth,(self,) + _args, _kwargs)

         return val
         return val

-    def GetTextColour(self):
-        val = windowsc.wxMenuItem_GetTextColour(self.this)
-        val = wxColourPtr(val)
+    def GetTextColour(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_GetTextColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) 

         return val
         return val

-    def SetBackgroundColour(self,arg0):
-        val = windowsc.wxMenuItem_SetBackgroundColour(self.this,arg0.this)
+    def SetBackgroundColour(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_SetBackgroundColour,(self,) + _args, _kwargs)

         return val
         return val

-    def SetBitmaps(self,arg0,*args):
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        args = tuple(argl)
-        val = apply(windowsc.wxMenuItem_SetBitmaps,(self.this,arg0.this,)+args)
+    def SetBitmaps(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_SetBitmaps,(self,) + _args, _kwargs)

         return val
         return val

-    def SetFont(self,arg0):
-        val = windowsc.wxMenuItem_SetFont(self.this,arg0.this)
+    def SetFont(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_SetFont,(self,) + _args, _kwargs)

         return val
         return val

-    def SetMarginWidth(self,arg0):
-        val = windowsc.wxMenuItem_SetMarginWidth(self.this,arg0)
+    def SetMarginWidth(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_SetMarginWidth,(self,) + _args, _kwargs)

         return val
         return val

-    def SetTextColour(self,arg0):
-        val = windowsc.wxMenuItem_SetTextColour(self.this,arg0.this)
+    def SetTextColour(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_SetTextColour,(self,) + _args, _kwargs)

         return val
         return val

-    def DeleteSubMenu(self):
-        val = windowsc.wxMenuItem_DeleteSubMenu(self.this)
+    def DeleteSubMenu(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_DeleteSubMenu,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxMenuItem instance>"
+        return "<C wxMenuItem instance at %s>" % (self.this,)

 class wxMenuItem(wxMenuItemPtr):
 class wxMenuItem(wxMenuItemPtr):

-    def __init__(self,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[5] = argl[5].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(windowsc.new_wxMenuItem,()+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(windowsc.new_wxMenuItem,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -776,14 +710,14 @@ class wxMenuItem(wxMenuItemPtr):
 
 #-------------- FUNCTION WRAPPERS ------------------
 
 
 #-------------- FUNCTION WRAPPERS ------------------
 

-def wxWindow_FindFocus():
-    val = windowsc.wxWindow_FindFocus()
-    val = wxWindowPtr(val)
+def wxWindow_FindFocus(*_args, **_kwargs):
+    val = apply(windowsc.wxWindow_FindFocus,_args,_kwargs)
+    if val: val = wxWindowPtr(val)

     return val
 
     return val
 

-def wxWindow_FromHWND(arg0):
-    val = windowsc.wxWindow_FromHWND(arg0)
-    val = wxWindowPtr(val)
+def wxWindow_FromHWND(*_args, **_kwargs):
+    val = apply(windowsc.wxWindow_FromHWND,_args,_kwargs)
+    if val: val = wxWindowPtr(val)

     return val
 
 
     return val
 
 

diff --git a/utils/wxPython/src/msw/windows2.cpp b/utils/wxPython/src/msw/windows2.cpp
index f0428b3070fef0cf7952f341b7fecdf48aadd3b7..cde65a16519f39fb2ae0b79463bd71084ab53d83 100644 (file)
--- a/utils/wxPython/src/msw/windows2.cpp
+++ b/utils/wxPython/src/msw/windows2.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)

- * Version 1.1 (Patch 5)
+ * Version 1.1 (Patch 6)

  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.


@@ -24,16 +24,16 @@
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)

-#      define SWIGEXPORT(a,b) __declspec(dllexport) a b
+#      define SWIGEXPORT(a) __declspec(dllexport) a

 #   else
 #      if defined(__BORLANDC__)
 #   else
 #      if defined(__BORLANDC__)

-#          define SWIGEXPORT(a,b) a _export b
+#          define SWIGEXPORT(a) a _export 

 #      else
 #      else

-#          define SWIGEXPORT(a,b) a b
+#          define SWIGEXPORT(a) a 

 #      endif
 #   endif
 #else
 #      endif
 #   endif
 #else

-#   define SWIGEXPORT(a,b) a b
+#   define SWIGEXPORT(a) a 

 #endif
 
 #ifdef __cplusplus
 #endif
 
 #ifdef __cplusplus


@@ -43,12 +43,12 @@ extern "C" {
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);

+extern char *SWIG_GetPtrObj(PyObject *, void **, char *);

 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif
 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif

-

 #define SWIG_init    initwindows2c
 
 #define SWIG_name    "windows2c"
 #define SWIG_init    initwindows2c
 
 #define SWIG_name    "windows2c"


@@ -63,12 +63,13 @@ extern PyObject *SWIG_newvarlink(void);
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;

-    if (!target) {
+    PyObject*   o3;
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);
         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);


@@ -85,23 +86,23 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
     PyObject*   o3;
 
     PyObject*   o2;
     PyObject*   o3;
 

-    if (!target) {
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }
         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }

-        o3 = PyTuple_New(1);
-        PyTuple_SetItem(o3, 0, o);
+        o3 = PyTuple_New(1);            
+        PyTuple_SetItem(o3, 0, o);      

 
         o2 = target;
 
         o2 = target;

-        target = PySequence_Concat(o2, o3);
-        Py_DECREF(o2);
+        target = PySequence_Concat(o2, o3); 
+        Py_DECREF(o2);                      

         Py_DECREF(o3);
     }
     return target;
         Py_DECREF(o3);
     }
     return target;


@@ -119,6 +120,9 @@ extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
 
 
 static char* wxStringErrorMsg = "string type is required for parameter";
 
 
 static char* wxStringErrorMsg = "string type is required for parameter";

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

 #define new_wxGridCell() (new wxGridCell())
 static PyObject *_wrap_new_wxGridCell(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define new_wxGridCell() (new wxGridCell())
 static PyObject *_wrap_new_wxGridCell(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -133,8 +137,13 @@ static PyObject *_wrap_new_wxGridCell(PyObject *self, PyObject *args) {
         _result = (wxGridCell *)new_wxGridCell();
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxGridCell *)new_wxGridCell();
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCell_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCell_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -142,13 +151,14 @@ static PyObject *_wrap_new_wxGridCell(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxGridCell(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGridCell * _arg0;
 static PyObject *_wrap_delete_wxGridCell(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGridCell * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:delete_wxGridCell",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxGridCell",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridCell_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridCell_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxGridCell. Expected _wxGridCell_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxGridCell. Expected _wxGridCell_p.");
         return NULL;
         }


@@ -168,13 +178,14 @@ static PyObject *_wrap_wxGridCell_GetTextValue(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxGridCell * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxGridCell * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGridCell_GetTextValue",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGridCell_GetTextValue",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridCell_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridCell_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCell_GetTextValue. Expected _wxGridCell_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCell_GetTextValue. Expected _wxGridCell_p.");
         return NULL;
         }


@@ -196,14 +207,15 @@ static PyObject *_wrap_wxGridCell_SetTextValue(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGridCell * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxGridCell * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxGridCell_SetTextValue",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxGridCell_SetTextValue",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridCell_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridCell_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCell_SetTextValue. Expected _wxGridCell_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCell_SetTextValue. Expected _wxGridCell_p.");
         return NULL;
         }


@@ -234,14 +246,15 @@ static PyObject *_wrap_wxGridCell_GetFont(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFont * _result;
     wxGridCell * _arg0;
     PyObject * _resultobj;
     wxFont * _result;
     wxGridCell * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGridCell_GetFont",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGridCell_GetFont",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridCell_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridCell_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCell_GetFont. Expected _wxGridCell_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCell_GetFont. Expected _wxGridCell_p.");
         return NULL;
         }


@@ -252,8 +265,13 @@ static PyObject *_wrap_wxGridCell_GetFont(PyObject *self, PyObject *args) {
     _result = (wxFont *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxFont *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -262,20 +280,22 @@ static PyObject *_wrap_wxGridCell_SetFont(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGridCell * _arg0;
     wxFont * _arg1;
     PyObject * _resultobj;
     wxGridCell * _arg0;
     wxFont * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxGridCell_SetFont",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxGridCell_SetFont",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridCell_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridCell_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCell_SetFont. Expected _wxGridCell_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCell_SetFont. Expected _wxGridCell_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxFont_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxFont_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGridCell_SetFont. Expected _wxFont_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGridCell_SetFont. Expected _wxFont_p.");
         return NULL;
         }


@@ -295,14 +315,15 @@ static PyObject *_wrap_wxGridCell_GetTextColour(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxColour * _result;
     wxGridCell * _arg0;
     PyObject * _resultobj;
     wxColour * _result;
     wxGridCell * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGridCell_GetTextColour",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGridCell_GetTextColour",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridCell_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridCell_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCell_GetTextColour. Expected _wxGridCell_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCell_GetTextColour. Expected _wxGridCell_p.");
         return NULL;
         }


@@ -313,8 +334,13 @@ static PyObject *_wrap_wxGridCell_GetTextColour(PyObject *self, PyObject *args)
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -323,20 +349,22 @@ static PyObject *_wrap_wxGridCell_SetTextColour(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxGridCell * _arg0;
     wxColour * _arg1;
     PyObject * _resultobj;
     wxGridCell * _arg0;
     wxColour * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxGridCell_SetTextColour",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxGridCell_SetTextColour",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridCell_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridCell_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCell_SetTextColour. Expected _wxGridCell_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCell_SetTextColour. Expected _wxGridCell_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxColour_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGridCell_SetTextColour. Expected _wxColour_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGridCell_SetTextColour. Expected _wxColour_p.");
         return NULL;
         }


@@ -356,14 +384,15 @@ static PyObject *_wrap_wxGridCell_GetBackgroundColour(PyObject *self, PyObject *
     PyObject * _resultobj;
     wxColour * _result;
     wxGridCell * _arg0;
     PyObject * _resultobj;
     wxColour * _result;
     wxGridCell * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGridCell_GetBackgroundColour",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGridCell_GetBackgroundColour",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridCell_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridCell_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCell_GetBackgroundColour. Expected _wxGridCell_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCell_GetBackgroundColour. Expected _wxGridCell_p.");
         return NULL;
         }


@@ -374,8 +403,13 @@ static PyObject *_wrap_wxGridCell_GetBackgroundColour(PyObject *self, PyObject *
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -384,20 +418,22 @@ static PyObject *_wrap_wxGridCell_SetBackgroundColour(PyObject *self, PyObject *
     PyObject * _resultobj;
     wxGridCell * _arg0;
     wxColour * _arg1;
     PyObject * _resultobj;
     wxGridCell * _arg0;
     wxColour * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxGridCell_SetBackgroundColour",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxGridCell_SetBackgroundColour",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridCell_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridCell_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCell_SetBackgroundColour. Expected _wxGridCell_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCell_SetBackgroundColour. Expected _wxGridCell_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxColour_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGridCell_SetBackgroundColour. Expected _wxColour_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGridCell_SetBackgroundColour. Expected _wxColour_p.");
         return NULL;
         }


@@ -417,14 +453,15 @@ static PyObject *_wrap_wxGridCell_GetBackgroundBrush(PyObject *self, PyObject *a
     PyObject * _resultobj;
     wxBrush * _result;
     wxGridCell * _arg0;
     PyObject * _resultobj;
     wxBrush * _result;
     wxGridCell * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGridCell_GetBackgroundBrush",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGridCell_GetBackgroundBrush",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridCell_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridCell_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCell_GetBackgroundBrush. Expected _wxGridCell_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCell_GetBackgroundBrush. Expected _wxGridCell_p.");
         return NULL;
         }


@@ -435,8 +472,13 @@ static PyObject *_wrap_wxGridCell_GetBackgroundBrush(PyObject *self, PyObject *a
     _result = (wxBrush *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxBrush *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBrush_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxBrush_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -445,13 +487,14 @@ static PyObject *_wrap_wxGridCell_GetAlignment(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxGridCell * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxGridCell * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGridCell_GetAlignment",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGridCell_GetAlignment",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridCell_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridCell_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCell_GetAlignment. Expected _wxGridCell_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCell_GetAlignment. Expected _wxGridCell_p.");
         return NULL;
         }


@@ -470,13 +513,14 @@ static PyObject *_wrap_wxGridCell_SetAlignment(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGridCell * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxGridCell * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxGridCell_SetAlignment",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxGridCell_SetAlignment",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridCell_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridCell_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCell_SetAlignment. Expected _wxGridCell_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCell_SetAlignment. Expected _wxGridCell_p.");
         return NULL;
         }


@@ -496,14 +540,15 @@ static PyObject *_wrap_wxGridCell_GetCellBitmap(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxBitmap * _result;
     wxGridCell * _arg0;
     PyObject * _resultobj;
     wxBitmap * _result;
     wxGridCell * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGridCell_GetCellBitmap",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGridCell_GetCellBitmap",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridCell_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridCell_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCell_GetCellBitmap. Expected _wxGridCell_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCell_GetCellBitmap. Expected _wxGridCell_p.");
         return NULL;
         }


@@ -513,8 +558,13 @@ static PyObject *_wrap_wxGridCell_GetCellBitmap(PyObject *self, PyObject *args)
         _result = (wxBitmap *)wxGridCell_GetCellBitmap(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxBitmap *)wxGridCell_GetCellBitmap(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -523,20 +573,22 @@ static PyObject *_wrap_wxGridCell_SetCellBitmap(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxGridCell * _arg0;
     wxBitmap * _arg1;
     PyObject * _resultobj;
     wxGridCell * _arg0;
     wxBitmap * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxGridCell_SetCellBitmap",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxGridCell_SetCellBitmap",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridCell_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridCell_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCell_SetCellBitmap. Expected _wxGridCell_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCell_SetCellBitmap. Expected _wxGridCell_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxBitmap_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGridCell_SetCellBitmap. Expected _wxBitmap_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGridCell_SetCellBitmap. Expected _wxBitmap_p.");
         return NULL;
         }


@@ -581,32 +633,35 @@ static PyObject *_wrap_new_wxGrid(PyObject *self, PyObject *args) {
     wxGrid * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxGrid * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;

-    wxPoint * _arg2 = &wxPyDefaultPosition;
-    wxSize * _arg3 = &wxPyDefaultSize;
-    long  _arg4 = 0;
-    char * _arg5 = "grid";
-    char * _argc0 = 0;
-    char * _argc2 = 0;
-    char * _argc3 = 0;
+    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    long  _arg4 = (long ) 0;
+    char * _arg5 = (char *) "grid";
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;
+    PyObject * _argo3 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si|ssls:new_wxGrid",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTuple(args,"Oi|OOls:new_wxGrid",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxGrid. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxGrid. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxGrid. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxGrid. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxSize_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxGrid. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxGrid. Expected _wxSize_p.");
         return NULL;
         }


@@ -616,8 +671,13 @@ static PyObject *_wrap_new_wxGrid(PyObject *self, PyObject *args) {
         _result = (wxGrid *)new_wxGrid(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxGrid *)new_wxGrid(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxGrid_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxGrid_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -625,13 +685,14 @@ static PyObject *_wrap_new_wxGrid(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxGrid_AdjustScrollbars(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGrid * _arg0;
 static PyObject *_wrap_wxGrid_AdjustScrollbars(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGrid * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGrid_AdjustScrollbars",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGrid_AdjustScrollbars",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_AdjustScrollbars. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_AdjustScrollbars. Expected _wxGrid_p.");
         return NULL;
         }


@@ -651,16 +712,17 @@ static PyObject *_wrap_wxGrid_AppendCols(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxGrid * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxGrid * _arg0;

-    int  _arg1 = 1;
-    bool  _arg2 = (1);
-    char * _argc0 = 0;
-    int tempbool2;
+    int  _arg1 = (int ) 1;
+    bool  _arg2 = (bool ) TRUE;
+    PyObject * _argo0 = 0;
+    int tempbool2 = (int) TRUE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|ii:wxGrid_AppendCols",&_argc0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTuple(args,"O|ii:wxGrid_AppendCols",&_argo0,&_arg1,&tempbool2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_AppendCols. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_AppendCols. Expected _wxGrid_p.");
         return NULL;
         }


@@ -680,16 +742,17 @@ static PyObject *_wrap_wxGrid_AppendRows(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxGrid * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxGrid * _arg0;

-    int  _arg1 = 1;
-    bool  _arg2 = (1);
-    char * _argc0 = 0;
-    int tempbool2;
+    int  _arg1 = (int ) 1;
+    bool  _arg2 = (bool ) TRUE;
+    PyObject * _argo0 = 0;
+    int tempbool2 = (int) TRUE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|ii:wxGrid_AppendRows",&_argc0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTuple(args,"O|ii:wxGrid_AppendRows",&_argo0,&_arg1,&tempbool2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_AppendRows. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_AppendRows. Expected _wxGrid_p.");
         return NULL;
         }


@@ -708,13 +771,14 @@ static PyObject *_wrap_wxGrid_AppendRows(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxGrid_BeginBatch(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGrid * _arg0;
 static PyObject *_wrap_wxGrid_BeginBatch(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGrid * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGrid_BeginBatch",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGrid_BeginBatch",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_BeginBatch. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_BeginBatch. Expected _wxGrid_p.");
         return NULL;
         }


@@ -740,7 +804,7 @@ static PyObject *_wrap_wxGrid_CellHitTest(PyObject *self, PyObject *args) {
     int  temp;
     int * _arg4;
     int  temp0;
     int  temp;
     int * _arg4;
     int  temp0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 {
 
     self = self;
 {


@@ -749,10 +813,11 @@ static PyObject *_wrap_wxGrid_CellHitTest(PyObject *self, PyObject *args) {
 {
   _arg4 = &temp0;
 }
 {
   _arg4 = &temp0;
 }

-    if(!PyArg_ParseTuple(args,"sii:wxGrid_CellHitTest",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxGrid_CellHitTest",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_CellHitTest. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_CellHitTest. Expected _wxGrid_p.");
         return NULL;
         }


@@ -786,15 +851,16 @@ static PyObject *_wrap_wxGrid_CreateGrid(PyObject *self, PyObject *args) {
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;

-    short  _arg3 = wxGRID_DEFAULT_CELL_WIDTH;
-    short  _arg4 = wxGRID_DEFAULT_CELL_HEIGHT;
-    char * _argc0 = 0;
+    short  _arg3 = (short ) wxGRID_DEFAULT_CELL_WIDTH;
+    short  _arg4 = (short ) wxGRID_DEFAULT_CELL_HEIGHT;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii|hh:wxGrid_CreateGrid",&_argc0,&_arg1,&_arg2,&_arg3,&_arg4)) 
+    if(!PyArg_ParseTuple(args,"Oii|hh:wxGrid_CreateGrid",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_CreateGrid. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_CreateGrid. Expected _wxGrid_p.");
         return NULL;
         }


@@ -813,13 +879,14 @@ static PyObject *_wrap_wxGrid_CurrentCellVisible(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     bool  _result;
     wxGrid * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxGrid * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGrid_CurrentCellVisible",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGrid_CurrentCellVisible",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_CurrentCellVisible. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_CurrentCellVisible. Expected _wxGrid_p.");
         return NULL;
         }


@@ -838,17 +905,18 @@ static PyObject *_wrap_wxGrid_DeleteCols(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxGrid * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxGrid * _arg0;

-    int  _arg1 = 0;
-    int  _arg2 = 1;
-    bool  _arg3 = (1);
-    char * _argc0 = 0;
-    int tempbool3;
+    int  _arg1 = (int ) 0;
+    int  _arg2 = (int ) 1;
+    bool  _arg3 = (bool ) TRUE;
+    PyObject * _argo0 = 0;
+    int tempbool3 = (int) TRUE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|iii:wxGrid_DeleteCols",&_argc0,&_arg1,&_arg2,&tempbool3)) 
+    if(!PyArg_ParseTuple(args,"O|iii:wxGrid_DeleteCols",&_argo0,&_arg1,&_arg2,&tempbool3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_DeleteCols. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_DeleteCols. Expected _wxGrid_p.");
         return NULL;
         }


@@ -868,17 +936,18 @@ static PyObject *_wrap_wxGrid_DeleteRows(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxGrid * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxGrid * _arg0;

-    int  _arg1 = 0;
-    int  _arg2 = 1;
-    bool  _arg3 = (1);
-    char * _argc0 = 0;
-    int tempbool3;
+    int  _arg1 = (int ) 0;
+    int  _arg2 = (int ) 1;
+    bool  _arg3 = (bool ) TRUE;
+    PyObject * _argo0 = 0;
+    int tempbool3 = (int) TRUE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|iii:wxGrid_DeleteRows",&_argc0,&_arg1,&_arg2,&tempbool3)) 
+    if(!PyArg_ParseTuple(args,"O|iii:wxGrid_DeleteRows",&_argo0,&_arg1,&_arg2,&tempbool3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_DeleteRows. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_DeleteRows. Expected _wxGrid_p.");
         return NULL;
         }


@@ -897,13 +966,14 @@ static PyObject *_wrap_wxGrid_DeleteRows(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxGrid_EndBatch(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGrid * _arg0;
 static PyObject *_wrap_wxGrid_EndBatch(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGrid * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGrid_EndBatch",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGrid_EndBatch",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_EndBatch. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_EndBatch. Expected _wxGrid_p.");
         return NULL;
         }


@@ -923,13 +993,14 @@ static PyObject *_wrap_wxGrid_GetBatchCount(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxGrid * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxGrid * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGrid_GetBatchCount",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGrid_GetBatchCount",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetBatchCount. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetBatchCount. Expected _wxGrid_p.");
         return NULL;
         }


@@ -950,14 +1021,15 @@ static PyObject *_wrap_wxGrid_GetCell(PyObject *self, PyObject *args) {
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxGrid_GetCell",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxGrid_GetCell",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetCell. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetCell. Expected _wxGrid_p.");
         return NULL;
         }


@@ -967,8 +1039,13 @@ static PyObject *_wrap_wxGrid_GetCell(PyObject *self, PyObject *args) {
         _result = (wxGridCell *)wxGrid_GetCell(_arg0,_arg1,_arg2);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxGridCell *)wxGrid_GetCell(_arg0,_arg1,_arg2);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCell_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCell_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -979,13 +1056,14 @@ static PyObject *_wrap_wxGrid_GetCellAlignment(PyObject *self, PyObject *args) {
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxGrid_GetCellAlignment",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxGrid_GetCellAlignment",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetCellAlignment. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetCellAlignment. Expected _wxGrid_p.");
         return NULL;
         }


@@ -1004,13 +1082,14 @@ static PyObject *_wrap_wxGrid_GetDefCellAlignment(PyObject *self, PyObject *args
     PyObject * _resultobj;
     int  _result;
     wxGrid * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxGrid * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGrid_GetDefCellAlignment",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGrid_GetDefCellAlignment",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetDefCellAlignment. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetDefCellAlignment. Expected _wxGrid_p.");
         return NULL;
         }


@@ -1031,14 +1110,15 @@ static PyObject *_wrap_wxGrid_GetCellBackgroundColour(PyObject *self, PyObject *
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxGrid_GetCellBackgroundColour",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxGrid_GetCellBackgroundColour",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetCellBackgroundColour. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetCellBackgroundColour. Expected _wxGrid_p.");
         return NULL;
         }


@@ -1049,8 +1129,13 @@ static PyObject *_wrap_wxGrid_GetCellBackgroundColour(PyObject *self, PyObject *
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1059,14 +1144,15 @@ static PyObject *_wrap_wxGrid_GetDefCellBackgroundColour(PyObject *self, PyObjec
     PyObject * _resultobj;
     wxColour * _result;
     wxGrid * _arg0;
     PyObject * _resultobj;
     wxColour * _result;
     wxGrid * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGrid_GetDefCellBackgroundColour",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGrid_GetDefCellBackgroundColour",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetDefCellBackgroundColour. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetDefCellBackgroundColour. Expected _wxGrid_p.");
         return NULL;
         }


@@ -1077,8 +1163,13 @@ static PyObject *_wrap_wxGrid_GetDefCellBackgroundColour(PyObject *self, PyObjec
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1112,13 +1203,14 @@ static PyObject *_wrap_wxGrid_GetCells(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     PyObject * _result;
     wxGrid * _arg0;
     PyObject * _resultobj;
     PyObject * _result;
     wxGrid * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGrid_GetCells",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGrid_GetCells",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetCells. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetCells. Expected _wxGrid_p.");
         return NULL;
         }


@@ -1141,14 +1233,15 @@ static PyObject *_wrap_wxGrid_GetCellTextColour(PyObject *self, PyObject *args)
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxGrid_GetCellTextColour",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxGrid_GetCellTextColour",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetCellTextColour. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetCellTextColour. Expected _wxGrid_p.");
         return NULL;
         }


@@ -1159,8 +1252,13 @@ static PyObject *_wrap_wxGrid_GetCellTextColour(PyObject *self, PyObject *args)
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1169,14 +1267,15 @@ static PyObject *_wrap_wxGrid_GetDefCellTextColour(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     wxColour * _result;
     wxGrid * _arg0;
     PyObject * _resultobj;
     wxColour * _result;
     wxGrid * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGrid_GetDefCellTextColour",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGrid_GetDefCellTextColour",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetDefCellTextColour. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetDefCellTextColour. Expected _wxGrid_p.");
         return NULL;
         }


@@ -1187,8 +1286,13 @@ static PyObject *_wrap_wxGrid_GetDefCellTextColour(PyObject *self, PyObject *arg
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1199,14 +1303,15 @@ static PyObject *_wrap_wxGrid_GetCellTextFont(PyObject *self, PyObject *args) {
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxGrid_GetCellTextFont",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxGrid_GetCellTextFont",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetCellTextFont. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetCellTextFont. Expected _wxGrid_p.");
         return NULL;
         }


@@ -1217,8 +1322,13 @@ static PyObject *_wrap_wxGrid_GetCellTextFont(PyObject *self, PyObject *args) {
     _result = (wxFont *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxFont *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1227,14 +1337,15 @@ static PyObject *_wrap_wxGrid_GetDefCellTextFont(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxFont * _result;
     wxGrid * _arg0;
     PyObject * _resultobj;
     wxFont * _result;
     wxGrid * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGrid_GetDefCellTextFont",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGrid_GetDefCellTextFont",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetDefCellTextFont. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetDefCellTextFont. Expected _wxGrid_p.");
         return NULL;
         }


@@ -1245,8 +1356,13 @@ static PyObject *_wrap_wxGrid_GetDefCellTextFont(PyObject *self, PyObject *args)
     _result = (wxFont *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxFont *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1257,13 +1373,14 @@ static PyObject *_wrap_wxGrid_GetCellValue(PyObject *self, PyObject *args) {
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxGrid_GetCellValue",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxGrid_GetCellValue",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetCellValue. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetCellValue. Expected _wxGrid_p.");
         return NULL;
         }


@@ -1285,13 +1402,14 @@ static PyObject *_wrap_wxGrid_GetCols(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxGrid * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxGrid * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGrid_GetCols",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGrid_GetCols",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetCols. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetCols. Expected _wxGrid_p.");
         return NULL;
         }


@@ -1311,13 +1429,14 @@ static PyObject *_wrap_wxGrid_GetColumnWidth(PyObject *self, PyObject *args) {
     int  _result;
     wxGrid * _arg0;
     int  _arg1;
     int  _result;
     wxGrid * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxGrid_GetColumnWidth",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxGrid_GetColumnWidth",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetColumnWidth. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetColumnWidth. Expected _wxGrid_p.");
         return NULL;
         }


@@ -1336,14 +1455,15 @@ static PyObject *_wrap_wxGrid_GetCurrentRect(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRect * _result;
     wxGrid * _arg0;
     PyObject * _resultobj;
     wxRect * _result;
     wxGrid * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGrid_GetCurrentRect",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGrid_GetCurrentRect",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetCurrentRect. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetCurrentRect. Expected _wxGrid_p.");
         return NULL;
         }


@@ -1363,13 +1483,14 @@ static PyObject *_wrap_wxGrid_GetCursorColumn(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxGrid * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxGrid * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGrid_GetCursorColumn",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGrid_GetCursorColumn",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetCursorColumn. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetCursorColumn. Expected _wxGrid_p.");
         return NULL;
         }


@@ -1388,13 +1509,14 @@ static PyObject *_wrap_wxGrid_GetCursorRow(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxGrid * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxGrid * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGrid_GetCursorRow",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGrid_GetCursorRow",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetCursorRow. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetCursorRow. Expected _wxGrid_p.");
         return NULL;
         }


@@ -1413,13 +1535,14 @@ static PyObject *_wrap_wxGrid_GetEditable(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxGrid * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxGrid * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGrid_GetEditable",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGrid_GetEditable",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetEditable. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetEditable. Expected _wxGrid_p.");
         return NULL;
         }


@@ -1438,14 +1561,15 @@ static PyObject *_wrap_wxGrid_GetHorizScrollBar(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxScrollBar * _result;
     wxGrid * _arg0;
     PyObject * _resultobj;
     wxScrollBar * _result;
     wxGrid * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGrid_GetHorizScrollBar",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGrid_GetHorizScrollBar",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetHorizScrollBar. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetHorizScrollBar. Expected _wxGrid_p.");
         return NULL;
         }


@@ -1455,8 +1579,13 @@ static PyObject *_wrap_wxGrid_GetHorizScrollBar(PyObject *self, PyObject *args)
         _result = (wxScrollBar *)wxGrid_GetHorizScrollBar(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxScrollBar *)wxGrid_GetHorizScrollBar(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxScrollBar_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxScrollBar_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1466,13 +1595,14 @@ static PyObject *_wrap_wxGrid_GetLabelAlignment(PyObject *self, PyObject *args)
     int  _result;
     wxGrid * _arg0;
     int  _arg1;
     int  _result;
     wxGrid * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxGrid_GetLabelAlignment",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxGrid_GetLabelAlignment",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetLabelAlignment. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetLabelAlignment. Expected _wxGrid_p.");
         return NULL;
         }


@@ -1491,14 +1621,15 @@ static PyObject *_wrap_wxGrid_GetLabelBackgroundColour(PyObject *self, PyObject
     PyObject * _resultobj;
     wxColour * _result;
     wxGrid * _arg0;
     PyObject * _resultobj;
     wxColour * _result;
     wxGrid * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGrid_GetLabelBackgroundColour",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGrid_GetLabelBackgroundColour",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetLabelBackgroundColour. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetLabelBackgroundColour. Expected _wxGrid_p.");
         return NULL;
         }


@@ -1509,8 +1640,13 @@ static PyObject *_wrap_wxGrid_GetLabelBackgroundColour(PyObject *self, PyObject
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1520,13 +1656,14 @@ static PyObject *_wrap_wxGrid_GetLabelSize(PyObject *self, PyObject *args) {
     int  _result;
     wxGrid * _arg0;
     int  _arg1;
     int  _result;
     wxGrid * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxGrid_GetLabelSize",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxGrid_GetLabelSize",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetLabelSize. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetLabelSize. Expected _wxGrid_p.");
         return NULL;
         }


@@ -1545,14 +1682,15 @@ static PyObject *_wrap_wxGrid_GetLabelTextColour(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxColour * _result;
     wxGrid * _arg0;
     PyObject * _resultobj;
     wxColour * _result;
     wxGrid * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGrid_GetLabelTextColour",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGrid_GetLabelTextColour",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetLabelTextColour. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetLabelTextColour. Expected _wxGrid_p.");
         return NULL;
         }


@@ -1563,8 +1701,13 @@ static PyObject *_wrap_wxGrid_GetLabelTextColour(PyObject *self, PyObject *args)
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1573,14 +1716,15 @@ static PyObject *_wrap_wxGrid_GetLabelTextFont(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFont * _result;
     wxGrid * _arg0;
     PyObject * _resultobj;
     wxFont * _result;
     wxGrid * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGrid_GetLabelTextFont",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGrid_GetLabelTextFont",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetLabelTextFont. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetLabelTextFont. Expected _wxGrid_p.");
         return NULL;
         }


@@ -1591,8 +1735,13 @@ static PyObject *_wrap_wxGrid_GetLabelTextFont(PyObject *self, PyObject *args) {
     _result = (wxFont *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
     _result = (wxFont *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1603,13 +1752,14 @@ static PyObject *_wrap_wxGrid_GetLabelValue(PyObject *self, PyObject *args) {
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxGrid_GetLabelValue",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxGrid_GetLabelValue",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetLabelValue. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetLabelValue. Expected _wxGrid_p.");
         return NULL;
         }


@@ -1632,13 +1782,14 @@ static PyObject *_wrap_wxGrid_GetRowHeight(PyObject *self, PyObject *args) {
     int  _result;
     wxGrid * _arg0;
     int  _arg1;
     int  _result;
     wxGrid * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxGrid_GetRowHeight",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxGrid_GetRowHeight",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetRowHeight. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetRowHeight. Expected _wxGrid_p.");
         return NULL;
         }


@@ -1657,13 +1808,14 @@ static PyObject *_wrap_wxGrid_GetRows(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxGrid * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxGrid * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGrid_GetRows",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGrid_GetRows",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetRows. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetRows. Expected _wxGrid_p.");
         return NULL;
         }


@@ -1682,13 +1834,14 @@ static PyObject *_wrap_wxGrid_GetScrollPosX(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxGrid * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxGrid * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGrid_GetScrollPosX",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGrid_GetScrollPosX",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetScrollPosX. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetScrollPosX. Expected _wxGrid_p.");
         return NULL;
         }


@@ -1707,13 +1860,14 @@ static PyObject *_wrap_wxGrid_GetScrollPosY(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxGrid * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxGrid * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGrid_GetScrollPosY",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGrid_GetScrollPosY",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetScrollPosY. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetScrollPosY. Expected _wxGrid_p.");
         return NULL;
         }


@@ -1732,14 +1886,15 @@ static PyObject *_wrap_wxGrid_GetTextItem(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTextCtrl * _result;
     wxGrid * _arg0;
     PyObject * _resultobj;
     wxTextCtrl * _result;
     wxGrid * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGrid_GetTextItem",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGrid_GetTextItem",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetTextItem. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetTextItem. Expected _wxGrid_p.");
         return NULL;
         }


@@ -1749,8 +1904,13 @@ static PyObject *_wrap_wxGrid_GetTextItem(PyObject *self, PyObject *args) {
         _result = (wxTextCtrl *)wxGrid_GetTextItem(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxTextCtrl *)wxGrid_GetTextItem(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxTextCtrl_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxTextCtrl_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1759,14 +1919,15 @@ static PyObject *_wrap_wxGrid_GetVertScrollBar(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxScrollBar * _result;
     wxGrid * _arg0;
     PyObject * _resultobj;
     wxScrollBar * _result;
     wxGrid * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGrid_GetVertScrollBar",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGrid_GetVertScrollBar",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetVertScrollBar. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetVertScrollBar. Expected _wxGrid_p.");
         return NULL;
         }


@@ -1776,8 +1937,13 @@ static PyObject *_wrap_wxGrid_GetVertScrollBar(PyObject *self, PyObject *args) {
         _result = (wxScrollBar *)wxGrid_GetVertScrollBar(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxScrollBar *)wxGrid_GetVertScrollBar(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxScrollBar_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxScrollBar_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1786,17 +1952,18 @@ static PyObject *_wrap_wxGrid_InsertCols(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxGrid * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxGrid * _arg0;

-    int  _arg1 = 0;
-    int  _arg2 = 1;
-    bool  _arg3 = (1);
-    char * _argc0 = 0;
-    int tempbool3;
+    int  _arg1 = (int ) 0;
+    int  _arg2 = (int ) 1;
+    bool  _arg3 = (bool ) TRUE;
+    PyObject * _argo0 = 0;
+    int tempbool3 = (int) TRUE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|iii:wxGrid_InsertCols",&_argc0,&_arg1,&_arg2,&tempbool3)) 
+    if(!PyArg_ParseTuple(args,"O|iii:wxGrid_InsertCols",&_argo0,&_arg1,&_arg2,&tempbool3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_InsertCols. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_InsertCols. Expected _wxGrid_p.");
         return NULL;
         }


@@ -1816,17 +1983,18 @@ static PyObject *_wrap_wxGrid_InsertRows(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxGrid * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxGrid * _arg0;

-    int  _arg1 = 0;
-    int  _arg2 = 1;
-    bool  _arg3 = (1);
-    char * _argc0 = 0;
-    int tempbool3;
+    int  _arg1 = (int ) 0;
+    int  _arg2 = (int ) 1;
+    bool  _arg3 = (bool ) TRUE;
+    PyObject * _argo0 = 0;
+    int tempbool3 = (int) TRUE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|iii:wxGrid_InsertRows",&_argc0,&_arg1,&_arg2,&tempbool3)) 
+    if(!PyArg_ParseTuple(args,"O|iii:wxGrid_InsertRows",&_argo0,&_arg1,&_arg2,&tempbool3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_InsertRows. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_InsertRows. Expected _wxGrid_p.");
         return NULL;
         }


@@ -1846,14 +2014,15 @@ static PyObject *_wrap_wxGrid_OnActivate(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGrid * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxGrid * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxGrid_OnActivate",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxGrid_OnActivate",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_OnActivate. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_OnActivate. Expected _wxGrid_p.");
         return NULL;
         }


@@ -1876,13 +2045,14 @@ static PyObject *_wrap_wxGrid_SetCellAlignment(PyObject *self, PyObject *args) {
     int  _arg1;
     int  _arg2;
     int  _arg3;
     int  _arg1;
     int  _arg2;
     int  _arg3;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siii:wxGrid_SetCellAlignment",&_argc0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"Oiii:wxGrid_SetCellAlignment",&_argo0,&_arg1,&_arg2,&_arg3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetCellAlignment. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetCellAlignment. Expected _wxGrid_p.");
         return NULL;
         }


@@ -1902,13 +2072,14 @@ static PyObject *_wrap_wxGrid_SetDefCellAlignment(PyObject *self, PyObject *args
     PyObject * _resultobj;
     wxGrid * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxGrid * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxGrid_SetDefCellAlignment",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxGrid_SetDefCellAlignment",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetDefCellAlignment. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetDefCellAlignment. Expected _wxGrid_p.");
         return NULL;
         }


@@ -1930,20 +2101,22 @@ static PyObject *_wrap_wxGrid_SetCellBackgroundColour(PyObject *self, PyObject *
     wxColour * _arg1;
     int  _arg2;
     int  _arg3;
     wxColour * _arg1;
     int  _arg2;
     int  _arg3;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ssii:wxGrid_SetCellBackgroundColour",&_argc0,&_argc1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"OOii:wxGrid_SetCellBackgroundColour",&_argo0,&_argo1,&_arg2,&_arg3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetCellBackgroundColour. Expected _wxGrid_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetCellBackgroundColour. Expected _wxGrid_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxColour_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGrid_SetCellBackgroundColour. Expected _wxColour_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGrid_SetCellBackgroundColour. Expected _wxColour_p.");
         return NULL;
         }


@@ -1963,20 +2136,22 @@ static PyObject *_wrap_wxGrid_SetDefCellBackgroundColour(PyObject *self, PyObjec
     PyObject * _resultobj;
     wxGrid * _arg0;
     wxColour * _arg1;
     PyObject * _resultobj;
     wxGrid * _arg0;
     wxColour * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxGrid_SetDefCellBackgroundColour",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxGrid_SetDefCellBackgroundColour",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetDefCellBackgroundColour. Expected _wxGrid_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetDefCellBackgroundColour. Expected _wxGrid_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxColour_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGrid_SetDefCellBackgroundColour. Expected _wxColour_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGrid_SetDefCellBackgroundColour. Expected _wxColour_p.");
         return NULL;
         }


@@ -1998,20 +2173,22 @@ static PyObject *_wrap_wxGrid_SetCellTextColour(PyObject *self, PyObject *args)
     wxColour * _arg1;
     int  _arg2;
     int  _arg3;
     wxColour * _arg1;
     int  _arg2;
     int  _arg3;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ssii:wxGrid_SetCellTextColour",&_argc0,&_argc1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"OOii:wxGrid_SetCellTextColour",&_argo0,&_argo1,&_arg2,&_arg3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetCellTextColour. Expected _wxGrid_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetCellTextColour. Expected _wxGrid_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxColour_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGrid_SetCellTextColour. Expected _wxColour_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGrid_SetCellTextColour. Expected _wxColour_p.");
         return NULL;
         }


@@ -2031,20 +2208,22 @@ static PyObject *_wrap_wxGrid_SetDefCellTextColour(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     wxGrid * _arg0;
     wxColour * _arg1;
     PyObject * _resultobj;
     wxGrid * _arg0;
     wxColour * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxGrid_SetDefCellTextColour",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxGrid_SetDefCellTextColour",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetDefCellTextColour. Expected _wxGrid_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetDefCellTextColour. Expected _wxGrid_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxColour_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGrid_SetDefCellTextColour. Expected _wxColour_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGrid_SetDefCellTextColour. Expected _wxColour_p.");
         return NULL;
         }


@@ -2066,20 +2245,22 @@ static PyObject *_wrap_wxGrid_SetCellTextFont(PyObject *self, PyObject *args) {
     wxFont * _arg1;
     int  _arg2;
     int  _arg3;
     wxFont * _arg1;
     int  _arg2;
     int  _arg3;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ssii:wxGrid_SetCellTextFont",&_argc0,&_argc1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"OOii:wxGrid_SetCellTextFont",&_argo0,&_argo1,&_arg2,&_arg3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetCellTextFont. Expected _wxGrid_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetCellTextFont. Expected _wxGrid_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxFont_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxFont_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGrid_SetCellTextFont. Expected _wxFont_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGrid_SetCellTextFont. Expected _wxFont_p.");
         return NULL;
         }


@@ -2099,20 +2280,22 @@ static PyObject *_wrap_wxGrid_SetDefCellTextFont(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxGrid * _arg0;
     wxFont * _arg1;
     PyObject * _resultobj;
     wxGrid * _arg0;
     wxFont * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxGrid_SetDefCellTextFont",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxGrid_SetDefCellTextFont",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetDefCellTextFont. Expected _wxGrid_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetDefCellTextFont. Expected _wxGrid_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxFont_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxFont_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGrid_SetDefCellTextFont. Expected _wxFont_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGrid_SetDefCellTextFont. Expected _wxFont_p.");
         return NULL;
         }


@@ -2134,14 +2317,15 @@ static PyObject *_wrap_wxGrid_SetCellValue(PyObject *self, PyObject *args) {
     wxString * _arg1;
     int  _arg2;
     int  _arg3;
     wxString * _arg1;
     int  _arg2;
     int  _arg3;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sOii:wxGrid_SetCellValue",&_argc0,&_obj1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"OOii:wxGrid_SetCellValue",&_argo0,&_obj1,&_arg2,&_arg3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetCellValue. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetCellValue. Expected _wxGrid_p.");
         return NULL;
         }


@@ -2173,13 +2357,14 @@ static PyObject *_wrap_wxGrid_SetColumnWidth(PyObject *self, PyObject *args) {
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxGrid_SetColumnWidth",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxGrid_SetColumnWidth",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetColumnWidth. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetColumnWidth. Expected _wxGrid_p.");
         return NULL;
         }


@@ -2199,20 +2384,22 @@ static PyObject *_wrap_wxGrid_SetDividerPen(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGrid * _arg0;
     wxPen * _arg1;
     PyObject * _resultobj;
     wxGrid * _arg0;
     wxPen * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxGrid_SetDividerPen",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxGrid_SetDividerPen",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetDividerPen. Expected _wxGrid_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetDividerPen. Expected _wxGrid_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPen_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPen_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGrid_SetDividerPen. Expected _wxPen_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGrid_SetDividerPen. Expected _wxPen_p.");
         return NULL;
         }


@@ -2232,14 +2419,15 @@ static PyObject *_wrap_wxGrid_SetEditable(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGrid * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxGrid * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxGrid_SetEditable",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxGrid_SetEditable",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetEditable. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetEditable. Expected _wxGrid_p.");
         return NULL;
         }


@@ -2261,13 +2449,14 @@ static PyObject *_wrap_wxGrid_SetGridCursor(PyObject *self, PyObject *args) {
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxGrid_SetGridCursor",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxGrid_SetGridCursor",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetGridCursor. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetGridCursor. Expected _wxGrid_p.");
         return NULL;
         }


@@ -2288,13 +2477,14 @@ static PyObject *_wrap_wxGrid_SetLabelAlignment(PyObject *self, PyObject *args)
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxGrid_SetLabelAlignment",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxGrid_SetLabelAlignment",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetLabelAlignment. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetLabelAlignment. Expected _wxGrid_p.");
         return NULL;
         }


@@ -2314,20 +2504,22 @@ static PyObject *_wrap_wxGrid_SetLabelBackgroundColour(PyObject *self, PyObject
     PyObject * _resultobj;
     wxGrid * _arg0;
     wxColour * _arg1;
     PyObject * _resultobj;
     wxGrid * _arg0;
     wxColour * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxGrid_SetLabelBackgroundColour",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxGrid_SetLabelBackgroundColour",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetLabelBackgroundColour. Expected _wxGrid_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetLabelBackgroundColour. Expected _wxGrid_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxColour_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGrid_SetLabelBackgroundColour. Expected _wxColour_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGrid_SetLabelBackgroundColour. Expected _wxColour_p.");
         return NULL;
         }


@@ -2348,13 +2540,14 @@ static PyObject *_wrap_wxGrid_SetLabelSize(PyObject *self, PyObject *args) {
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxGrid_SetLabelSize",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxGrid_SetLabelSize",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetLabelSize. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetLabelSize. Expected _wxGrid_p.");
         return NULL;
         }


@@ -2374,20 +2567,22 @@ static PyObject *_wrap_wxGrid_SetLabelTextColour(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxGrid * _arg0;
     wxColour * _arg1;
     PyObject * _resultobj;
     wxGrid * _arg0;
     wxColour * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxGrid_SetLabelTextColour",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxGrid_SetLabelTextColour",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetLabelTextColour. Expected _wxGrid_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetLabelTextColour. Expected _wxGrid_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxColour_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGrid_SetLabelTextColour. Expected _wxColour_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGrid_SetLabelTextColour. Expected _wxColour_p.");
         return NULL;
         }


@@ -2407,20 +2602,22 @@ static PyObject *_wrap_wxGrid_SetLabelTextFont(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGrid * _arg0;
     wxFont * _arg1;
     PyObject * _resultobj;
     wxGrid * _arg0;
     wxFont * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxGrid_SetLabelTextFont",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxGrid_SetLabelTextFont",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetLabelTextFont. Expected _wxGrid_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetLabelTextFont. Expected _wxGrid_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxFont_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxFont_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGrid_SetLabelTextFont. Expected _wxFont_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGrid_SetLabelTextFont. Expected _wxFont_p.");
         return NULL;
         }


@@ -2442,14 +2639,15 @@ static PyObject *_wrap_wxGrid_SetLabelValue(PyObject *self, PyObject *args) {
     int  _arg1;
     wxString * _arg2;
     int  _arg3;
     int  _arg1;
     wxString * _arg2;
     int  _arg3;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
 
     self = self;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siOi:wxGrid_SetLabelValue",&_argc0,&_arg1,&_obj2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"OiOi:wxGrid_SetLabelValue",&_argo0,&_arg1,&_obj2,&_arg3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetLabelValue. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetLabelValue. Expected _wxGrid_p.");
         return NULL;
         }


@@ -2481,13 +2679,14 @@ static PyObject *_wrap_wxGrid_SetRowHeight(PyObject *self, PyObject *args) {
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxGrid_SetRowHeight",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxGrid_SetRowHeight",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetRowHeight. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetRowHeight. Expected _wxGrid_p.");
         return NULL;
         }


@@ -2506,13 +2705,14 @@ static PyObject *_wrap_wxGrid_SetRowHeight(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxGrid_UpdateDimensions(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGrid * _arg0;
 static PyObject *_wrap_wxGrid_UpdateDimensions(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGrid * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGrid_UpdateDimensions",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGrid_UpdateDimensions",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_UpdateDimensions. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_UpdateDimensions. Expected _wxGrid_p.");
         return NULL;
         }


@@ -2532,13 +2732,14 @@ static PyObject *_wrap_wxGrid_GetEditInPlace(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxGrid * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxGrid * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGrid_GetEditInPlace",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGrid_GetEditInPlace",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetEditInPlace. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetEditInPlace. Expected _wxGrid_p.");
         return NULL;
         }


@@ -2556,14 +2757,15 @@ static PyObject *_wrap_wxGrid_GetEditInPlace(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxGrid_SetEditInPlace(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGrid * _arg0;
 static PyObject *_wrap_wxGrid_SetEditInPlace(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGrid * _arg0;

-    int  _arg1 = (1);
-    char * _argc0 = 0;
+    int  _arg1 = (int ) TRUE;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxGrid_SetEditInPlace",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"O|i:wxGrid_SetEditInPlace",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetEditInPlace. Expected _wxGrid_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetEditInPlace. Expected _wxGrid_p.");
         return NULL;
         }


@@ -2592,13 +2794,14 @@ static PyObject *_wrap_wxGridEvent_m_row_set(PyObject *self, PyObject *args) {
     int  _result;
     wxGridEvent * _arg0;
     int  _arg1;
     int  _result;
     wxGridEvent * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxGridEvent_m_row_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxGridEvent_m_row_set",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_row_set. Expected _wxGridEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_row_set. Expected _wxGridEvent_p.");
         return NULL;
         }


@@ -2617,13 +2820,14 @@ static PyObject *_wrap_wxGridEvent_m_row_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxGridEvent * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxGridEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGridEvent_m_row_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGridEvent_m_row_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_row_get. Expected _wxGridEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_row_get. Expected _wxGridEvent_p.");
         return NULL;
         }


@@ -2643,13 +2847,14 @@ static PyObject *_wrap_wxGridEvent_m_col_set(PyObject *self, PyObject *args) {
     int  _result;
     wxGridEvent * _arg0;
     int  _arg1;
     int  _result;
     wxGridEvent * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxGridEvent_m_col_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxGridEvent_m_col_set",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_col_set. Expected _wxGridEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_col_set. Expected _wxGridEvent_p.");
         return NULL;
         }


@@ -2668,13 +2873,14 @@ static PyObject *_wrap_wxGridEvent_m_col_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxGridEvent * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxGridEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGridEvent_m_col_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGridEvent_m_col_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_col_get. Expected _wxGridEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_col_get. Expected _wxGridEvent_p.");
         return NULL;
         }


@@ -2694,13 +2900,14 @@ static PyObject *_wrap_wxGridEvent_m_x_set(PyObject *self, PyObject *args) {
     int  _result;
     wxGridEvent * _arg0;
     int  _arg1;
     int  _result;
     wxGridEvent * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxGridEvent_m_x_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxGridEvent_m_x_set",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_x_set. Expected _wxGridEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_x_set. Expected _wxGridEvent_p.");
         return NULL;
         }


@@ -2719,13 +2926,14 @@ static PyObject *_wrap_wxGridEvent_m_x_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxGridEvent * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxGridEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGridEvent_m_x_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGridEvent_m_x_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_x_get. Expected _wxGridEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_x_get. Expected _wxGridEvent_p.");
         return NULL;
         }


@@ -2745,13 +2953,14 @@ static PyObject *_wrap_wxGridEvent_m_y_set(PyObject *self, PyObject *args) {
     int  _result;
     wxGridEvent * _arg0;
     int  _arg1;
     int  _result;
     wxGridEvent * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxGridEvent_m_y_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxGridEvent_m_y_set",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_y_set. Expected _wxGridEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_y_set. Expected _wxGridEvent_p.");
         return NULL;
         }


@@ -2770,13 +2979,14 @@ static PyObject *_wrap_wxGridEvent_m_y_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxGridEvent * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxGridEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGridEvent_m_y_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGridEvent_m_y_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_y_get. Expected _wxGridEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_y_get. Expected _wxGridEvent_p.");
         return NULL;
         }


@@ -2796,14 +3006,15 @@ static PyObject *_wrap_wxGridEvent_m_control_set(PyObject *self, PyObject *args)
     bool  _result;
     wxGridEvent * _arg0;
     bool  _arg1;
     bool  _result;
     wxGridEvent * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxGridEvent_m_control_set",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxGridEvent_m_control_set",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_control_set. Expected _wxGridEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_control_set. Expected _wxGridEvent_p.");
         return NULL;
         }


@@ -2823,13 +3034,14 @@ static PyObject *_wrap_wxGridEvent_m_control_get(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     bool  _result;
     wxGridEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxGridEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGridEvent_m_control_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGridEvent_m_control_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_control_get. Expected _wxGridEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_control_get. Expected _wxGridEvent_p.");
         return NULL;
         }


@@ -2849,14 +3061,15 @@ static PyObject *_wrap_wxGridEvent_m_shift_set(PyObject *self, PyObject *args) {
     bool  _result;
     wxGridEvent * _arg0;
     bool  _arg1;
     bool  _result;
     wxGridEvent * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxGridEvent_m_shift_set",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxGridEvent_m_shift_set",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_shift_set. Expected _wxGridEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_shift_set. Expected _wxGridEvent_p.");
         return NULL;
         }


@@ -2876,13 +3089,14 @@ static PyObject *_wrap_wxGridEvent_m_shift_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxGridEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxGridEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGridEvent_m_shift_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGridEvent_m_shift_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_shift_get. Expected _wxGridEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_shift_get. Expected _wxGridEvent_p.");
         return NULL;
         }


@@ -2902,21 +3116,23 @@ static PyObject *_wrap_wxGridEvent_m_cell_set(PyObject *self, PyObject *args) {
     wxGridCell * _result;
     wxGridEvent * _arg0;
     wxGridCell * _arg1;
     wxGridCell * _result;
     wxGridEvent * _arg0;
     wxGridCell * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxGridEvent_m_cell_set",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxGridEvent_m_cell_set",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_cell_set. Expected _wxGridEvent_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_cell_set. Expected _wxGridEvent_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxGridCell_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxGridCell_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGridEvent_m_cell_set. Expected _wxGridCell_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGridEvent_m_cell_set. Expected _wxGridCell_p.");
         return NULL;
         }


@@ -2926,8 +3142,13 @@ static PyObject *_wrap_wxGridEvent_m_cell_set(PyObject *self, PyObject *args) {
         _result = (wxGridCell *)wxGridEvent_m_cell_set(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxGridCell *)wxGridEvent_m_cell_set(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCell_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCell_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -2936,14 +3157,15 @@ static PyObject *_wrap_wxGridEvent_m_cell_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGridCell * _result;
     wxGridEvent * _arg0;
     PyObject * _resultobj;
     wxGridCell * _result;
     wxGridEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGridEvent_m_cell_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGridEvent_m_cell_get",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_cell_get. Expected _wxGridEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_cell_get. Expected _wxGridEvent_p.");
         return NULL;
         }


@@ -2953,8 +3175,13 @@ static PyObject *_wrap_wxGridEvent_m_cell_get(PyObject *self, PyObject *args) {
         _result = (wxGridCell *)wxGridEvent_m_cell_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxGridCell *)wxGridEvent_m_cell_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCell_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCell_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -2963,13 +3190,14 @@ static PyObject *_wrap_wxGridEvent_GetRow(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxGridEvent * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxGridEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGridEvent_GetRow",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGridEvent_GetRow",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_GetRow. Expected _wxGridEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_GetRow. Expected _wxGridEvent_p.");
         return NULL;
         }


@@ -2988,13 +3216,14 @@ static PyObject *_wrap_wxGridEvent_GetCol(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxGridEvent * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxGridEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGridEvent_GetCol",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGridEvent_GetCol",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_GetCol. Expected _wxGridEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_GetCol. Expected _wxGridEvent_p.");
         return NULL;
         }


@@ -3013,14 +3242,15 @@ static PyObject *_wrap_wxGridEvent_GetPosition(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPoint * _result;
     wxGridEvent * _arg0;
     PyObject * _resultobj;
     wxPoint * _result;
     wxGridEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGridEvent_GetPosition",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGridEvent_GetPosition",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_GetPosition. Expected _wxGridEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_GetPosition. Expected _wxGridEvent_p.");
         return NULL;
         }


@@ -3040,13 +3270,14 @@ static PyObject *_wrap_wxGridEvent_ControlDown(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxGridEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxGridEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGridEvent_ControlDown",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGridEvent_ControlDown",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_ControlDown. Expected _wxGridEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_ControlDown. Expected _wxGridEvent_p.");
         return NULL;
         }


@@ -3065,13 +3296,14 @@ static PyObject *_wrap_wxGridEvent_ShiftDown(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxGridEvent * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxGridEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGridEvent_ShiftDown",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGridEvent_ShiftDown",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_ShiftDown. Expected _wxGridEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_ShiftDown. Expected _wxGridEvent_p.");
         return NULL;
         }


@@ -3090,14 +3322,15 @@ static PyObject *_wrap_wxGridEvent_GetCell(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxGridCell * _result;
     wxGridEvent * _arg0;
     PyObject * _resultobj;
     wxGridCell * _result;
     wxGridEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxGridEvent_GetCell",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxGridEvent_GetCell",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_GetCell. Expected _wxGridEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_GetCell. Expected _wxGridEvent_p.");
         return NULL;
         }


@@ -3107,8 +3340,13 @@ static PyObject *_wrap_wxGridEvent_GetCell(PyObject *self, PyObject *args) {
         _result = (wxGridCell *)wxGridEvent_GetCell(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxGridCell *)wxGridEvent_GetCell(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCell_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCell_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3141,13 +3379,14 @@ static PyObject *_wrap_wxNotebookEvent_GetSelection(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     int  _result;
     wxNotebookEvent * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxNotebookEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxNotebookEvent_GetSelection",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxNotebookEvent_GetSelection",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxNotebookEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebookEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebookEvent_GetSelection. Expected _wxNotebookEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebookEvent_GetSelection. Expected _wxNotebookEvent_p.");
         return NULL;
         }


@@ -3166,13 +3405,14 @@ static PyObject *_wrap_wxNotebookEvent_GetOldSelection(PyObject *self, PyObject
     PyObject * _resultobj;
     int  _result;
     wxNotebookEvent * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxNotebookEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxNotebookEvent_GetOldSelection",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxNotebookEvent_GetOldSelection",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxNotebookEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebookEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebookEvent_GetOldSelection. Expected _wxNotebookEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebookEvent_GetOldSelection. Expected _wxNotebookEvent_p.");
         return NULL;
         }


@@ -3191,13 +3431,14 @@ static PyObject *_wrap_wxNotebookEvent_SetOldSelection(PyObject *self, PyObject
     PyObject * _resultobj;
     wxNotebookEvent * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxNotebookEvent * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxNotebookEvent_SetOldSelection",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxNotebookEvent_SetOldSelection",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxNotebookEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebookEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebookEvent_SetOldSelection. Expected _wxNotebookEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebookEvent_SetOldSelection. Expected _wxNotebookEvent_p.");
         return NULL;
         }


@@ -3217,13 +3458,14 @@ static PyObject *_wrap_wxNotebookEvent_SetSelection(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     wxNotebookEvent * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxNotebookEvent * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxNotebookEvent_SetSelection",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxNotebookEvent_SetSelection",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxNotebookEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebookEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebookEvent_SetSelection. Expected _wxNotebookEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebookEvent_SetSelection. Expected _wxNotebookEvent_p.");
         return NULL;
         }


@@ -3268,32 +3510,35 @@ static PyObject *_wrap_new_wxNotebook(PyObject *self, PyObject *args) {
     wxNotebook * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxNotebook * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;

-    wxPoint * _arg2 = &wxPyDefaultPosition;
-    wxSize * _arg3 = &wxPyDefaultSize;
-    long  _arg4 = 0;
-    char * _arg5 = "notebook";
-    char * _argc0 = 0;
-    char * _argc2 = 0;
-    char * _argc3 = 0;
+    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    long  _arg4 = (long ) 0;
+    char * _arg5 = (char *) "notebook";
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;
+    PyObject * _argo3 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si|ssls:new_wxNotebook",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTuple(args,"Oi|OOls:new_wxNotebook",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxNotebook. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxNotebook. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxNotebook. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxNotebook. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxSize_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxNotebook. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxNotebook. Expected _wxSize_p.");
         return NULL;
         }


@@ -3303,8 +3548,13 @@ static PyObject *_wrap_new_wxNotebook(PyObject *self, PyObject *args) {
         _result = (wxNotebook *)new_wxNotebook(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxNotebook *)new_wxNotebook(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxNotebook_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxNotebook_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3313,13 +3563,14 @@ static PyObject *_wrap_wxNotebook_GetPageCount(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxNotebook * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxNotebook * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxNotebook_GetPageCount",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxNotebook_GetPageCount",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxNotebook_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_GetPageCount. Expected _wxNotebook_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_GetPageCount. Expected _wxNotebook_p.");
         return NULL;
         }


@@ -3339,13 +3590,14 @@ static PyObject *_wrap_wxNotebook_SetSelection(PyObject *self, PyObject *args) {
     int  _result;
     wxNotebook * _arg0;
     int  _arg1;
     int  _result;
     wxNotebook * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxNotebook_SetSelection",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxNotebook_SetSelection",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxNotebook_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_SetSelection. Expected _wxNotebook_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_SetSelection. Expected _wxNotebook_p.");
         return NULL;
         }


@@ -3363,15 +3615,16 @@ static PyObject *_wrap_wxNotebook_SetSelection(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxNotebook_AdvanceSelection(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxNotebook * _arg0;
 static PyObject *_wrap_wxNotebook_AdvanceSelection(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxNotebook * _arg0;

-    bool  _arg1 = (1);
-    char * _argc0 = 0;
-    int tempbool1;
+    bool  _arg1 = (bool ) TRUE;
+    PyObject * _argo0 = 0;
+    int tempbool1 = (int) TRUE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxNotebook_AdvanceSelection",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"O|i:wxNotebook_AdvanceSelection",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxNotebook_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_AdvanceSelection. Expected _wxNotebook_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_AdvanceSelection. Expected _wxNotebook_p.");
         return NULL;
         }


@@ -3392,13 +3645,14 @@ static PyObject *_wrap_wxNotebook_GetSelection(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxNotebook * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxNotebook * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxNotebook_GetSelection",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxNotebook_GetSelection",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxNotebook_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_GetSelection. Expected _wxNotebook_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_GetSelection. Expected _wxNotebook_p.");
         return NULL;
         }


@@ -3419,14 +3673,15 @@ static PyObject *_wrap_wxNotebook_SetPageText(PyObject *self, PyObject *args) {
     wxNotebook * _arg0;
     int  _arg1;
     wxString * _arg2;
     wxNotebook * _arg0;
     int  _arg1;
     wxString * _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
 
     self = self;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siO:wxNotebook_SetPageText",&_argc0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"OiO:wxNotebook_SetPageText",&_argo0,&_arg1,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxNotebook_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_SetPageText. Expected _wxNotebook_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_SetPageText. Expected _wxNotebook_p.");
         return NULL;
         }


@@ -3457,13 +3712,14 @@ static PyObject *_wrap_wxNotebook_GetPageText(PyObject *self, PyObject *args) {
     wxString * _result;
     wxNotebook * _arg0;
     int  _arg1;
     wxString * _result;
     wxNotebook * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxNotebook_GetPageText",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxNotebook_GetPageText",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxNotebook_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_GetPageText. Expected _wxNotebook_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_GetPageText. Expected _wxNotebook_p.");
         return NULL;
         }


@@ -3487,20 +3743,22 @@ static PyObject *_wrap_wxNotebook_SetImageList(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxNotebook * _arg0;
     wxImageList * _arg1;
     PyObject * _resultobj;
     wxNotebook * _arg0;
     wxImageList * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxNotebook_SetImageList",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxNotebook_SetImageList",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxNotebook_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_SetImageList. Expected _wxNotebook_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_SetImageList. Expected _wxNotebook_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxImageList_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxImageList_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxNotebook_SetImageList. Expected _wxImageList_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxNotebook_SetImageList. Expected _wxImageList_p.");
         return NULL;
         }


@@ -3520,14 +3778,15 @@ static PyObject *_wrap_wxNotebook_GetImageList(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxImageList * _result;
     wxNotebook * _arg0;
     PyObject * _resultobj;
     wxImageList * _result;
     wxNotebook * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxNotebook_GetImageList",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxNotebook_GetImageList",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxNotebook_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_GetImageList. Expected _wxNotebook_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_GetImageList. Expected _wxNotebook_p.");
         return NULL;
         }


@@ -3537,8 +3796,13 @@ static PyObject *_wrap_wxNotebook_GetImageList(PyObject *self, PyObject *args) {
         _result = (wxImageList *)wxNotebook_GetImageList(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxImageList *)wxNotebook_GetImageList(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxImageList_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxImageList_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3548,13 +3812,14 @@ static PyObject *_wrap_wxNotebook_GetPageImage(PyObject *self, PyObject *args) {
     int  _result;
     wxNotebook * _arg0;
     int  _arg1;
     int  _result;
     wxNotebook * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxNotebook_GetPageImage",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxNotebook_GetPageImage",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxNotebook_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_GetPageImage. Expected _wxNotebook_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_GetPageImage. Expected _wxNotebook_p.");
         return NULL;
         }


@@ -3575,13 +3840,14 @@ static PyObject *_wrap_wxNotebook_SetPageImage(PyObject *self, PyObject *args) {
     wxNotebook * _arg0;
     int  _arg1;
     int  _arg2;
     wxNotebook * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxNotebook_SetPageImage",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxNotebook_SetPageImage",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxNotebook_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_SetPageImage. Expected _wxNotebook_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_SetPageImage. Expected _wxNotebook_p.");
         return NULL;
         }


@@ -3600,13 +3866,14 @@ static PyObject *_wrap_wxNotebook_GetRowCount(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxNotebook * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxNotebook * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxNotebook_GetRowCount",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxNotebook_GetRowCount",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxNotebook_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_GetRowCount. Expected _wxNotebook_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_GetRowCount. Expected _wxNotebook_p.");
         return NULL;
         }


@@ -3626,13 +3893,14 @@ static PyObject *_wrap_wxNotebook_DeletePage(PyObject *self, PyObject *args) {
     bool  _result;
     wxNotebook * _arg0;
     int  _arg1;
     bool  _result;
     wxNotebook * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxNotebook_DeletePage",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxNotebook_DeletePage",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxNotebook_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_DeletePage. Expected _wxNotebook_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_DeletePage. Expected _wxNotebook_p.");
         return NULL;
         }


@@ -3652,13 +3920,14 @@ static PyObject *_wrap_wxNotebook_RemovePage(PyObject *self, PyObject *args) {
     bool  _result;
     wxNotebook * _arg0;
     int  _arg1;
     bool  _result;
     wxNotebook * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxNotebook_RemovePage",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxNotebook_RemovePage",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxNotebook_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_RemovePage. Expected _wxNotebook_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_RemovePage. Expected _wxNotebook_p.");
         return NULL;
         }


@@ -3677,13 +3946,14 @@ static PyObject *_wrap_wxNotebook_DeleteAllPages(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     bool  _result;
     wxNotebook * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxNotebook * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxNotebook_DeleteAllPages",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxNotebook_DeleteAllPages",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxNotebook_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_DeleteAllPages. Expected _wxNotebook_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_DeleteAllPages. Expected _wxNotebook_p.");
         return NULL;
         }


@@ -3704,23 +3974,25 @@ static PyObject *_wrap_wxNotebook_AddPage(PyObject *self, PyObject *args) {
     wxNotebook * _arg0;
     wxWindow * _arg1;
     wxString * _arg2;
     wxNotebook * _arg0;
     wxWindow * _arg1;
     wxString * _arg2;

-    int  _arg3 = (0);
-    int  _arg4 = -1;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    int  _arg3 = (int ) FALSE;
+    int  _arg4 = (int ) -1;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     PyObject * _obj2 = 0;
 
     self = self;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ssO|ii:wxNotebook_AddPage",&_argc0,&_argc1,&_obj2,&_arg3,&_arg4)) 
+    if(!PyArg_ParseTuple(args,"OOO|ii:wxNotebook_AddPage",&_argo0,&_argo1,&_obj2,&_arg3,&_arg4)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxNotebook_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_AddPage. Expected _wxNotebook_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_AddPage. Expected _wxNotebook_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxNotebook_AddPage. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxNotebook_AddPage. Expected _wxWindow_p.");
         return NULL;
         }


@@ -3753,24 +4025,26 @@ static PyObject *_wrap_wxNotebook_InsertPage(PyObject *self, PyObject *args) {
     int  _arg1;
     wxWindow * _arg2;
     wxString * _arg3;
     int  _arg1;
     wxWindow * _arg2;
     wxString * _arg3;

-    bool  _arg4 = (0);
-    int  _arg5 = -1;
-    char * _argc0 = 0;
-    char * _argc2 = 0;
+    bool  _arg4 = (bool ) FALSE;
+    int  _arg5 = (int ) -1;
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;

     PyObject * _obj3 = 0;
     PyObject * _obj3 = 0;

-    int tempbool4;
+    int tempbool4 = (int) FALSE;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sisO|ii:wxNotebook_InsertPage",&_argc0,&_arg1,&_argc2,&_obj3,&tempbool4,&_arg5)) 
+    if(!PyArg_ParseTuple(args,"OiOO|ii:wxNotebook_InsertPage",&_argo0,&_arg1,&_argo2,&_obj3,&tempbool4,&_arg5)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxNotebook_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_InsertPage. Expected _wxNotebook_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_InsertPage. Expected _wxNotebook_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxWindow_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxNotebook_InsertPage. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxNotebook_InsertPage. Expected _wxWindow_p.");
         return NULL;
         }


@@ -3802,14 +4076,15 @@ static PyObject *_wrap_wxNotebook_GetPage(PyObject *self, PyObject *args) {
     wxWindow * _result;
     wxNotebook * _arg0;
     int  _arg1;
     wxWindow * _result;
     wxNotebook * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxNotebook_GetPage",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxNotebook_GetPage",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxNotebook_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_GetPage. Expected _wxNotebook_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_GetPage. Expected _wxNotebook_p.");
         return NULL;
         }


@@ -3819,8 +4094,13 @@ static PyObject *_wrap_wxNotebook_GetPage(PyObject *self, PyObject *args) {
         _result = (wxWindow *)wxNotebook_GetPage(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxWindow *)wxNotebook_GetPage(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3831,13 +4111,14 @@ static void  wxNotebook_ResizeChildren(wxNotebook *self) {
 static PyObject *_wrap_wxNotebook_ResizeChildren(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxNotebook * _arg0;
 static PyObject *_wrap_wxNotebook_ResizeChildren(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxNotebook * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxNotebook_ResizeChildren",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxNotebook_ResizeChildren",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxNotebook_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_ResizeChildren. Expected _wxNotebook_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_ResizeChildren. Expected _wxNotebook_p.");
         return NULL;
         }


@@ -3873,13 +4154,14 @@ static PyObject *_wrap_wxSplitterEvent_GetSashPosition(PyObject *self, PyObject
     PyObject * _resultobj;
     int  _result;
     wxSplitterEvent * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxSplitterEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSplitterEvent_GetSashPosition",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSplitterEvent_GetSashPosition",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSplitterEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterEvent_GetSashPosition. Expected _wxSplitterEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterEvent_GetSashPosition. Expected _wxSplitterEvent_p.");
         return NULL;
         }


@@ -3898,13 +4180,14 @@ static PyObject *_wrap_wxSplitterEvent_GetX(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxSplitterEvent * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxSplitterEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSplitterEvent_GetX",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSplitterEvent_GetX",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSplitterEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterEvent_GetX. Expected _wxSplitterEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterEvent_GetX. Expected _wxSplitterEvent_p.");
         return NULL;
         }


@@ -3923,13 +4206,14 @@ static PyObject *_wrap_wxSplitterEvent_GetY(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxSplitterEvent * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxSplitterEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSplitterEvent_GetY",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSplitterEvent_GetY",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSplitterEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterEvent_GetY. Expected _wxSplitterEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterEvent_GetY. Expected _wxSplitterEvent_p.");
         return NULL;
         }


@@ -3948,14 +4232,15 @@ static PyObject *_wrap_wxSplitterEvent_GetWindowBeingRemoved(PyObject *self, PyO
     PyObject * _resultobj;
     wxWindow * _result;
     wxSplitterEvent * _arg0;
     PyObject * _resultobj;
     wxWindow * _result;
     wxSplitterEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSplitterEvent_GetWindowBeingRemoved",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSplitterEvent_GetWindowBeingRemoved",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSplitterEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterEvent_GetWindowBeingRemoved. Expected _wxSplitterEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterEvent_GetWindowBeingRemoved. Expected _wxSplitterEvent_p.");
         return NULL;
         }


@@ -3965,8 +4250,13 @@ static PyObject *_wrap_wxSplitterEvent_GetWindowBeingRemoved(PyObject *self, PyO
         _result = (wxWindow *)wxSplitterEvent_GetWindowBeingRemoved(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxWindow *)wxSplitterEvent_GetWindowBeingRemoved(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -3975,13 +4265,14 @@ static PyObject *_wrap_wxSplitterEvent_SetSashPosition(PyObject *self, PyObject
     PyObject * _resultobj;
     wxSplitterEvent * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxSplitterEvent * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxSplitterEvent_SetSashPosition",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxSplitterEvent_SetSashPosition",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSplitterEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterEvent_SetSashPosition. Expected _wxSplitterEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterEvent_SetSashPosition. Expected _wxSplitterEvent_p.");
         return NULL;
         }


@@ -4018,32 +4309,35 @@ static PyObject *_wrap_new_wxSplitterWindow(PyObject *self, PyObject *args) {
     wxSplitterWindow * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxSplitterWindow * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;

-    wxPoint * _arg2 = &wxPyDefaultPosition;
-    wxSize * _arg3 = &wxPyDefaultSize;
-    long  _arg4 = (wxSP_3D)|(wxCLIP_CHILDREN);
-    char * _arg5 = "splitterWindow";
-    char * _argc0 = 0;
-    char * _argc2 = 0;
-    char * _argc3 = 0;
+    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    long  _arg4 = (long ) wxSP_3D|wxCLIP_CHILDREN;
+    char * _arg5 = (char *) "splitterWindow";
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;
+    PyObject * _argo3 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si|ssls:new_wxSplitterWindow",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTuple(args,"Oi|OOls:new_wxSplitterWindow",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxSplitterWindow. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxSplitterWindow. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxSplitterWindow. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxSplitterWindow. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxSize_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxSplitterWindow. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxSplitterWindow. Expected _wxSize_p.");
         return NULL;
         }


@@ -4053,8 +4347,13 @@ static PyObject *_wrap_new_wxSplitterWindow(PyObject *self, PyObject *args) {
         _result = (wxSplitterWindow *)new_wxSplitterWindow(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxSplitterWindow *)new_wxSplitterWindow(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxSplitterWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxSplitterWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -4063,13 +4362,14 @@ static PyObject *_wrap_wxSplitterWindow_GetBorderSize(PyObject *self, PyObject *
     PyObject * _resultobj;
     int  _result;
     wxSplitterWindow * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxSplitterWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSplitterWindow_GetBorderSize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSplitterWindow_GetBorderSize",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSplitterWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_GetBorderSize. Expected _wxSplitterWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_GetBorderSize. Expected _wxSplitterWindow_p.");
         return NULL;
         }


@@ -4088,13 +4388,14 @@ static PyObject *_wrap_wxSplitterWindow_GetMinimumPaneSize(PyObject *self, PyObj
     PyObject * _resultobj;
     int  _result;
     wxSplitterWindow * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxSplitterWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSplitterWindow_GetMinimumPaneSize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSplitterWindow_GetMinimumPaneSize",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSplitterWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_GetMinimumPaneSize. Expected _wxSplitterWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_GetMinimumPaneSize. Expected _wxSplitterWindow_p.");
         return NULL;
         }


@@ -4113,13 +4414,14 @@ static PyObject *_wrap_wxSplitterWindow_GetSashPosition(PyObject *self, PyObject
     PyObject * _resultobj;
     int  _result;
     wxSplitterWindow * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxSplitterWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSplitterWindow_GetSashPosition",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSplitterWindow_GetSashPosition",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSplitterWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_GetSashPosition. Expected _wxSplitterWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_GetSashPosition. Expected _wxSplitterWindow_p.");
         return NULL;
         }


@@ -4138,13 +4440,14 @@ static PyObject *_wrap_wxSplitterWindow_GetSashSize(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     int  _result;
     wxSplitterWindow * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxSplitterWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSplitterWindow_GetSashSize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSplitterWindow_GetSashSize",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSplitterWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_GetSashSize. Expected _wxSplitterWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_GetSashSize. Expected _wxSplitterWindow_p.");
         return NULL;
         }


@@ -4163,13 +4466,14 @@ static PyObject *_wrap_wxSplitterWindow_GetSplitMode(PyObject *self, PyObject *a
     PyObject * _resultobj;
     int  _result;
     wxSplitterWindow * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxSplitterWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSplitterWindow_GetSplitMode",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSplitterWindow_GetSplitMode",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSplitterWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_GetSplitMode. Expected _wxSplitterWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_GetSplitMode. Expected _wxSplitterWindow_p.");
         return NULL;
         }


@@ -4188,14 +4492,15 @@ static PyObject *_wrap_wxSplitterWindow_GetWindow1(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     wxWindow * _result;
     wxSplitterWindow * _arg0;
     PyObject * _resultobj;
     wxWindow * _result;
     wxSplitterWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSplitterWindow_GetWindow1",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSplitterWindow_GetWindow1",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSplitterWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_GetWindow1. Expected _wxSplitterWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_GetWindow1. Expected _wxSplitterWindow_p.");
         return NULL;
         }


@@ -4205,8 +4510,13 @@ static PyObject *_wrap_wxSplitterWindow_GetWindow1(PyObject *self, PyObject *arg
         _result = (wxWindow *)wxSplitterWindow_GetWindow1(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxWindow *)wxSplitterWindow_GetWindow1(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -4215,14 +4525,15 @@ static PyObject *_wrap_wxSplitterWindow_GetWindow2(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     wxWindow * _result;
     wxSplitterWindow * _arg0;
     PyObject * _resultobj;
     wxWindow * _result;
     wxSplitterWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSplitterWindow_GetWindow2",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSplitterWindow_GetWindow2",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSplitterWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_GetWindow2. Expected _wxSplitterWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_GetWindow2. Expected _wxSplitterWindow_p.");
         return NULL;
         }


@@ -4232,8 +4543,13 @@ static PyObject *_wrap_wxSplitterWindow_GetWindow2(PyObject *self, PyObject *arg
         _result = (wxWindow *)wxSplitterWindow_GetWindow2(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxWindow *)wxSplitterWindow_GetWindow2(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -4242,20 +4558,22 @@ static PyObject *_wrap_wxSplitterWindow_Initialize(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     wxSplitterWindow * _arg0;
     wxWindow * _arg1;
     PyObject * _resultobj;
     wxSplitterWindow * _arg0;
     wxWindow * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxSplitterWindow_Initialize",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxSplitterWindow_Initialize",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSplitterWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_Initialize. Expected _wxSplitterWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_Initialize. Expected _wxSplitterWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSplitterWindow_Initialize. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSplitterWindow_Initialize. Expected _wxWindow_p.");
         return NULL;
         }


@@ -4275,13 +4593,14 @@ static PyObject *_wrap_wxSplitterWindow_IsSplit(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     bool  _result;
     wxSplitterWindow * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxSplitterWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSplitterWindow_IsSplit",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSplitterWindow_IsSplit",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSplitterWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_IsSplit. Expected _wxSplitterWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_IsSplit. Expected _wxSplitterWindow_p.");
         return NULL;
         }


@@ -4300,13 +4619,14 @@ static PyObject *_wrap_wxSplitterWindow_SetBorderSize(PyObject *self, PyObject *
     PyObject * _resultobj;
     wxSplitterWindow * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxSplitterWindow * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxSplitterWindow_SetBorderSize",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxSplitterWindow_SetBorderSize",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSplitterWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_SetBorderSize. Expected _wxSplitterWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_SetBorderSize. Expected _wxSplitterWindow_p.");
         return NULL;
         }


@@ -4326,14 +4646,15 @@ static PyObject *_wrap_wxSplitterWindow_SetSashPosition(PyObject *self, PyObject
     PyObject * _resultobj;
     wxSplitterWindow * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxSplitterWindow * _arg0;
     int  _arg1;

-    int  _arg2 = (1);
-    char * _argc0 = 0;
+    int  _arg2 = (int ) TRUE;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si|i:wxSplitterWindow_SetSashPosition",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oi|i:wxSplitterWindow_SetSashPosition",&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSplitterWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_SetSashPosition. Expected _wxSplitterWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_SetSashPosition. Expected _wxSplitterWindow_p.");
         return NULL;
         }


@@ -4353,13 +4674,14 @@ static PyObject *_wrap_wxSplitterWindow_SetSashSize(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     wxSplitterWindow * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxSplitterWindow * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxSplitterWindow_SetSashSize",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxSplitterWindow_SetSashSize",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSplitterWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_SetSashSize. Expected _wxSplitterWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_SetSashSize. Expected _wxSplitterWindow_p.");
         return NULL;
         }


@@ -4379,13 +4701,14 @@ static PyObject *_wrap_wxSplitterWindow_SetMinimumPaneSize(PyObject *self, PyObj
     PyObject * _resultobj;
     wxSplitterWindow * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxSplitterWindow * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxSplitterWindow_SetMinimumPaneSize",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxSplitterWindow_SetMinimumPaneSize",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSplitterWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_SetMinimumPaneSize. Expected _wxSplitterWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_SetMinimumPaneSize. Expected _wxSplitterWindow_p.");
         return NULL;
         }


@@ -4405,13 +4728,14 @@ static PyObject *_wrap_wxSplitterWindow_SetSplitMode(PyObject *self, PyObject *a
     PyObject * _resultobj;
     wxSplitterWindow * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxSplitterWindow * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxSplitterWindow_SetSplitMode",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxSplitterWindow_SetSplitMode",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSplitterWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_SetSplitMode. Expected _wxSplitterWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_SetSplitMode. Expected _wxSplitterWindow_p.");
         return NULL;
         }


@@ -4433,28 +4757,31 @@ static PyObject *_wrap_wxSplitterWindow_SplitHorizontally(PyObject *self, PyObje
     wxSplitterWindow * _arg0;
     wxWindow * _arg1;
     wxWindow * _arg2;
     wxSplitterWindow * _arg0;
     wxWindow * _arg1;
     wxWindow * _arg2;

-    int  _arg3 = 0;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
-    char * _argc2 = 0;
+    int  _arg3 = (int ) 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sss|i:wxSplitterWindow_SplitHorizontally",&_argc0,&_argc1,&_argc2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"OOO|i:wxSplitterWindow_SplitHorizontally",&_argo0,&_argo1,&_argo2,&_arg3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSplitterWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_SplitHorizontally. Expected _wxSplitterWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_SplitHorizontally. Expected _wxSplitterWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSplitterWindow_SplitHorizontally. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSplitterWindow_SplitHorizontally. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxWindow_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxSplitterWindow_SplitHorizontally. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxSplitterWindow_SplitHorizontally. Expected _wxWindow_p.");
         return NULL;
         }


@@ -4475,28 +4802,31 @@ static PyObject *_wrap_wxSplitterWindow_SplitVertically(PyObject *self, PyObject
     wxSplitterWindow * _arg0;
     wxWindow * _arg1;
     wxWindow * _arg2;
     wxSplitterWindow * _arg0;
     wxWindow * _arg1;
     wxWindow * _arg2;

-    int  _arg3 = 0;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
-    char * _argc2 = 0;
+    int  _arg3 = (int ) 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sss|i:wxSplitterWindow_SplitVertically",&_argc0,&_argc1,&_argc2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"OOO|i:wxSplitterWindow_SplitVertically",&_argo0,&_argo1,&_argo2,&_arg3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSplitterWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_SplitVertically. Expected _wxSplitterWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_SplitVertically. Expected _wxSplitterWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSplitterWindow_SplitVertically. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSplitterWindow_SplitVertically. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxWindow_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxSplitterWindow_SplitVertically. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxSplitterWindow_SplitVertically. Expected _wxWindow_p.");
         return NULL;
         }


@@ -4515,21 +4845,23 @@ static PyObject *_wrap_wxSplitterWindow_Unsplit(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     bool  _result;
     wxSplitterWindow * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxSplitterWindow * _arg0;

-    wxWindow * _arg1 = NULL;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    wxWindow * _arg1 = (wxWindow *) NULL;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|s:wxSplitterWindow_Unsplit",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"O|O:wxSplitterWindow_Unsplit",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSplitterWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_Unsplit. Expected _wxSplitterWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_Unsplit. Expected _wxSplitterWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSplitterWindow_Unsplit. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSplitterWindow_Unsplit. Expected _wxWindow_p.");
         return NULL;
         }


@@ -4565,8 +4897,13 @@ static PyObject *_wrap_new_wxTaskBarIcon(PyObject *self, PyObject *args) {
         _result = (wxTaskBarIcon *)new_wxTaskBarIcon();
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxTaskBarIcon *)new_wxTaskBarIcon();
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxTaskBarIcon_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxTaskBarIcon_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -4574,13 +4911,14 @@ static PyObject *_wrap_new_wxTaskBarIcon(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxTaskBarIcon(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTaskBarIcon * _arg0;
 static PyObject *_wrap_delete_wxTaskBarIcon(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxTaskBarIcon * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:delete_wxTaskBarIcon",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxTaskBarIcon",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTaskBarIcon_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTaskBarIcon_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxTaskBarIcon. Expected _wxTaskBarIcon_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxTaskBarIcon. Expected _wxTaskBarIcon_p.");
         return NULL;
         }


@@ -4601,21 +4939,23 @@ static PyObject *_wrap_wxTaskBarIcon_SetIcon(PyObject *self, PyObject *args) {
     bool  _result;
     wxTaskBarIcon * _arg0;
     wxIcon * _arg1;
     bool  _result;
     wxTaskBarIcon * _arg0;
     wxIcon * _arg1;

-    char * _arg2 = "";
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    char * _arg2 = (char *) "";
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss|s:wxTaskBarIcon_SetIcon",&_argc0,&_argc1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"OO|s:wxTaskBarIcon_SetIcon",&_argo0,&_argo1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTaskBarIcon_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTaskBarIcon_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTaskBarIcon_SetIcon. Expected _wxTaskBarIcon_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTaskBarIcon_SetIcon. Expected _wxTaskBarIcon_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxIcon_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxIcon_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTaskBarIcon_SetIcon. Expected _wxIcon_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTaskBarIcon_SetIcon. Expected _wxIcon_p.");
         return NULL;
         }


@@ -4634,13 +4974,14 @@ static PyObject *_wrap_wxTaskBarIcon_RemoveIcon(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     bool  _result;
     wxTaskBarIcon * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxTaskBarIcon * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxTaskBarIcon_RemoveIcon",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxTaskBarIcon_RemoveIcon",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTaskBarIcon_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTaskBarIcon_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTaskBarIcon_RemoveIcon. Expected _wxTaskBarIcon_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTaskBarIcon_RemoveIcon. Expected _wxTaskBarIcon_p.");
         return NULL;
         }


@@ -4660,20 +5001,22 @@ static PyObject *_wrap_wxTaskBarIcon_PopupMenu(PyObject *self, PyObject *args) {
     bool  _result;
     wxTaskBarIcon * _arg0;
     wxMenu * _arg1;
     bool  _result;
     wxTaskBarIcon * _arg0;
     wxMenu * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxTaskBarIcon_PopupMenu",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxTaskBarIcon_PopupMenu",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTaskBarIcon_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTaskBarIcon_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTaskBarIcon_PopupMenu. Expected _wxTaskBarIcon_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTaskBarIcon_PopupMenu. Expected _wxTaskBarIcon_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxMenu_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTaskBarIcon_PopupMenu. Expected _wxMenu_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTaskBarIcon_PopupMenu. Expected _wxMenu_p.");
         return NULL;
         }


@@ -4688,167 +5031,478 @@ static PyObject *_wrap_wxTaskBarIcon_PopupMenu(PyObject *self, PyObject *args) {
 }
 
 static PyMethodDef windows2cMethods[] = {
 }
 
 static PyMethodDef windows2cMethods[] = {

-        { "wxTaskBarIcon_PopupMenu", _wrap_wxTaskBarIcon_PopupMenu, 1 },
-        { "wxTaskBarIcon_RemoveIcon", _wrap_wxTaskBarIcon_RemoveIcon, 1 },
-        { "wxTaskBarIcon_SetIcon", _wrap_wxTaskBarIcon_SetIcon, 1 },
-        { "delete_wxTaskBarIcon", _wrap_delete_wxTaskBarIcon, 1 },
-        { "new_wxTaskBarIcon", _wrap_new_wxTaskBarIcon, 1 },
-        { "wxSplitterWindow_Unsplit", _wrap_wxSplitterWindow_Unsplit, 1 },
-        { "wxSplitterWindow_SplitVertically", _wrap_wxSplitterWindow_SplitVertically, 1 },
-        { "wxSplitterWindow_SplitHorizontally", _wrap_wxSplitterWindow_SplitHorizontally, 1 },
-        { "wxSplitterWindow_SetSplitMode", _wrap_wxSplitterWindow_SetSplitMode, 1 },
-        { "wxSplitterWindow_SetMinimumPaneSize", _wrap_wxSplitterWindow_SetMinimumPaneSize, 1 },
-        { "wxSplitterWindow_SetSashSize", _wrap_wxSplitterWindow_SetSashSize, 1 },
-        { "wxSplitterWindow_SetSashPosition", _wrap_wxSplitterWindow_SetSashPosition, 1 },
-        { "wxSplitterWindow_SetBorderSize", _wrap_wxSplitterWindow_SetBorderSize, 1 },
-        { "wxSplitterWindow_IsSplit", _wrap_wxSplitterWindow_IsSplit, 1 },
-        { "wxSplitterWindow_Initialize", _wrap_wxSplitterWindow_Initialize, 1 },
-        { "wxSplitterWindow_GetWindow2", _wrap_wxSplitterWindow_GetWindow2, 1 },
-        { "wxSplitterWindow_GetWindow1", _wrap_wxSplitterWindow_GetWindow1, 1 },
-        { "wxSplitterWindow_GetSplitMode", _wrap_wxSplitterWindow_GetSplitMode, 1 },
-        { "wxSplitterWindow_GetSashSize", _wrap_wxSplitterWindow_GetSashSize, 1 },
-        { "wxSplitterWindow_GetSashPosition", _wrap_wxSplitterWindow_GetSashPosition, 1 },
-        { "wxSplitterWindow_GetMinimumPaneSize", _wrap_wxSplitterWindow_GetMinimumPaneSize, 1 },
-        { "wxSplitterWindow_GetBorderSize", _wrap_wxSplitterWindow_GetBorderSize, 1 },
-        { "new_wxSplitterWindow", _wrap_new_wxSplitterWindow, 1 },
-        { "wxSplitterEvent_SetSashPosition", _wrap_wxSplitterEvent_SetSashPosition, 1 },
-        { "wxSplitterEvent_GetWindowBeingRemoved", _wrap_wxSplitterEvent_GetWindowBeingRemoved, 1 },
-        { "wxSplitterEvent_GetY", _wrap_wxSplitterEvent_GetY, 1 },
-        { "wxSplitterEvent_GetX", _wrap_wxSplitterEvent_GetX, 1 },
-        { "wxSplitterEvent_GetSashPosition", _wrap_wxSplitterEvent_GetSashPosition, 1 },
-        { "wxNotebook_ResizeChildren", _wrap_wxNotebook_ResizeChildren, 1 },
-        { "wxNotebook_GetPage", _wrap_wxNotebook_GetPage, 1 },
-        { "wxNotebook_InsertPage", _wrap_wxNotebook_InsertPage, 1 },
-        { "wxNotebook_AddPage", _wrap_wxNotebook_AddPage, 1 },
-        { "wxNotebook_DeleteAllPages", _wrap_wxNotebook_DeleteAllPages, 1 },
-        { "wxNotebook_RemovePage", _wrap_wxNotebook_RemovePage, 1 },
-        { "wxNotebook_DeletePage", _wrap_wxNotebook_DeletePage, 1 },
-        { "wxNotebook_GetRowCount", _wrap_wxNotebook_GetRowCount, 1 },
-        { "wxNotebook_SetPageImage", _wrap_wxNotebook_SetPageImage, 1 },
-        { "wxNotebook_GetPageImage", _wrap_wxNotebook_GetPageImage, 1 },
-        { "wxNotebook_GetImageList", _wrap_wxNotebook_GetImageList, 1 },
-        { "wxNotebook_SetImageList", _wrap_wxNotebook_SetImageList, 1 },
-        { "wxNotebook_GetPageText", _wrap_wxNotebook_GetPageText, 1 },
-        { "wxNotebook_SetPageText", _wrap_wxNotebook_SetPageText, 1 },
-        { "wxNotebook_GetSelection", _wrap_wxNotebook_GetSelection, 1 },
-        { "wxNotebook_AdvanceSelection", _wrap_wxNotebook_AdvanceSelection, 1 },
-        { "wxNotebook_SetSelection", _wrap_wxNotebook_SetSelection, 1 },
-        { "wxNotebook_GetPageCount", _wrap_wxNotebook_GetPageCount, 1 },
-        { "new_wxNotebook", _wrap_new_wxNotebook, 1 },
-        { "wxNotebookEvent_SetSelection", _wrap_wxNotebookEvent_SetSelection, 1 },
-        { "wxNotebookEvent_SetOldSelection", _wrap_wxNotebookEvent_SetOldSelection, 1 },
-        { "wxNotebookEvent_GetOldSelection", _wrap_wxNotebookEvent_GetOldSelection, 1 },
-        { "wxNotebookEvent_GetSelection", _wrap_wxNotebookEvent_GetSelection, 1 },
-        { "wxGridEvent_GetCell", _wrap_wxGridEvent_GetCell, 1 },
-        { "wxGridEvent_ShiftDown", _wrap_wxGridEvent_ShiftDown, 1 },
-        { "wxGridEvent_ControlDown", _wrap_wxGridEvent_ControlDown, 1 },
-        { "wxGridEvent_GetPosition", _wrap_wxGridEvent_GetPosition, 1 },
-        { "wxGridEvent_GetCol", _wrap_wxGridEvent_GetCol, 1 },
-        { "wxGridEvent_GetRow", _wrap_wxGridEvent_GetRow, 1 },
-        { "wxGridEvent_m_cell_get", _wrap_wxGridEvent_m_cell_get, 1 },
-        { "wxGridEvent_m_cell_set", _wrap_wxGridEvent_m_cell_set, 1 },
-        { "wxGridEvent_m_shift_get", _wrap_wxGridEvent_m_shift_get, 1 },
-        { "wxGridEvent_m_shift_set", _wrap_wxGridEvent_m_shift_set, 1 },
-        { "wxGridEvent_m_control_get", _wrap_wxGridEvent_m_control_get, 1 },
-        { "wxGridEvent_m_control_set", _wrap_wxGridEvent_m_control_set, 1 },
-        { "wxGridEvent_m_y_get", _wrap_wxGridEvent_m_y_get, 1 },
-        { "wxGridEvent_m_y_set", _wrap_wxGridEvent_m_y_set, 1 },
-        { "wxGridEvent_m_x_get", _wrap_wxGridEvent_m_x_get, 1 },
-        { "wxGridEvent_m_x_set", _wrap_wxGridEvent_m_x_set, 1 },
-        { "wxGridEvent_m_col_get", _wrap_wxGridEvent_m_col_get, 1 },
-        { "wxGridEvent_m_col_set", _wrap_wxGridEvent_m_col_set, 1 },
-        { "wxGridEvent_m_row_get", _wrap_wxGridEvent_m_row_get, 1 },
-        { "wxGridEvent_m_row_set", _wrap_wxGridEvent_m_row_set, 1 },
-        { "wxGrid_SetEditInPlace", _wrap_wxGrid_SetEditInPlace, 1 },
-        { "wxGrid_GetEditInPlace", _wrap_wxGrid_GetEditInPlace, 1 },
-        { "wxGrid_UpdateDimensions", _wrap_wxGrid_UpdateDimensions, 1 },
-        { "wxGrid_SetRowHeight", _wrap_wxGrid_SetRowHeight, 1 },
-        { "wxGrid_SetLabelValue", _wrap_wxGrid_SetLabelValue, 1 },
-        { "wxGrid_SetLabelTextFont", _wrap_wxGrid_SetLabelTextFont, 1 },
-        { "wxGrid_SetLabelTextColour", _wrap_wxGrid_SetLabelTextColour, 1 },
-        { "wxGrid_SetLabelSize", _wrap_wxGrid_SetLabelSize, 1 },
-        { "wxGrid_SetLabelBackgroundColour", _wrap_wxGrid_SetLabelBackgroundColour, 1 },
-        { "wxGrid_SetLabelAlignment", _wrap_wxGrid_SetLabelAlignment, 1 },
-        { "wxGrid_SetGridCursor", _wrap_wxGrid_SetGridCursor, 1 },
-        { "wxGrid_SetEditable", _wrap_wxGrid_SetEditable, 1 },
-        { "wxGrid_SetDividerPen", _wrap_wxGrid_SetDividerPen, 1 },
-        { "wxGrid_SetColumnWidth", _wrap_wxGrid_SetColumnWidth, 1 },
-        { "wxGrid_SetCellValue", _wrap_wxGrid_SetCellValue, 1 },
-        { "wxGrid_SetDefCellTextFont", _wrap_wxGrid_SetDefCellTextFont, 1 },
-        { "wxGrid_SetCellTextFont", _wrap_wxGrid_SetCellTextFont, 1 },
-        { "wxGrid_SetDefCellTextColour", _wrap_wxGrid_SetDefCellTextColour, 1 },
-        { "wxGrid_SetCellTextColour", _wrap_wxGrid_SetCellTextColour, 1 },
-        { "wxGrid_SetDefCellBackgroundColour", _wrap_wxGrid_SetDefCellBackgroundColour, 1 },
-        { "wxGrid_SetCellBackgroundColour", _wrap_wxGrid_SetCellBackgroundColour, 1 },
-        { "wxGrid_SetDefCellAlignment", _wrap_wxGrid_SetDefCellAlignment, 1 },
-        { "wxGrid_SetCellAlignment", _wrap_wxGrid_SetCellAlignment, 1 },
-        { "wxGrid_OnActivate", _wrap_wxGrid_OnActivate, 1 },
-        { "wxGrid_InsertRows", _wrap_wxGrid_InsertRows, 1 },
-        { "wxGrid_InsertCols", _wrap_wxGrid_InsertCols, 1 },
-        { "wxGrid_GetVertScrollBar", _wrap_wxGrid_GetVertScrollBar, 1 },
-        { "wxGrid_GetTextItem", _wrap_wxGrid_GetTextItem, 1 },
-        { "wxGrid_GetScrollPosY", _wrap_wxGrid_GetScrollPosY, 1 },
-        { "wxGrid_GetScrollPosX", _wrap_wxGrid_GetScrollPosX, 1 },
-        { "wxGrid_GetRows", _wrap_wxGrid_GetRows, 1 },
-        { "wxGrid_GetRowHeight", _wrap_wxGrid_GetRowHeight, 1 },
-        { "wxGrid_GetLabelValue", _wrap_wxGrid_GetLabelValue, 1 },
-        { "wxGrid_GetLabelTextFont", _wrap_wxGrid_GetLabelTextFont, 1 },
-        { "wxGrid_GetLabelTextColour", _wrap_wxGrid_GetLabelTextColour, 1 },
-        { "wxGrid_GetLabelSize", _wrap_wxGrid_GetLabelSize, 1 },
-        { "wxGrid_GetLabelBackgroundColour", _wrap_wxGrid_GetLabelBackgroundColour, 1 },
-        { "wxGrid_GetLabelAlignment", _wrap_wxGrid_GetLabelAlignment, 1 },
-        { "wxGrid_GetHorizScrollBar", _wrap_wxGrid_GetHorizScrollBar, 1 },
-        { "wxGrid_GetEditable", _wrap_wxGrid_GetEditable, 1 },
-        { "wxGrid_GetCursorRow", _wrap_wxGrid_GetCursorRow, 1 },
-        { "wxGrid_GetCursorColumn", _wrap_wxGrid_GetCursorColumn, 1 },
-        { "wxGrid_GetCurrentRect", _wrap_wxGrid_GetCurrentRect, 1 },
-        { "wxGrid_GetColumnWidth", _wrap_wxGrid_GetColumnWidth, 1 },
-        { "wxGrid_GetCols", _wrap_wxGrid_GetCols, 1 },
-        { "wxGrid_GetCellValue", _wrap_wxGrid_GetCellValue, 1 },
-        { "wxGrid_GetDefCellTextFont", _wrap_wxGrid_GetDefCellTextFont, 1 },
-        { "wxGrid_GetCellTextFont", _wrap_wxGrid_GetCellTextFont, 1 },
-        { "wxGrid_GetDefCellTextColour", _wrap_wxGrid_GetDefCellTextColour, 1 },
-        { "wxGrid_GetCellTextColour", _wrap_wxGrid_GetCellTextColour, 1 },
-        { "wxGrid_GetCells", _wrap_wxGrid_GetCells, 1 },
-        { "wxGrid_GetDefCellBackgroundColour", _wrap_wxGrid_GetDefCellBackgroundColour, 1 },
-        { "wxGrid_GetCellBackgroundColour", _wrap_wxGrid_GetCellBackgroundColour, 1 },
-        { "wxGrid_GetDefCellAlignment", _wrap_wxGrid_GetDefCellAlignment, 1 },
-        { "wxGrid_GetCellAlignment", _wrap_wxGrid_GetCellAlignment, 1 },
-        { "wxGrid_GetCell", _wrap_wxGrid_GetCell, 1 },
-        { "wxGrid_GetBatchCount", _wrap_wxGrid_GetBatchCount, 1 },
-        { "wxGrid_EndBatch", _wrap_wxGrid_EndBatch, 1 },
-        { "wxGrid_DeleteRows", _wrap_wxGrid_DeleteRows, 1 },
-        { "wxGrid_DeleteCols", _wrap_wxGrid_DeleteCols, 1 },
-        { "wxGrid_CurrentCellVisible", _wrap_wxGrid_CurrentCellVisible, 1 },
-        { "wxGrid_CreateGrid", _wrap_wxGrid_CreateGrid, 1 },
-        { "wxGrid_CellHitTest", _wrap_wxGrid_CellHitTest, 1 },
-        { "wxGrid_BeginBatch", _wrap_wxGrid_BeginBatch, 1 },
-        { "wxGrid_AppendRows", _wrap_wxGrid_AppendRows, 1 },
-        { "wxGrid_AppendCols", _wrap_wxGrid_AppendCols, 1 },
-        { "wxGrid_AdjustScrollbars", _wrap_wxGrid_AdjustScrollbars, 1 },
-        { "new_wxGrid", _wrap_new_wxGrid, 1 },
-        { "wxGridCell_SetCellBitmap", _wrap_wxGridCell_SetCellBitmap, 1 },
-        { "wxGridCell_GetCellBitmap", _wrap_wxGridCell_GetCellBitmap, 1 },
-        { "wxGridCell_SetAlignment", _wrap_wxGridCell_SetAlignment, 1 },
-        { "wxGridCell_GetAlignment", _wrap_wxGridCell_GetAlignment, 1 },
-        { "wxGridCell_GetBackgroundBrush", _wrap_wxGridCell_GetBackgroundBrush, 1 },
-        { "wxGridCell_SetBackgroundColour", _wrap_wxGridCell_SetBackgroundColour, 1 },
-        { "wxGridCell_GetBackgroundColour", _wrap_wxGridCell_GetBackgroundColour, 1 },
-        { "wxGridCell_SetTextColour", _wrap_wxGridCell_SetTextColour, 1 },
-        { "wxGridCell_GetTextColour", _wrap_wxGridCell_GetTextColour, 1 },
-        { "wxGridCell_SetFont", _wrap_wxGridCell_SetFont, 1 },
-        { "wxGridCell_GetFont", _wrap_wxGridCell_GetFont, 1 },
-        { "wxGridCell_SetTextValue", _wrap_wxGridCell_SetTextValue, 1 },
-        { "wxGridCell_GetTextValue", _wrap_wxGridCell_GetTextValue, 1 },
-        { "delete_wxGridCell", _wrap_delete_wxGridCell, 1 },
-        { "new_wxGridCell", _wrap_new_wxGridCell, 1 },
+        { "wxTaskBarIcon_PopupMenu", _wrap_wxTaskBarIcon_PopupMenu, METH_VARARGS },
+        { "wxTaskBarIcon_RemoveIcon", _wrap_wxTaskBarIcon_RemoveIcon, METH_VARARGS },
+        { "wxTaskBarIcon_SetIcon", _wrap_wxTaskBarIcon_SetIcon, METH_VARARGS },
+        { "delete_wxTaskBarIcon", _wrap_delete_wxTaskBarIcon, METH_VARARGS },
+        { "new_wxTaskBarIcon", _wrap_new_wxTaskBarIcon, METH_VARARGS },
+        { "wxSplitterWindow_Unsplit", _wrap_wxSplitterWindow_Unsplit, METH_VARARGS },
+        { "wxSplitterWindow_SplitVertically", _wrap_wxSplitterWindow_SplitVertically, METH_VARARGS },
+        { "wxSplitterWindow_SplitHorizontally", _wrap_wxSplitterWindow_SplitHorizontally, METH_VARARGS },
+        { "wxSplitterWindow_SetSplitMode", _wrap_wxSplitterWindow_SetSplitMode, METH_VARARGS },
+        { "wxSplitterWindow_SetMinimumPaneSize", _wrap_wxSplitterWindow_SetMinimumPaneSize, METH_VARARGS },
+        { "wxSplitterWindow_SetSashSize", _wrap_wxSplitterWindow_SetSashSize, METH_VARARGS },
+        { "wxSplitterWindow_SetSashPosition", _wrap_wxSplitterWindow_SetSashPosition, METH_VARARGS },
+        { "wxSplitterWindow_SetBorderSize", _wrap_wxSplitterWindow_SetBorderSize, METH_VARARGS },
+        { "wxSplitterWindow_IsSplit", _wrap_wxSplitterWindow_IsSplit, METH_VARARGS },
+        { "wxSplitterWindow_Initialize", _wrap_wxSplitterWindow_Initialize, METH_VARARGS },
+        { "wxSplitterWindow_GetWindow2", _wrap_wxSplitterWindow_GetWindow2, METH_VARARGS },
+        { "wxSplitterWindow_GetWindow1", _wrap_wxSplitterWindow_GetWindow1, METH_VARARGS },
+        { "wxSplitterWindow_GetSplitMode", _wrap_wxSplitterWindow_GetSplitMode, METH_VARARGS },
+        { "wxSplitterWindow_GetSashSize", _wrap_wxSplitterWindow_GetSashSize, METH_VARARGS },
+        { "wxSplitterWindow_GetSashPosition", _wrap_wxSplitterWindow_GetSashPosition, METH_VARARGS },
+        { "wxSplitterWindow_GetMinimumPaneSize", _wrap_wxSplitterWindow_GetMinimumPaneSize, METH_VARARGS },
+        { "wxSplitterWindow_GetBorderSize", _wrap_wxSplitterWindow_GetBorderSize, METH_VARARGS },
+        { "new_wxSplitterWindow", _wrap_new_wxSplitterWindow, METH_VARARGS },
+        { "wxSplitterEvent_SetSashPosition", _wrap_wxSplitterEvent_SetSashPosition, METH_VARARGS },
+        { "wxSplitterEvent_GetWindowBeingRemoved", _wrap_wxSplitterEvent_GetWindowBeingRemoved, METH_VARARGS },
+        { "wxSplitterEvent_GetY", _wrap_wxSplitterEvent_GetY, METH_VARARGS },
+        { "wxSplitterEvent_GetX", _wrap_wxSplitterEvent_GetX, METH_VARARGS },
+        { "wxSplitterEvent_GetSashPosition", _wrap_wxSplitterEvent_GetSashPosition, METH_VARARGS },
+        { "wxNotebook_ResizeChildren", _wrap_wxNotebook_ResizeChildren, METH_VARARGS },
+        { "wxNotebook_GetPage", _wrap_wxNotebook_GetPage, METH_VARARGS },
+        { "wxNotebook_InsertPage", _wrap_wxNotebook_InsertPage, METH_VARARGS },
+        { "wxNotebook_AddPage", _wrap_wxNotebook_AddPage, METH_VARARGS },
+        { "wxNotebook_DeleteAllPages", _wrap_wxNotebook_DeleteAllPages, METH_VARARGS },
+        { "wxNotebook_RemovePage", _wrap_wxNotebook_RemovePage, METH_VARARGS },
+        { "wxNotebook_DeletePage", _wrap_wxNotebook_DeletePage, METH_VARARGS },
+        { "wxNotebook_GetRowCount", _wrap_wxNotebook_GetRowCount, METH_VARARGS },
+        { "wxNotebook_SetPageImage", _wrap_wxNotebook_SetPageImage, METH_VARARGS },
+        { "wxNotebook_GetPageImage", _wrap_wxNotebook_GetPageImage, METH_VARARGS },
+        { "wxNotebook_GetImageList", _wrap_wxNotebook_GetImageList, METH_VARARGS },
+        { "wxNotebook_SetImageList", _wrap_wxNotebook_SetImageList, METH_VARARGS },
+        { "wxNotebook_GetPageText", _wrap_wxNotebook_GetPageText, METH_VARARGS },
+        { "wxNotebook_SetPageText", _wrap_wxNotebook_SetPageText, METH_VARARGS },
+        { "wxNotebook_GetSelection", _wrap_wxNotebook_GetSelection, METH_VARARGS },
+        { "wxNotebook_AdvanceSelection", _wrap_wxNotebook_AdvanceSelection, METH_VARARGS },
+        { "wxNotebook_SetSelection", _wrap_wxNotebook_SetSelection, METH_VARARGS },
+        { "wxNotebook_GetPageCount", _wrap_wxNotebook_GetPageCount, METH_VARARGS },
+        { "new_wxNotebook", _wrap_new_wxNotebook, METH_VARARGS },
+        { "wxNotebookEvent_SetSelection", _wrap_wxNotebookEvent_SetSelection, METH_VARARGS },
+        { "wxNotebookEvent_SetOldSelection", _wrap_wxNotebookEvent_SetOldSelection, METH_VARARGS },
+        { "wxNotebookEvent_GetOldSelection", _wrap_wxNotebookEvent_GetOldSelection, METH_VARARGS },
+        { "wxNotebookEvent_GetSelection", _wrap_wxNotebookEvent_GetSelection, METH_VARARGS },
+        { "wxGridEvent_GetCell", _wrap_wxGridEvent_GetCell, METH_VARARGS },
+        { "wxGridEvent_ShiftDown", _wrap_wxGridEvent_ShiftDown, METH_VARARGS },
+        { "wxGridEvent_ControlDown", _wrap_wxGridEvent_ControlDown, METH_VARARGS },
+        { "wxGridEvent_GetPosition", _wrap_wxGridEvent_GetPosition, METH_VARARGS },
+        { "wxGridEvent_GetCol", _wrap_wxGridEvent_GetCol, METH_VARARGS },
+        { "wxGridEvent_GetRow", _wrap_wxGridEvent_GetRow, METH_VARARGS },
+        { "wxGridEvent_m_cell_get", _wrap_wxGridEvent_m_cell_get, METH_VARARGS },
+        { "wxGridEvent_m_cell_set", _wrap_wxGridEvent_m_cell_set, METH_VARARGS },
+        { "wxGridEvent_m_shift_get", _wrap_wxGridEvent_m_shift_get, METH_VARARGS },
+        { "wxGridEvent_m_shift_set", _wrap_wxGridEvent_m_shift_set, METH_VARARGS },
+        { "wxGridEvent_m_control_get", _wrap_wxGridEvent_m_control_get, METH_VARARGS },
+        { "wxGridEvent_m_control_set", _wrap_wxGridEvent_m_control_set, METH_VARARGS },
+        { "wxGridEvent_m_y_get", _wrap_wxGridEvent_m_y_get, METH_VARARGS },
+        { "wxGridEvent_m_y_set", _wrap_wxGridEvent_m_y_set, METH_VARARGS },
+        { "wxGridEvent_m_x_get", _wrap_wxGridEvent_m_x_get, METH_VARARGS },
+        { "wxGridEvent_m_x_set", _wrap_wxGridEvent_m_x_set, METH_VARARGS },
+        { "wxGridEvent_m_col_get", _wrap_wxGridEvent_m_col_get, METH_VARARGS },
+        { "wxGridEvent_m_col_set", _wrap_wxGridEvent_m_col_set, METH_VARARGS },
+        { "wxGridEvent_m_row_get", _wrap_wxGridEvent_m_row_get, METH_VARARGS },
+        { "wxGridEvent_m_row_set", _wrap_wxGridEvent_m_row_set, METH_VARARGS },
+        { "wxGrid_SetEditInPlace", _wrap_wxGrid_SetEditInPlace, METH_VARARGS },
+        { "wxGrid_GetEditInPlace", _wrap_wxGrid_GetEditInPlace, METH_VARARGS },
+        { "wxGrid_UpdateDimensions", _wrap_wxGrid_UpdateDimensions, METH_VARARGS },
+        { "wxGrid_SetRowHeight", _wrap_wxGrid_SetRowHeight, METH_VARARGS },
+        { "wxGrid_SetLabelValue", _wrap_wxGrid_SetLabelValue, METH_VARARGS },
+        { "wxGrid_SetLabelTextFont", _wrap_wxGrid_SetLabelTextFont, METH_VARARGS },
+        { "wxGrid_SetLabelTextColour", _wrap_wxGrid_SetLabelTextColour, METH_VARARGS },
+        { "wxGrid_SetLabelSize", _wrap_wxGrid_SetLabelSize, METH_VARARGS },
+        { "wxGrid_SetLabelBackgroundColour", _wrap_wxGrid_SetLabelBackgroundColour, METH_VARARGS },
+        { "wxGrid_SetLabelAlignment", _wrap_wxGrid_SetLabelAlignment, METH_VARARGS },
+        { "wxGrid_SetGridCursor", _wrap_wxGrid_SetGridCursor, METH_VARARGS },
+        { "wxGrid_SetEditable", _wrap_wxGrid_SetEditable, METH_VARARGS },
+        { "wxGrid_SetDividerPen", _wrap_wxGrid_SetDividerPen, METH_VARARGS },
+        { "wxGrid_SetColumnWidth", _wrap_wxGrid_SetColumnWidth, METH_VARARGS },
+        { "wxGrid_SetCellValue", _wrap_wxGrid_SetCellValue, METH_VARARGS },
+        { "wxGrid_SetDefCellTextFont", _wrap_wxGrid_SetDefCellTextFont, METH_VARARGS },
+        { "wxGrid_SetCellTextFont", _wrap_wxGrid_SetCellTextFont, METH_VARARGS },
+        { "wxGrid_SetDefCellTextColour", _wrap_wxGrid_SetDefCellTextColour, METH_VARARGS },
+        { "wxGrid_SetCellTextColour", _wrap_wxGrid_SetCellTextColour, METH_VARARGS },
+        { "wxGrid_SetDefCellBackgroundColour", _wrap_wxGrid_SetDefCellBackgroundColour, METH_VARARGS },
+        { "wxGrid_SetCellBackgroundColour", _wrap_wxGrid_SetCellBackgroundColour, METH_VARARGS },
+        { "wxGrid_SetDefCellAlignment", _wrap_wxGrid_SetDefCellAlignment, METH_VARARGS },
+        { "wxGrid_SetCellAlignment", _wrap_wxGrid_SetCellAlignment, METH_VARARGS },
+        { "wxGrid_OnActivate", _wrap_wxGrid_OnActivate, METH_VARARGS },
+        { "wxGrid_InsertRows", _wrap_wxGrid_InsertRows, METH_VARARGS },
+        { "wxGrid_InsertCols", _wrap_wxGrid_InsertCols, METH_VARARGS },
+        { "wxGrid_GetVertScrollBar", _wrap_wxGrid_GetVertScrollBar, METH_VARARGS },
+        { "wxGrid_GetTextItem", _wrap_wxGrid_GetTextItem, METH_VARARGS },
+        { "wxGrid_GetScrollPosY", _wrap_wxGrid_GetScrollPosY, METH_VARARGS },
+        { "wxGrid_GetScrollPosX", _wrap_wxGrid_GetScrollPosX, METH_VARARGS },
+        { "wxGrid_GetRows", _wrap_wxGrid_GetRows, METH_VARARGS },
+        { "wxGrid_GetRowHeight", _wrap_wxGrid_GetRowHeight, METH_VARARGS },
+        { "wxGrid_GetLabelValue", _wrap_wxGrid_GetLabelValue, METH_VARARGS },
+        { "wxGrid_GetLabelTextFont", _wrap_wxGrid_GetLabelTextFont, METH_VARARGS },
+        { "wxGrid_GetLabelTextColour", _wrap_wxGrid_GetLabelTextColour, METH_VARARGS },
+        { "wxGrid_GetLabelSize", _wrap_wxGrid_GetLabelSize, METH_VARARGS },
+        { "wxGrid_GetLabelBackgroundColour", _wrap_wxGrid_GetLabelBackgroundColour, METH_VARARGS },
+        { "wxGrid_GetLabelAlignment", _wrap_wxGrid_GetLabelAlignment, METH_VARARGS },
+        { "wxGrid_GetHorizScrollBar", _wrap_wxGrid_GetHorizScrollBar, METH_VARARGS },
+        { "wxGrid_GetEditable", _wrap_wxGrid_GetEditable, METH_VARARGS },
+        { "wxGrid_GetCursorRow", _wrap_wxGrid_GetCursorRow, METH_VARARGS },
+        { "wxGrid_GetCursorColumn", _wrap_wxGrid_GetCursorColumn, METH_VARARGS },
+        { "wxGrid_GetCurrentRect", _wrap_wxGrid_GetCurrentRect, METH_VARARGS },
+        { "wxGrid_GetColumnWidth", _wrap_wxGrid_GetColumnWidth, METH_VARARGS },
+        { "wxGrid_GetCols", _wrap_wxGrid_GetCols, METH_VARARGS },
+        { "wxGrid_GetCellValue", _wrap_wxGrid_GetCellValue, METH_VARARGS },
+        { "wxGrid_GetDefCellTextFont", _wrap_wxGrid_GetDefCellTextFont, METH_VARARGS },
+        { "wxGrid_GetCellTextFont", _wrap_wxGrid_GetCellTextFont, METH_VARARGS },
+        { "wxGrid_GetDefCellTextColour", _wrap_wxGrid_GetDefCellTextColour, METH_VARARGS },
+        { "wxGrid_GetCellTextColour", _wrap_wxGrid_GetCellTextColour, METH_VARARGS },
+        { "wxGrid_GetCells", _wrap_wxGrid_GetCells, METH_VARARGS },
+        { "wxGrid_GetDefCellBackgroundColour", _wrap_wxGrid_GetDefCellBackgroundColour, METH_VARARGS },
+        { "wxGrid_GetCellBackgroundColour", _wrap_wxGrid_GetCellBackgroundColour, METH_VARARGS },
+        { "wxGrid_GetDefCellAlignment", _wrap_wxGrid_GetDefCellAlignment, METH_VARARGS },
+        { "wxGrid_GetCellAlignment", _wrap_wxGrid_GetCellAlignment, METH_VARARGS },
+        { "wxGrid_GetCell", _wrap_wxGrid_GetCell, METH_VARARGS },
+        { "wxGrid_GetBatchCount", _wrap_wxGrid_GetBatchCount, METH_VARARGS },
+        { "wxGrid_EndBatch", _wrap_wxGrid_EndBatch, METH_VARARGS },
+        { "wxGrid_DeleteRows", _wrap_wxGrid_DeleteRows, METH_VARARGS },
+        { "wxGrid_DeleteCols", _wrap_wxGrid_DeleteCols, METH_VARARGS },
+        { "wxGrid_CurrentCellVisible", _wrap_wxGrid_CurrentCellVisible, METH_VARARGS },
+        { "wxGrid_CreateGrid", _wrap_wxGrid_CreateGrid, METH_VARARGS },
+        { "wxGrid_CellHitTest", _wrap_wxGrid_CellHitTest, METH_VARARGS },
+        { "wxGrid_BeginBatch", _wrap_wxGrid_BeginBatch, METH_VARARGS },
+        { "wxGrid_AppendRows", _wrap_wxGrid_AppendRows, METH_VARARGS },
+        { "wxGrid_AppendCols", _wrap_wxGrid_AppendCols, METH_VARARGS },
+        { "wxGrid_AdjustScrollbars", _wrap_wxGrid_AdjustScrollbars, METH_VARARGS },
+        { "new_wxGrid", _wrap_new_wxGrid, METH_VARARGS },
+        { "wxGridCell_SetCellBitmap", _wrap_wxGridCell_SetCellBitmap, METH_VARARGS },
+        { "wxGridCell_GetCellBitmap", _wrap_wxGridCell_GetCellBitmap, METH_VARARGS },
+        { "wxGridCell_SetAlignment", _wrap_wxGridCell_SetAlignment, METH_VARARGS },
+        { "wxGridCell_GetAlignment", _wrap_wxGridCell_GetAlignment, METH_VARARGS },
+        { "wxGridCell_GetBackgroundBrush", _wrap_wxGridCell_GetBackgroundBrush, METH_VARARGS },
+        { "wxGridCell_SetBackgroundColour", _wrap_wxGridCell_SetBackgroundColour, METH_VARARGS },
+        { "wxGridCell_GetBackgroundColour", _wrap_wxGridCell_GetBackgroundColour, METH_VARARGS },
+        { "wxGridCell_SetTextColour", _wrap_wxGridCell_SetTextColour, METH_VARARGS },
+        { "wxGridCell_GetTextColour", _wrap_wxGridCell_GetTextColour, METH_VARARGS },
+        { "wxGridCell_SetFont", _wrap_wxGridCell_SetFont, METH_VARARGS },
+        { "wxGridCell_GetFont", _wrap_wxGridCell_GetFont, METH_VARARGS },
+        { "wxGridCell_SetTextValue", _wrap_wxGridCell_SetTextValue, METH_VARARGS },
+        { "wxGridCell_GetTextValue", _wrap_wxGridCell_GetTextValue, METH_VARARGS },
+        { "delete_wxGridCell", _wrap_delete_wxGridCell, METH_VARARGS },
+        { "new_wxGridCell", _wrap_new_wxGridCell, METH_VARARGS },

         { NULL, NULL }
 };
         { NULL, NULL }
 };

+#ifdef __cplusplus
+}
+#endif
+/*
+ * This table is used by the pointer type-checker
+ */
+static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
+    { "_wxAcceleratorTable","_class_wxAcceleratorTable",0},
+    { "_wxEvent","_class_wxSplitterEvent",SwigwxSplitterEventTowxEvent},
+    { "_wxEvent","_wxSplitterEvent",SwigwxSplitterEventTowxEvent},
+    { "_wxEvent","_class_wxNotebookEvent",SwigwxNotebookEventTowxEvent},
+    { "_wxEvent","_wxNotebookEvent",SwigwxNotebookEventTowxEvent},
+    { "_wxEvent","_class_wxGridEvent",SwigwxGridEventTowxEvent},
+    { "_wxEvent","_wxGridEvent",SwigwxGridEventTowxEvent},
+    { "_wxEvent","_class_wxEvent",0},
+    { "_class_wxActivateEvent","_wxActivateEvent",0},
+    { "_signed_long","_long",0},
+    { "_wxMenuEvent","_class_wxMenuEvent",0},
+    { "_wxPrintQuality","_int",0},
+    { "_wxPrintQuality","_signed_int",0},
+    { "_wxPrintQuality","_unsigned_int",0},
+    { "_wxPrintQuality","_wxWindowID",0},
+    { "_wxPrintQuality","_uint",0},
+    { "_wxPrintQuality","_EBool",0},
+    { "_wxPrintQuality","_size_t",0},
+    { "_class_wxRegionIterator","_wxRegionIterator",0},
+    { "_class_wxMenuBar","_wxMenuBar",0},
+    { "_class_wxEvtHandler","_class_wxTaskBarIcon",SwigwxTaskBarIconTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxTaskBarIcon",SwigwxTaskBarIconTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxSplitterWindow",SwigwxSplitterWindowTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxSplitterWindow",SwigwxSplitterWindowTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxNotebook",SwigwxNotebookTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxNotebook",SwigwxNotebookTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxGrid",SwigwxGridTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxGrid",SwigwxGridTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxEvtHandler",0},
+    { "_wxPaintEvent","_class_wxPaintEvent",0},
+    { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
+    { "_wxCursor","_class_wxCursor",0},
+    { "_wxNotifyEvent","_class_wxNotebookEvent",SwigwxNotebookEventTowxNotifyEvent},
+    { "_wxNotifyEvent","_wxNotebookEvent",SwigwxNotebookEventTowxNotifyEvent},
+    { "_wxNotifyEvent","_class_wxNotifyEvent",0},
+    { "_wxMask","_class_wxMask",0},
+    { "_wxGrid","_class_wxGrid",0},
+    { "_wxPen","_class_wxPen",0},
+    { "_wxUpdateUIEvent","_class_wxUpdateUIEvent",0},
+    { "_byte","_unsigned_char",0},
+    { "_wxStaticBox","_class_wxStaticBox",0},
+    { "_wxChoice","_class_wxChoice",0},
+    { "_wxSlider","_class_wxSlider",0},
+    { "_wxNotebookEvent","_class_wxNotebookEvent",0},
+    { "_long","_wxDash",0},
+    { "_long","_unsigned_long",0},
+    { "_long","_signed_long",0},
+    { "_wxImageList","_class_wxImageList",0},
+    { "_wxDropFilesEvent","_class_wxDropFilesEvent",0},
+    { "_wxBitmapButton","_class_wxBitmapButton",0},
+    { "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
+    { "_class_wxGauge","_wxGauge",0},
+    { "_wxDC","_class_wxDC",0},
+    { "_wxSpinEvent","_class_wxSpinEvent",0},
+    { "_size_t","_wxPrintQuality",0},
+    { "_size_t","_unsigned_int",0},
+    { "_size_t","_int",0},
+    { "_size_t","_wxWindowID",0},
+    { "_size_t","_uint",0},
+    { "_class_wxRealPoint","_wxRealPoint",0},
+    { "_wxPrinterDC","_class_wxPrinterDC",0},
+    { "_class_wxMenuItem","_wxMenuItem",0},
+    { "_class_wxPaintEvent","_wxPaintEvent",0},
+    { "_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0},
+    { "_wxPanel","_class_wxGrid",SwigwxGridTowxPanel},
+    { "_wxPanel","_wxGrid",SwigwxGridTowxPanel},
+    { "_wxPanel","_class_wxPanel",0},
+    { "_wxInitDialogEvent","_class_wxInitDialogEvent",0},
+    { "_wxCheckBox","_class_wxCheckBox",0},
+    { "_wxPyEvent","_class_wxPyEvent",0},
+    { "_wxTextCtrl","_class_wxTextCtrl",0},
+    { "_class_wxMask","_wxMask",0},
+    { "_class_wxKeyEvent","_wxKeyEvent",0},
+    { "_class_wxGrid","_wxGrid",0},
+    { "_wxColour","_class_wxColour",0},
+    { "_class_wxDialog","_wxDialog",0},
+    { "_wxIdleEvent","_class_wxIdleEvent",0},
+    { "_class_wxUpdateUIEvent","_wxUpdateUIEvent",0},
+    { "_wxStaticLine","_class_wxStaticLine",0},
+    { "_wxBrush","_class_wxBrush",0},
+    { "_class_wxNotebookEvent","_wxNotebookEvent",0},
+    { "_wxShowEvent","_class_wxShowEvent",0},
+    { "_uint","_wxPrintQuality",0},
+    { "_uint","_size_t",0},
+    { "_uint","_unsigned_int",0},
+    { "_uint","_int",0},
+    { "_uint","_wxWindowID",0},
+    { "_class_wxEvent","_class_wxSplitterEvent",SwigwxSplitterEventTowxEvent},
+    { "_class_wxEvent","_wxSplitterEvent",SwigwxSplitterEventTowxEvent},
+    { "_class_wxEvent","_class_wxNotebookEvent",SwigwxNotebookEventTowxEvent},
+    { "_class_wxEvent","_wxNotebookEvent",SwigwxNotebookEventTowxEvent},
+    { "_class_wxEvent","_class_wxGridEvent",SwigwxGridEventTowxEvent},
+    { "_class_wxEvent","_wxGridEvent",SwigwxGridEventTowxEvent},
+    { "_class_wxEvent","_wxEvent",0},
+    { "_wxCheckListBox","_class_wxCheckListBox",0},
+    { "_wxSplitterEvent","_class_wxSplitterEvent",0},
+    { "_wxGridEvent","_class_wxGridEvent",0},
+    { "_wxRect","_class_wxRect",0},
+    { "_wxCommandEvent","_class_wxSplitterEvent",SwigwxSplitterEventTowxCommandEvent},
+    { "_wxCommandEvent","_wxSplitterEvent",SwigwxSplitterEventTowxCommandEvent},
+    { "_wxCommandEvent","_class_wxNotebookEvent",SwigwxNotebookEventTowxCommandEvent},
+    { "_wxCommandEvent","_wxNotebookEvent",SwigwxNotebookEventTowxCommandEvent},
+    { "_wxCommandEvent","_class_wxCommandEvent",0},
+    { "_wxSizeEvent","_class_wxSizeEvent",0},
+    { "_wxPoint","_class_wxPoint",0},
+    { "_class_wxButton","_wxButton",0},
+    { "_wxRadioBox","_class_wxRadioBox",0},
+    { "_wxBitmap","_class_wxBitmap",0},
+    { "_wxTaskBarIcon","_class_wxTaskBarIcon",0},
+    { "_wxPyTimer","_class_wxPyTimer",0},
+    { "_wxWindowDC","_class_wxWindowDC",0},
+    { "_wxScrollBar","_class_wxScrollBar",0},
+    { "_wxSpinButton","_class_wxSpinButton",0},
+    { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
+    { "_class_wxNotifyEvent","_class_wxNotebookEvent",SwigwxNotebookEventTowxNotifyEvent},
+    { "_class_wxNotifyEvent","_wxNotebookEvent",SwigwxNotebookEventTowxNotifyEvent},
+    { "_class_wxNotifyEvent","_wxNotifyEvent",0},
+    { "_class_wxPyEvent","_wxPyEvent",0},
+    { "_class_wxIconizeEvent","_wxIconizeEvent",0},
+    { "_class_wxStaticBitmap","_wxStaticBitmap",0},
+    { "_class_wxStaticLine","_wxStaticLine",0},
+    { "_wxScrollEvent","_class_wxScrollEvent",0},
+    { "_EBool","_wxPrintQuality",0},
+    { "_EBool","_signed_int",0},
+    { "_EBool","_int",0},
+    { "_EBool","_wxWindowID",0},
+    { "_class_wxRegion","_wxRegion",0},
+    { "_class_wxDropFilesEvent","_wxDropFilesEvent",0},
+    { "_wxStaticText","_class_wxStaticText",0},
+    { "_wxFont","_class_wxFont",0},
+    { "_wxCloseEvent","_class_wxCloseEvent",0},
+    { "_class_wxSplitterEvent","_wxSplitterEvent",0},
+    { "_wxNotebook","_class_wxNotebook",0},
+    { "_unsigned_long","_wxDash",0},
+    { "_unsigned_long","_long",0},
+    { "_class_wxRect","_wxRect",0},
+    { "_class_wxDC","_wxDC",0},
+    { "_class_wxPyTimer","_wxPyTimer",0},
+    { "_wxFocusEvent","_class_wxFocusEvent",0},
+    { "_wxMaximizeEvent","_class_wxMaximizeEvent",0},
+    { "_class_wxSpinButton","_wxSpinButton",0},
+    { "_wxAcceleratorEntry","_class_wxAcceleratorEntry",0},
+    { "_class_wxPanel","_class_wxGrid",SwigwxGridTowxPanel},
+    { "_class_wxPanel","_wxGrid",SwigwxGridTowxPanel},
+    { "_class_wxPanel","_wxPanel",0},
+    { "_class_wxCheckBox","_wxCheckBox",0},
+    { "_wxComboBox","_class_wxComboBox",0},
+    { "_wxRadioButton","_class_wxRadioButton",0},
+    { "_signed_int","_wxPrintQuality",0},
+    { "_signed_int","_EBool",0},
+    { "_signed_int","_wxWindowID",0},
+    { "_signed_int","_int",0},
+    { "_class_wxTextCtrl","_wxTextCtrl",0},
+    { "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
+    { "_wxMetaFileDC","_class_wxMetaFileDC",0},
+    { "_wxMenu","_class_wxMenu",0},
+    { "_class_wxMoveEvent","_wxMoveEvent",0},
+    { "_wxListBox","_class_wxListBox",0},
+    { "_wxScreenDC","_class_wxScreenDC",0},
+    { "_WXTYPE","_short",0},
+    { "_WXTYPE","_signed_short",0},
+    { "_WXTYPE","_unsigned_short",0},
+    { "_class_wxBrush","_wxBrush",0},
+    { "_unsigned_short","_WXTYPE",0},
+    { "_unsigned_short","_short",0},
+    { "_class_wxWindow","_class_wxSplitterWindow",SwigwxSplitterWindowTowxWindow},
+    { "_class_wxWindow","_wxSplitterWindow",SwigwxSplitterWindowTowxWindow},
+    { "_class_wxWindow","_class_wxNotebook",SwigwxNotebookTowxWindow},
+    { "_class_wxWindow","_wxNotebook",SwigwxNotebookTowxWindow},
+    { "_class_wxWindow","_class_wxGrid",SwigwxGridTowxWindow},
+    { "_class_wxWindow","_wxGrid",SwigwxGridTowxWindow},
+    { "_class_wxWindow","_wxWindow",0},
+    { "_wxSplitterWindow","_class_wxSplitterWindow",0},
+    { "_class_wxStaticText","_wxStaticText",0},
+    { "_class_wxFont","_wxFont",0},
+    { "_class_wxCloseEvent","_wxCloseEvent",0},
+    { "_class_wxMenuEvent","_wxMenuEvent",0},
+    { "_wxClientDC","_class_wxClientDC",0},
+    { "_wxMouseEvent","_class_wxMouseEvent",0},
+    { "_class_wxPoint","_wxPoint",0},
+    { "_wxRealPoint","_class_wxRealPoint",0},
+    { "_class_wxRadioBox","_wxRadioBox",0},
+    { "_wxGridCell","_class_wxGridCell",0},
+    { "_signed_short","_WXTYPE",0},
+    { "_signed_short","_short",0},
+    { "_wxMemoryDC","_class_wxMemoryDC",0},
+    { "_class_wxTaskBarIcon","_wxTaskBarIcon",0},
+    { "_wxPaintDC","_class_wxPaintDC",0},
+    { "_class_wxWindowDC","_wxWindowDC",0},
+    { "_class_wxFocusEvent","_wxFocusEvent",0},
+    { "_class_wxMaximizeEvent","_wxMaximizeEvent",0},
+    { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
+    { "_class_wxCursor","_wxCursor",0},
+    { "_wxScrolledWindow","_class_wxScrolledWindow",0},
+    { "_unsigned_char","_byte",0},
+    { "_class_wxMetaFileDC","_wxMetaFileDC",0},
+    { "_class_wxMenu","_wxMenu",0},
+    { "_wxControl","_class_wxNotebook",SwigwxNotebookTowxControl},
+    { "_wxControl","_wxNotebook",SwigwxNotebookTowxControl},
+    { "_wxControl","_class_wxControl",0},
+    { "_class_wxListBox","_wxListBox",0},
+    { "_unsigned_int","_wxPrintQuality",0},
+    { "_unsigned_int","_size_t",0},
+    { "_unsigned_int","_uint",0},
+    { "_unsigned_int","_wxWindowID",0},
+    { "_unsigned_int","_int",0},
+    { "_wxIcon","_class_wxIcon",0},
+    { "_wxDialog","_class_wxDialog",0},
+    { "_class_wxPen","_wxPen",0},
+    { "_short","_WXTYPE",0},
+    { "_short","_unsigned_short",0},
+    { "_short","_signed_short",0},
+    { "_class_wxStaticBox","_wxStaticBox",0},
+    { "_class_wxScrollEvent","_wxScrollEvent",0},
+    { "_wxJoystickEvent","_class_wxJoystickEvent",0},
+    { "_class_wxChoice","_wxChoice",0},
+    { "_class_wxSlider","_wxSlider",0},
+    { "_class_wxImageList","_wxImageList",0},
+    { "_class_wxBitmapButton","_wxBitmapButton",0},
+    { "_class_wxNotebook","_wxNotebook",0},
+    { "_wxWindowID","_wxPrintQuality",0},
+    { "_wxWindowID","_size_t",0},
+    { "_wxWindowID","_EBool",0},
+    { "_wxWindowID","_uint",0},
+    { "_wxWindowID","_int",0},
+    { "_wxWindowID","_signed_int",0},
+    { "_wxWindowID","_unsigned_int",0},
+    { "_int","_wxPrintQuality",0},
+    { "_int","_size_t",0},
+    { "_int","_EBool",0},
+    { "_int","_uint",0},
+    { "_int","_wxWindowID",0},
+    { "_int","_unsigned_int",0},
+    { "_int","_signed_int",0},
+    { "_class_wxMouseEvent","_wxMouseEvent",0},
+    { "_class_wxSpinEvent","_wxSpinEvent",0},
+    { "_wxButton","_class_wxButton",0},
+    { "_wxSize","_class_wxSize",0},
+    { "_wxRegionIterator","_class_wxRegionIterator",0},
+    { "_class_wxPrinterDC","_wxPrinterDC",0},
+    { "_class_wxPaintDC","_wxPaintDC",0},
+    { "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0},
+    { "_class_wxInitDialogEvent","_wxInitDialogEvent",0},
+    { "_class_wxComboBox","_wxComboBox",0},
+    { "_class_wxRadioButton","_wxRadioButton",0},
+    { "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
+    { "_wxIconizeEvent","_class_wxIconizeEvent",0},
+    { "_class_wxControl","_class_wxNotebook",SwigwxNotebookTowxControl},
+    { "_class_wxControl","_wxNotebook",SwigwxNotebookTowxControl},
+    { "_class_wxControl","_wxControl",0},
+    { "_wxStaticBitmap","_class_wxStaticBitmap",0},
+    { "_class_wxIcon","_wxIcon",0},
+    { "_class_wxColour","_wxColour",0},
+    { "_class_wxScreenDC","_wxScreenDC",0},
+    { "_wxPalette","_class_wxPalette",0},
+    { "_class_wxIdleEvent","_wxIdleEvent",0},
+    { "_wxEraseEvent","_class_wxEraseEvent",0},
+    { "_class_wxJoystickEvent","_wxJoystickEvent",0},
+    { "_wxRegion","_class_wxRegion",0},
+    { "_class_wxSplitterWindow","_wxSplitterWindow",0},
+    { "_class_wxShowEvent","_wxShowEvent",0},
+    { "_wxActivateEvent","_class_wxActivateEvent",0},
+    { "_wxGauge","_class_wxGauge",0},
+    { "_class_wxCheckListBox","_wxCheckListBox",0},
+    { "_class_wxGridEvent","_wxGridEvent",0},
+    { "_class_wxCommandEvent","_class_wxSplitterEvent",SwigwxSplitterEventTowxCommandEvent},
+    { "_class_wxCommandEvent","_wxSplitterEvent",SwigwxSplitterEventTowxCommandEvent},
+    { "_class_wxCommandEvent","_class_wxNotebookEvent",SwigwxNotebookEventTowxCommandEvent},
+    { "_class_wxCommandEvent","_wxNotebookEvent",SwigwxNotebookEventTowxCommandEvent},
+    { "_class_wxCommandEvent","_wxCommandEvent",0},
+    { "_class_wxClientDC","_wxClientDC",0},
+    { "_class_wxSizeEvent","_wxSizeEvent",0},
+    { "_class_wxGridCell","_wxGridCell",0},
+    { "_class_wxSize","_wxSize",0},
+    { "_class_wxBitmap","_wxBitmap",0},
+    { "_class_wxMemoryDC","_wxMemoryDC",0},
+    { "_wxMenuBar","_class_wxMenuBar",0},
+    { "_wxEvtHandler","_class_wxTaskBarIcon",SwigwxTaskBarIconTowxEvtHandler},
+    { "_wxEvtHandler","_wxTaskBarIcon",SwigwxTaskBarIconTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxSplitterWindow",SwigwxSplitterWindowTowxEvtHandler},
+    { "_wxEvtHandler","_wxSplitterWindow",SwigwxSplitterWindowTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxNotebook",SwigwxNotebookTowxEvtHandler},
+    { "_wxEvtHandler","_wxNotebook",SwigwxNotebookTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxGrid",SwigwxGridTowxEvtHandler},
+    { "_wxEvtHandler","_wxGrid",SwigwxGridTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxEvtHandler",0},
+    { "_wxMenuItem","_class_wxMenuItem",0},
+    { "_class_wxScrollBar","_wxScrollBar",0},
+    { "_wxDash","_unsigned_long",0},
+    { "_wxDash","_long",0},
+    { "_class_wxScrolledWindow","_wxScrolledWindow",0},
+    { "_wxKeyEvent","_class_wxKeyEvent",0},
+    { "_wxMoveEvent","_class_wxMoveEvent",0},
+    { "_class_wxPalette","_wxPalette",0},
+    { "_class_wxEraseEvent","_wxEraseEvent",0},
+    { "_wxWindow","_class_wxSplitterWindow",SwigwxSplitterWindowTowxWindow},
+    { "_wxWindow","_wxSplitterWindow",SwigwxSplitterWindowTowxWindow},
+    { "_wxWindow","_class_wxNotebook",SwigwxNotebookTowxWindow},
+    { "_wxWindow","_wxNotebook",SwigwxNotebookTowxWindow},
+    { "_wxWindow","_class_wxGrid",SwigwxGridTowxWindow},
+    { "_wxWindow","_wxGrid",SwigwxGridTowxWindow},
+    { "_wxWindow","_class_wxWindow",0},
+{0,0,0}};
+

 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif
 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif

-SWIGEXPORT(void,initwindows2c)() {
+SWIGEXPORT(void) initwindows2c() {

         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("windows2c", windows2cMethods);
         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("windows2c", windows2cMethods);


@@ -4872,310 +5526,9 @@ SWIGEXPORT(void,initwindows2c)() {
         PyDict_SetItemString(d,"wxEVT_TASKBAR_RIGHT_UP", PyInt_FromLong((long) wxEVT_TASKBAR_RIGHT_UP));
         PyDict_SetItemString(d,"wxEVT_TASKBAR_LEFT_DCLICK", PyInt_FromLong((long) wxEVT_TASKBAR_LEFT_DCLICK));
         PyDict_SetItemString(d,"wxEVT_TASKBAR_RIGHT_DCLICK", PyInt_FromLong((long) wxEVT_TASKBAR_RIGHT_DCLICK));
         PyDict_SetItemString(d,"wxEVT_TASKBAR_RIGHT_UP", PyInt_FromLong((long) wxEVT_TASKBAR_RIGHT_UP));
         PyDict_SetItemString(d,"wxEVT_TASKBAR_LEFT_DCLICK", PyInt_FromLong((long) wxEVT_TASKBAR_LEFT_DCLICK));
         PyDict_SetItemString(d,"wxEVT_TASKBAR_RIGHT_DCLICK", PyInt_FromLong((long) wxEVT_TASKBAR_RIGHT_DCLICK));

-/*
- * These are the pointer type-equivalency mappings. 
- * (Used by the SWIG pointer type-checker).
- */
-        SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_wxEvent","_class_wxSplitterEvent",SwigwxSplitterEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_wxSplitterEvent",SwigwxSplitterEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_class_wxNotebookEvent",SwigwxNotebookEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_wxNotebookEvent",SwigwxNotebookEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_class_wxGridEvent",SwigwxGridEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_wxGridEvent",SwigwxGridEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_class_wxEvent",0);
-        SWIG_RegisterMapping("_class_wxActivateEvent","_wxActivateEvent",0);
-        SWIG_RegisterMapping("_signed_long","_long",0);
-        SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_signed_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_unsigned_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_wxWindowID",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_uint",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_EBool",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_size_t",0);
-        SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
-        SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxTaskBarIcon",SwigwxTaskBarIconTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxTaskBarIcon",SwigwxTaskBarIconTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxSplitterWindow",SwigwxSplitterWindowTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxSplitterWindow",SwigwxSplitterWindowTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxNotebook",SwigwxNotebookTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxNotebook",SwigwxNotebookTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxGrid",SwigwxGridTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxGrid",SwigwxGridTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxEvtHandler",0);
-        SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
-        SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
-        SWIG_RegisterMapping("_wxNotifyEvent","_class_wxNotebookEvent",SwigwxNotebookEventTowxNotifyEvent);
-        SWIG_RegisterMapping("_wxNotifyEvent","_wxNotebookEvent",SwigwxNotebookEventTowxNotifyEvent);
-        SWIG_RegisterMapping("_wxNotifyEvent","_class_wxNotifyEvent",0);
-        SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
-        SWIG_RegisterMapping("_wxGrid","_class_wxGrid",0);
-        SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
-        SWIG_RegisterMapping("_wxUpdateUIEvent","_class_wxUpdateUIEvent",0);
-        SWIG_RegisterMapping("_byte","_unsigned_char",0);
-        SWIG_RegisterMapping("_wxStaticBox","_class_wxStaticBox",0);
-        SWIG_RegisterMapping("_wxChoice","_class_wxChoice",0);
-        SWIG_RegisterMapping("_wxSlider","_class_wxSlider",0);
-        SWIG_RegisterMapping("_wxNotebookEvent","_class_wxNotebookEvent",0);
-        SWIG_RegisterMapping("_long","_wxDash",0);
-        SWIG_RegisterMapping("_long","_unsigned_long",0);
-        SWIG_RegisterMapping("_long","_signed_long",0);
-        SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0);
-        SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0);
-        SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_class_wxGauge","_wxGauge",0);
-        SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
-        SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0);
-        SWIG_RegisterMapping("_size_t","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_size_t","_unsigned_int",0);
-        SWIG_RegisterMapping("_size_t","_int",0);
-        SWIG_RegisterMapping("_size_t","_wxWindowID",0);
-        SWIG_RegisterMapping("_size_t","_uint",0);
-        SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
-        SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0);
-        SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0);
-        SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0);
-        SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0);
-        SWIG_RegisterMapping("_wxPanel","_class_wxGrid",SwigwxGridTowxPanel);
-        SWIG_RegisterMapping("_wxPanel","_wxGrid",SwigwxGridTowxPanel);
-        SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);
-        SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
-        SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
-        SWIG_RegisterMapping("_wxPyEvent","_class_wxPyEvent",0);
-        SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);
-        SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
-        SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0);
-        SWIG_RegisterMapping("_class_wxGrid","_wxGrid",0);
-        SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
-        SWIG_RegisterMapping("_class_wxDialog","_wxDialog",0);
-        SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0);
-        SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0);
-        SWIG_RegisterMapping("_wxStaticLine","_class_wxStaticLine",0);
-        SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
-        SWIG_RegisterMapping("_class_wxNotebookEvent","_wxNotebookEvent",0);
-        SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0);
-        SWIG_RegisterMapping("_uint","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_uint","_size_t",0);
-        SWIG_RegisterMapping("_uint","_unsigned_int",0);
-        SWIG_RegisterMapping("_uint","_int",0);
-        SWIG_RegisterMapping("_uint","_wxWindowID",0);
-        SWIG_RegisterMapping("_class_wxEvent","_class_wxSplitterEvent",SwigwxSplitterEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxSplitterEvent",SwigwxSplitterEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_class_wxNotebookEvent",SwigwxNotebookEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxNotebookEvent",SwigwxNotebookEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_class_wxGridEvent",SwigwxGridEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxGridEvent",SwigwxGridEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxEvent",0);
-        SWIG_RegisterMapping("_wxCheckListBox","_class_wxCheckListBox",0);
-        SWIG_RegisterMapping("_wxSplitterEvent","_class_wxSplitterEvent",0);
-        SWIG_RegisterMapping("_wxGridEvent","_class_wxGridEvent",0);
-        SWIG_RegisterMapping("_wxRect","_class_wxRect",0);
-        SWIG_RegisterMapping("_wxCommandEvent","_class_wxSplitterEvent",SwigwxSplitterEventTowxCommandEvent);
-        SWIG_RegisterMapping("_wxCommandEvent","_wxSplitterEvent",SwigwxSplitterEventTowxCommandEvent);
-        SWIG_RegisterMapping("_wxCommandEvent","_class_wxNotebookEvent",SwigwxNotebookEventTowxCommandEvent);
-        SWIG_RegisterMapping("_wxCommandEvent","_wxNotebookEvent",SwigwxNotebookEventTowxCommandEvent);
-        SWIG_RegisterMapping("_wxCommandEvent","_class_wxCommandEvent",0);
-        SWIG_RegisterMapping("_wxSizeEvent","_class_wxSizeEvent",0);
-        SWIG_RegisterMapping("_wxPoint","_class_wxPoint",0);
-        SWIG_RegisterMapping("_class_wxButton","_wxButton",0);
-        SWIG_RegisterMapping("_wxRadioBox","_class_wxRadioBox",0);
-        SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
-        SWIG_RegisterMapping("_wxTaskBarIcon","_class_wxTaskBarIcon",0);
-        SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0);
-        SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0);
-        SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0);
-        SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_class_wxNotifyEvent","_class_wxNotebookEvent",SwigwxNotebookEventTowxNotifyEvent);
-        SWIG_RegisterMapping("_class_wxNotifyEvent","_wxNotebookEvent",SwigwxNotebookEventTowxNotifyEvent);
-        SWIG_RegisterMapping("_class_wxNotifyEvent","_wxNotifyEvent",0);
-        SWIG_RegisterMapping("_class_wxPyEvent","_wxPyEvent",0);
-        SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
-        SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
-        SWIG_RegisterMapping("_class_wxStaticLine","_wxStaticLine",0);
-        SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0);
-        SWIG_RegisterMapping("_EBool","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_EBool","_signed_int",0);
-        SWIG_RegisterMapping("_EBool","_int",0);
-        SWIG_RegisterMapping("_EBool","_wxWindowID",0);
-        SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
-        SWIG_RegisterMapping("_class_wxDropFilesEvent","_wxDropFilesEvent",0);
-        SWIG_RegisterMapping("_wxStaticText","_class_wxStaticText",0);
-        SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
-        SWIG_RegisterMapping("_wxCloseEvent","_class_wxCloseEvent",0);
-        SWIG_RegisterMapping("_class_wxSplitterEvent","_wxSplitterEvent",0);
-        SWIG_RegisterMapping("_wxNotebook","_class_wxNotebook",0);
-        SWIG_RegisterMapping("_unsigned_long","_wxDash",0);
-        SWIG_RegisterMapping("_unsigned_long","_long",0);
-        SWIG_RegisterMapping("_class_wxRect","_wxRect",0);
-        SWIG_RegisterMapping("_class_wxDC","_wxDC",0);
-        SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxFocusEvent","_class_wxFocusEvent",0);
-        SWIG_RegisterMapping("_wxMaximizeEvent","_class_wxMaximizeEvent",0);
-        SWIG_RegisterMapping("_class_wxSpinButton","_wxSpinButton",0);
-        SWIG_RegisterMapping("_wxAcceleratorEntry","_class_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_class_wxPanel","_class_wxGrid",SwigwxGridTowxPanel);
-        SWIG_RegisterMapping("_class_wxPanel","_wxGrid",SwigwxGridTowxPanel);
-        SWIG_RegisterMapping("_class_wxPanel","_wxPanel",0);
-        SWIG_RegisterMapping("_class_wxCheckBox","_wxCheckBox",0);
-        SWIG_RegisterMapping("_wxComboBox","_class_wxComboBox",0);
-        SWIG_RegisterMapping("_wxRadioButton","_class_wxRadioButton",0);
-        SWIG_RegisterMapping("_signed_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_signed_int","_EBool",0);
-        SWIG_RegisterMapping("_signed_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_signed_int","_int",0);
-        SWIG_RegisterMapping("_class_wxTextCtrl","_wxTextCtrl",0);
-        SWIG_RegisterMapping("_wxLayoutConstraints","_class_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_wxMetaFileDC","_class_wxMetaFileDC",0);
-        SWIG_RegisterMapping("_wxMenu","_class_wxMenu",0);
-        SWIG_RegisterMapping("_class_wxMoveEvent","_wxMoveEvent",0);
-        SWIG_RegisterMapping("_wxListBox","_class_wxListBox",0);
-        SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0);
-        SWIG_RegisterMapping("_WXTYPE","_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_signed_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_unsigned_short",0);
-        SWIG_RegisterMapping("_class_wxBrush","_wxBrush",0);
-        SWIG_RegisterMapping("_unsigned_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_unsigned_short","_short",0);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxSplitterWindow",SwigwxSplitterWindowTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxSplitterWindow",SwigwxSplitterWindowTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxNotebook",SwigwxNotebookTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxNotebook",SwigwxNotebookTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxGrid",SwigwxGridTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxGrid",SwigwxGridTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxWindow",0);
-        SWIG_RegisterMapping("_wxSplitterWindow","_class_wxSplitterWindow",0);
-        SWIG_RegisterMapping("_class_wxStaticText","_wxStaticText",0);
-        SWIG_RegisterMapping("_class_wxFont","_wxFont",0);
-        SWIG_RegisterMapping("_class_wxCloseEvent","_wxCloseEvent",0);
-        SWIG_RegisterMapping("_class_wxMenuEvent","_wxMenuEvent",0);
-        SWIG_RegisterMapping("_wxClientDC","_class_wxClientDC",0);
-        SWIG_RegisterMapping("_wxMouseEvent","_class_wxMouseEvent",0);
-        SWIG_RegisterMapping("_class_wxPoint","_wxPoint",0);
-        SWIG_RegisterMapping("_wxRealPoint","_class_wxRealPoint",0);
-        SWIG_RegisterMapping("_class_wxRadioBox","_wxRadioBox",0);
-        SWIG_RegisterMapping("_wxGridCell","_class_wxGridCell",0);
-        SWIG_RegisterMapping("_signed_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_signed_short","_short",0);
-        SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0);
-        SWIG_RegisterMapping("_class_wxTaskBarIcon","_wxTaskBarIcon",0);
-        SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
-        SWIG_RegisterMapping("_class_wxWindowDC","_wxWindowDC",0);
-        SWIG_RegisterMapping("_class_wxFocusEvent","_wxFocusEvent",0);
-        SWIG_RegisterMapping("_class_wxMaximizeEvent","_wxMaximizeEvent",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
-        SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0);
-        SWIG_RegisterMapping("_unsigned_char","_byte",0);
-        SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0);
-        SWIG_RegisterMapping("_class_wxMenu","_wxMenu",0);
-        SWIG_RegisterMapping("_wxControl","_class_wxNotebook",SwigwxNotebookTowxControl);
-        SWIG_RegisterMapping("_wxControl","_wxNotebook",SwigwxNotebookTowxControl);
-        SWIG_RegisterMapping("_wxControl","_class_wxControl",0);
-        SWIG_RegisterMapping("_class_wxListBox","_wxListBox",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_unsigned_int","_size_t",0);
-        SWIG_RegisterMapping("_unsigned_int","_uint",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_unsigned_int","_int",0);
-        SWIG_RegisterMapping("_wxIcon","_class_wxIcon",0);
-        SWIG_RegisterMapping("_wxDialog","_class_wxDialog",0);
-        SWIG_RegisterMapping("_class_wxPen","_wxPen",0);
-        SWIG_RegisterMapping("_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_short","_unsigned_short",0);
-        SWIG_RegisterMapping("_short","_signed_short",0);
-        SWIG_RegisterMapping("_class_wxStaticBox","_wxStaticBox",0);
-        SWIG_RegisterMapping("_class_wxScrollEvent","_wxScrollEvent",0);
-        SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0);
-        SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
-        SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);
-        SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0);
-        SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
-        SWIG_RegisterMapping("_class_wxNotebook","_wxNotebook",0);
-        SWIG_RegisterMapping("_wxWindowID","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_wxWindowID","_size_t",0);
-        SWIG_RegisterMapping("_wxWindowID","_EBool",0);
-        SWIG_RegisterMapping("_wxWindowID","_uint",0);
-        SWIG_RegisterMapping("_wxWindowID","_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_signed_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_int","_size_t",0);
-        SWIG_RegisterMapping("_int","_EBool",0);
-        SWIG_RegisterMapping("_int","_uint",0);
-        SWIG_RegisterMapping("_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_int","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_signed_int",0);
-        SWIG_RegisterMapping("_class_wxMouseEvent","_wxMouseEvent",0);
-        SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0);
-        SWIG_RegisterMapping("_wxButton","_class_wxButton",0);
-        SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
-        SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
-        SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
-        SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
-        SWIG_RegisterMapping("_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0);
-        SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0);
-        SWIG_RegisterMapping("_class_wxComboBox","_wxComboBox",0);
-        SWIG_RegisterMapping("_class_wxRadioButton","_wxRadioButton",0);
-        SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_wxIconizeEvent","_class_wxIconizeEvent",0);
-        SWIG_RegisterMapping("_class_wxControl","_class_wxNotebook",SwigwxNotebookTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_wxNotebook",SwigwxNotebookTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_wxControl",0);
-        SWIG_RegisterMapping("_wxStaticBitmap","_class_wxStaticBitmap",0);
-        SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
-        SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
-        SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
-        SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
-        SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0);
-        SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
-        SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
-        SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
-        SWIG_RegisterMapping("_class_wxSplitterWindow","_wxSplitterWindow",0);
-        SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
-        SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
-        SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0);
-        SWIG_RegisterMapping("_class_wxCheckListBox","_wxCheckListBox",0);
-        SWIG_RegisterMapping("_class_wxGridEvent","_wxGridEvent",0);
-        SWIG_RegisterMapping("_class_wxCommandEvent","_class_wxSplitterEvent",SwigwxSplitterEventTowxCommandEvent);
-        SWIG_RegisterMapping("_class_wxCommandEvent","_wxSplitterEvent",SwigwxSplitterEventTowxCommandEvent);
-        SWIG_RegisterMapping("_class_wxCommandEvent","_class_wxNotebookEvent",SwigwxNotebookEventTowxCommandEvent);
-        SWIG_RegisterMapping("_class_wxCommandEvent","_wxNotebookEvent",SwigwxNotebookEventTowxCommandEvent);
-        SWIG_RegisterMapping("_class_wxCommandEvent","_wxCommandEvent",0);
-        SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
-        SWIG_RegisterMapping("_class_wxSizeEvent","_wxSizeEvent",0);
-        SWIG_RegisterMapping("_class_wxGridCell","_wxGridCell",0);
-        SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
-        SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0);
-        SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0);
-        SWIG_RegisterMapping("_wxMenuBar","_class_wxMenuBar",0);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxTaskBarIcon",SwigwxTaskBarIconTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxTaskBarIcon",SwigwxTaskBarIconTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxSplitterWindow",SwigwxSplitterWindowTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxSplitterWindow",SwigwxSplitterWindowTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxNotebook",SwigwxNotebookTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxNotebook",SwigwxNotebookTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxGrid",SwigwxGridTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxGrid",SwigwxGridTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxEvtHandler",0);
-        SWIG_RegisterMapping("_wxMenuItem","_class_wxMenuItem",0);
-        SWIG_RegisterMapping("_class_wxScrollBar","_wxScrollBar",0);
-        SWIG_RegisterMapping("_wxDash","_unsigned_long",0);
-        SWIG_RegisterMapping("_wxDash","_long",0);
-        SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
-        SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0);
-        SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0);
-        SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
-        SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0);
-        SWIG_RegisterMapping("_wxWindow","_class_wxSplitterWindow",SwigwxSplitterWindowTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxSplitterWindow",SwigwxSplitterWindowTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxNotebook",SwigwxNotebookTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxNotebook",SwigwxNotebookTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxGrid",SwigwxGridTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxGrid",SwigwxGridTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxWindow",0);
+{
+   int i;
+   for (i = 0; _swig_mapping[i].n1; i++)
+        SWIG_RegisterMapping(_swig_mapping[i].n1,_swig_mapping[i].n2,_swig_mapping[i].pcnv);
+}

 }
 }

diff --git a/utils/wxPython/src/msw/windows2.py b/utils/wxPython/src/msw/windows2.py
index cf7775b739c9cb28559d8a32dc264e2a437bfa17..4020eecafc9642f3da5b2303100887415955d8c8 100644 (file)
--- a/utils/wxPython/src/msw/windows2.py
+++ b/utils/wxPython/src/msw/windows2.py
@@ -15,58 +15,58 @@ class wxGridCellPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self, windows2c=windows2c):
+    def __del__(self,windows2c=windows2c):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            windows2c.delete_wxGridCell(self.this)
-    def GetTextValue(self):
-        val = windows2c.wxGridCell_GetTextValue(self.this)
+            windows2c.delete_wxGridCell(self)
+    def GetTextValue(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGridCell_GetTextValue,(self,) + _args, _kwargs)

         return val
         return val

-    def SetTextValue(self,arg0):
-        val = windows2c.wxGridCell_SetTextValue(self.this,arg0)
+    def SetTextValue(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGridCell_SetTextValue,(self,) + _args, _kwargs)

         return val
         return val

-    def GetFont(self):
-        val = windows2c.wxGridCell_GetFont(self.this)
-        val = wxFontPtr(val)
+    def GetFont(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGridCell_GetFont,(self,) + _args, _kwargs)
+        if val: val = wxFontPtr(val) 

         return val
         return val

-    def SetFont(self,arg0):
-        val = windows2c.wxGridCell_SetFont(self.this,arg0.this)
+    def SetFont(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGridCell_SetFont,(self,) + _args, _kwargs)

         return val
         return val

-    def GetTextColour(self):
-        val = windows2c.wxGridCell_GetTextColour(self.this)
-        val = wxColourPtr(val)
+    def GetTextColour(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGridCell_GetTextColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) 

         return val
         return val

-    def SetTextColour(self,arg0):
-        val = windows2c.wxGridCell_SetTextColour(self.this,arg0.this)
+    def SetTextColour(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGridCell_SetTextColour,(self,) + _args, _kwargs)

         return val
         return val

-    def GetBackgroundColour(self):
-        val = windows2c.wxGridCell_GetBackgroundColour(self.this)
-        val = wxColourPtr(val)
+    def GetBackgroundColour(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGridCell_GetBackgroundColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) 

         return val
         return val

-    def SetBackgroundColour(self,arg0):
-        val = windows2c.wxGridCell_SetBackgroundColour(self.this,arg0.this)
+    def SetBackgroundColour(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGridCell_SetBackgroundColour,(self,) + _args, _kwargs)

         return val
         return val

-    def GetBackgroundBrush(self):
-        val = windows2c.wxGridCell_GetBackgroundBrush(self.this)
-        val = wxBrushPtr(val)
+    def GetBackgroundBrush(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGridCell_GetBackgroundBrush,(self,) + _args, _kwargs)
+        if val: val = wxBrushPtr(val) 

         return val
         return val

-    def GetAlignment(self):
-        val = windows2c.wxGridCell_GetAlignment(self.this)
+    def GetAlignment(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGridCell_GetAlignment,(self,) + _args, _kwargs)

         return val
         return val

-    def SetAlignment(self,arg0):
-        val = windows2c.wxGridCell_SetAlignment(self.this,arg0)
+    def SetAlignment(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGridCell_SetAlignment,(self,) + _args, _kwargs)

         return val
         return val

-    def GetCellBitmap(self):
-        val = windows2c.wxGridCell_GetCellBitmap(self.this)
-        val = wxBitmapPtr(val)
+    def GetCellBitmap(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGridCell_GetCellBitmap,(self,) + _args, _kwargs)
+        if val: val = wxBitmapPtr(val) 

         return val
         return val

-    def SetCellBitmap(self,arg0):
-        val = windows2c.wxGridCell_SetCellBitmap(self.this,arg0.this)
+    def SetCellBitmap(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGridCell_SetCellBitmap,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxGridCell instance>"
+        return "<C wxGridCell instance at %s>" % (self.this,)

 class wxGridCell(wxGridCellPtr):
 class wxGridCell(wxGridCellPtr):

-    def __init__(self) :
-        self.this = windows2c.new_wxGridCell()
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(windows2c.new_wxGridCell,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -76,233 +76,226 @@ class wxGridPtr(wxPanelPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def AdjustScrollbars(self):
-        val = windows2c.wxGrid_AdjustScrollbars(self.this)
+    def AdjustScrollbars(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_AdjustScrollbars,(self,) + _args, _kwargs)

         return val
         return val

-    def AppendCols(self,*args):
-        val = apply(windows2c.wxGrid_AppendCols,(self.this,)+args)
+    def AppendCols(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_AppendCols,(self,) + _args, _kwargs)

         return val
         return val

-    def AppendRows(self,*args):
-        val = apply(windows2c.wxGrid_AppendRows,(self.this,)+args)
+    def AppendRows(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_AppendRows,(self,) + _args, _kwargs)

         return val
         return val

-    def BeginBatch(self):
-        val = windows2c.wxGrid_BeginBatch(self.this)
+    def BeginBatch(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_BeginBatch,(self,) + _args, _kwargs)

         return val
         return val

-    def CellHitTest(self,arg0,arg1):
-        val = windows2c.wxGrid_CellHitTest(self.this,arg0,arg1)
+    def CellHitTest(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_CellHitTest,(self,) + _args, _kwargs)

         return val
         return val

-    def CreateGrid(self,arg0,arg1,*args):
-        val = apply(windows2c.wxGrid_CreateGrid,(self.this,arg0,arg1,)+args)
+    def CreateGrid(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_CreateGrid,(self,) + _args, _kwargs)

         return val
         return val

-    def CurrentCellVisible(self):
-        val = windows2c.wxGrid_CurrentCellVisible(self.this)
+    def CurrentCellVisible(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_CurrentCellVisible,(self,) + _args, _kwargs)

         return val
         return val

-    def DeleteCols(self,*args):
-        val = apply(windows2c.wxGrid_DeleteCols,(self.this,)+args)
+    def DeleteCols(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_DeleteCols,(self,) + _args, _kwargs)

         return val
         return val

-    def DeleteRows(self,*args):
-        val = apply(windows2c.wxGrid_DeleteRows,(self.this,)+args)
+    def DeleteRows(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_DeleteRows,(self,) + _args, _kwargs)

         return val
         return val

-    def EndBatch(self):
-        val = windows2c.wxGrid_EndBatch(self.this)
+    def EndBatch(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_EndBatch,(self,) + _args, _kwargs)

         return val
         return val

-    def GetBatchCount(self):
-        val = windows2c.wxGrid_GetBatchCount(self.this)
+    def GetBatchCount(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_GetBatchCount,(self,) + _args, _kwargs)

         return val
         return val

-    def GetCell(self,arg0,arg1):
-        val = windows2c.wxGrid_GetCell(self.this,arg0,arg1)
-        val = wxGridCellPtr(val)
+    def GetCell(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_GetCell,(self,) + _args, _kwargs)
+        if val: val = wxGridCellPtr(val) 

         return val
         return val

-    def GetCellAlignment(self,arg0,arg1):
-        val = windows2c.wxGrid_GetCellAlignment(self.this,arg0,arg1)
+    def GetCellAlignment(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_GetCellAlignment,(self,) + _args, _kwargs)

         return val
         return val

-    def GetDefCellAlignment(self):
-        val = windows2c.wxGrid_GetDefCellAlignment(self.this)
+    def GetDefCellAlignment(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_GetDefCellAlignment,(self,) + _args, _kwargs)

         return val
         return val

-    def GetCellBackgroundColour(self,arg0,arg1):
-        val = windows2c.wxGrid_GetCellBackgroundColour(self.this,arg0,arg1)
-        val = wxColourPtr(val)
+    def GetCellBackgroundColour(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_GetCellBackgroundColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) 

         return val
         return val

-    def GetDefCellBackgroundColour(self):
-        val = windows2c.wxGrid_GetDefCellBackgroundColour(self.this)
-        val = wxColourPtr(val)
+    def GetDefCellBackgroundColour(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_GetDefCellBackgroundColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) 

         return val
         return val

-    def GetCells(self):
-        val = windows2c.wxGrid_GetCells(self.this)
+    def GetCells(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_GetCells,(self,) + _args, _kwargs)

         return val
         return val

-    def GetCellTextColour(self,arg0,arg1):
-        val = windows2c.wxGrid_GetCellTextColour(self.this,arg0,arg1)
-        val = wxColourPtr(val)
+    def GetCellTextColour(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_GetCellTextColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) 

         return val
         return val

-    def GetDefCellTextColour(self):
-        val = windows2c.wxGrid_GetDefCellTextColour(self.this)
-        val = wxColourPtr(val)
+    def GetDefCellTextColour(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_GetDefCellTextColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) 

         return val
         return val

-    def GetCellTextFont(self,arg0,arg1):
-        val = windows2c.wxGrid_GetCellTextFont(self.this,arg0,arg1)
-        val = wxFontPtr(val)
+    def GetCellTextFont(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_GetCellTextFont,(self,) + _args, _kwargs)
+        if val: val = wxFontPtr(val) 

         return val
         return val

-    def GetDefCellTextFont(self):
-        val = windows2c.wxGrid_GetDefCellTextFont(self.this)
-        val = wxFontPtr(val)
+    def GetDefCellTextFont(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_GetDefCellTextFont,(self,) + _args, _kwargs)
+        if val: val = wxFontPtr(val) 

         return val
         return val

-    def GetCellValue(self,arg0,arg1):
-        val = windows2c.wxGrid_GetCellValue(self.this,arg0,arg1)
+    def GetCellValue(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_GetCellValue,(self,) + _args, _kwargs)

         return val
         return val

-    def GetCols(self):
-        val = windows2c.wxGrid_GetCols(self.this)
+    def GetCols(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_GetCols,(self,) + _args, _kwargs)

         return val
         return val

-    def GetColumnWidth(self,arg0):
-        val = windows2c.wxGrid_GetColumnWidth(self.this,arg0)
+    def GetColumnWidth(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_GetColumnWidth,(self,) + _args, _kwargs)

         return val
         return val

-    def GetCurrentRect(self):
-        val = windows2c.wxGrid_GetCurrentRect(self.this)
-        val = wxRectPtr(val)
-        val.thisown = 1
+    def GetCurrentRect(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_GetCurrentRect,(self,) + _args, _kwargs)
+        if val: val = wxRectPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetCursorColumn(self):
-        val = windows2c.wxGrid_GetCursorColumn(self.this)
+    def GetCursorColumn(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_GetCursorColumn,(self,) + _args, _kwargs)

         return val
         return val

-    def GetCursorRow(self):
-        val = windows2c.wxGrid_GetCursorRow(self.this)
+    def GetCursorRow(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_GetCursorRow,(self,) + _args, _kwargs)

         return val
         return val

-    def GetEditable(self):
-        val = windows2c.wxGrid_GetEditable(self.this)
+    def GetEditable(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_GetEditable,(self,) + _args, _kwargs)

         return val
         return val

-    def GetHorizScrollBar(self):
-        val = windows2c.wxGrid_GetHorizScrollBar(self.this)
-        val = wxScrollBarPtr(val)
+    def GetHorizScrollBar(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_GetHorizScrollBar,(self,) + _args, _kwargs)
+        if val: val = wxScrollBarPtr(val) 

         return val
         return val

-    def GetLabelAlignment(self,arg0):
-        val = windows2c.wxGrid_GetLabelAlignment(self.this,arg0)
+    def GetLabelAlignment(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_GetLabelAlignment,(self,) + _args, _kwargs)

         return val
         return val

-    def GetLabelBackgroundColour(self):
-        val = windows2c.wxGrid_GetLabelBackgroundColour(self.this)
-        val = wxColourPtr(val)
+    def GetLabelBackgroundColour(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_GetLabelBackgroundColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) 

         return val
         return val

-    def GetLabelSize(self,arg0):
-        val = windows2c.wxGrid_GetLabelSize(self.this,arg0)
+    def GetLabelSize(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_GetLabelSize,(self,) + _args, _kwargs)

         return val
         return val

-    def GetLabelTextColour(self):
-        val = windows2c.wxGrid_GetLabelTextColour(self.this)
-        val = wxColourPtr(val)
+    def GetLabelTextColour(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_GetLabelTextColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) 

         return val
         return val

-    def GetLabelTextFont(self):
-        val = windows2c.wxGrid_GetLabelTextFont(self.this)
-        val = wxFontPtr(val)
+    def GetLabelTextFont(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_GetLabelTextFont,(self,) + _args, _kwargs)
+        if val: val = wxFontPtr(val) 

         return val
         return val

-    def GetLabelValue(self,arg0,arg1):
-        val = windows2c.wxGrid_GetLabelValue(self.this,arg0,arg1)
+    def GetLabelValue(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_GetLabelValue,(self,) + _args, _kwargs)

         return val
         return val

-    def GetRowHeight(self,arg0):
-        val = windows2c.wxGrid_GetRowHeight(self.this,arg0)
+    def GetRowHeight(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_GetRowHeight,(self,) + _args, _kwargs)

         return val
         return val

-    def GetRows(self):
-        val = windows2c.wxGrid_GetRows(self.this)
+    def GetRows(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_GetRows,(self,) + _args, _kwargs)

         return val
         return val

-    def GetScrollPosX(self):
-        val = windows2c.wxGrid_GetScrollPosX(self.this)
+    def GetScrollPosX(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_GetScrollPosX,(self,) + _args, _kwargs)

         return val
         return val

-    def GetScrollPosY(self):
-        val = windows2c.wxGrid_GetScrollPosY(self.this)
+    def GetScrollPosY(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_GetScrollPosY,(self,) + _args, _kwargs)

         return val
         return val

-    def GetTextItem(self):
-        val = windows2c.wxGrid_GetTextItem(self.this)
-        val = wxTextCtrlPtr(val)
+    def GetTextItem(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_GetTextItem,(self,) + _args, _kwargs)
+        if val: val = wxTextCtrlPtr(val) 

         return val
         return val

-    def GetVertScrollBar(self):
-        val = windows2c.wxGrid_GetVertScrollBar(self.this)
-        val = wxScrollBarPtr(val)
+    def GetVertScrollBar(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_GetVertScrollBar,(self,) + _args, _kwargs)
+        if val: val = wxScrollBarPtr(val) 

         return val
         return val

-    def InsertCols(self,*args):
-        val = apply(windows2c.wxGrid_InsertCols,(self.this,)+args)
+    def InsertCols(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_InsertCols,(self,) + _args, _kwargs)

         return val
         return val

-    def InsertRows(self,*args):
-        val = apply(windows2c.wxGrid_InsertRows,(self.this,)+args)
+    def InsertRows(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_InsertRows,(self,) + _args, _kwargs)

         return val
         return val

-    def OnActivate(self,arg0):
-        val = windows2c.wxGrid_OnActivate(self.this,arg0)
+    def OnActivate(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_OnActivate,(self,) + _args, _kwargs)

         return val
         return val

-    def SetCellAlignment(self,arg0,arg1,arg2):
-        val = windows2c.wxGrid_SetCellAlignment(self.this,arg0,arg1,arg2)
+    def SetCellAlignment(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_SetCellAlignment,(self,) + _args, _kwargs)

         return val
         return val

-    def SetDefCellAlignment(self,arg0):
-        val = windows2c.wxGrid_SetDefCellAlignment(self.this,arg0)
+    def SetDefCellAlignment(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_SetDefCellAlignment,(self,) + _args, _kwargs)

         return val
         return val

-    def SetCellBackgroundColour(self,arg0,arg1,arg2):
-        val = windows2c.wxGrid_SetCellBackgroundColour(self.this,arg0.this,arg1,arg2)
+    def SetCellBackgroundColour(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_SetCellBackgroundColour,(self,) + _args, _kwargs)

         return val
         return val

-    def SetDefCellBackgroundColour(self,arg0):
-        val = windows2c.wxGrid_SetDefCellBackgroundColour(self.this,arg0.this)
+    def SetDefCellBackgroundColour(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_SetDefCellBackgroundColour,(self,) + _args, _kwargs)

         return val
         return val

-    def SetCellTextColour(self,arg0,arg1,arg2):
-        val = windows2c.wxGrid_SetCellTextColour(self.this,arg0.this,arg1,arg2)
+    def SetCellTextColour(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_SetCellTextColour,(self,) + _args, _kwargs)

         return val
         return val

-    def SetDefCellTextColour(self,arg0):
-        val = windows2c.wxGrid_SetDefCellTextColour(self.this,arg0.this)
+    def SetDefCellTextColour(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_SetDefCellTextColour,(self,) + _args, _kwargs)

         return val
         return val

-    def SetCellTextFont(self,arg0,arg1,arg2):
-        val = windows2c.wxGrid_SetCellTextFont(self.this,arg0.this,arg1,arg2)
+    def SetCellTextFont(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_SetCellTextFont,(self,) + _args, _kwargs)

         return val
         return val

-    def SetDefCellTextFont(self,arg0):
-        val = windows2c.wxGrid_SetDefCellTextFont(self.this,arg0.this)
+    def SetDefCellTextFont(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_SetDefCellTextFont,(self,) + _args, _kwargs)

         return val
         return val

-    def SetCellValue(self,arg0,arg1,arg2):
-        val = windows2c.wxGrid_SetCellValue(self.this,arg0,arg1,arg2)
+    def SetCellValue(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_SetCellValue,(self,) + _args, _kwargs)

         return val
         return val

-    def SetColumnWidth(self,arg0,arg1):
-        val = windows2c.wxGrid_SetColumnWidth(self.this,arg0,arg1)
+    def SetColumnWidth(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_SetColumnWidth,(self,) + _args, _kwargs)

         return val
         return val

-    def SetDividerPen(self,arg0):
-        val = windows2c.wxGrid_SetDividerPen(self.this,arg0.this)
+    def SetDividerPen(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_SetDividerPen,(self,) + _args, _kwargs)

         return val
         return val

-    def SetEditable(self,arg0):
-        val = windows2c.wxGrid_SetEditable(self.this,arg0)
+    def SetEditable(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_SetEditable,(self,) + _args, _kwargs)

         return val
         return val

-    def SetGridCursor(self,arg0,arg1):
-        val = windows2c.wxGrid_SetGridCursor(self.this,arg0,arg1)
+    def SetGridCursor(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_SetGridCursor,(self,) + _args, _kwargs)

         return val
         return val

-    def SetLabelAlignment(self,arg0,arg1):
-        val = windows2c.wxGrid_SetLabelAlignment(self.this,arg0,arg1)
+    def SetLabelAlignment(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_SetLabelAlignment,(self,) + _args, _kwargs)

         return val
         return val

-    def SetLabelBackgroundColour(self,arg0):
-        val = windows2c.wxGrid_SetLabelBackgroundColour(self.this,arg0.this)
+    def SetLabelBackgroundColour(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_SetLabelBackgroundColour,(self,) + _args, _kwargs)

         return val
         return val

-    def SetLabelSize(self,arg0,arg1):
-        val = windows2c.wxGrid_SetLabelSize(self.this,arg0,arg1)
+    def SetLabelSize(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_SetLabelSize,(self,) + _args, _kwargs)

         return val
         return val

-    def SetLabelTextColour(self,arg0):
-        val = windows2c.wxGrid_SetLabelTextColour(self.this,arg0.this)
+    def SetLabelTextColour(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_SetLabelTextColour,(self,) + _args, _kwargs)

         return val
         return val

-    def SetLabelTextFont(self,arg0):
-        val = windows2c.wxGrid_SetLabelTextFont(self.this,arg0.this)
+    def SetLabelTextFont(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_SetLabelTextFont,(self,) + _args, _kwargs)

         return val
         return val

-    def SetLabelValue(self,arg0,arg1,arg2):
-        val = windows2c.wxGrid_SetLabelValue(self.this,arg0,arg1,arg2)
+    def SetLabelValue(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_SetLabelValue,(self,) + _args, _kwargs)

         return val
         return val

-    def SetRowHeight(self,arg0,arg1):
-        val = windows2c.wxGrid_SetRowHeight(self.this,arg0,arg1)
+    def SetRowHeight(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_SetRowHeight,(self,) + _args, _kwargs)

         return val
         return val

-    def UpdateDimensions(self):
-        val = windows2c.wxGrid_UpdateDimensions(self.this)
+    def UpdateDimensions(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_UpdateDimensions,(self,) + _args, _kwargs)

         return val
         return val

-    def GetEditInPlace(self):
-        val = windows2c.wxGrid_GetEditInPlace(self.this)
+    def GetEditInPlace(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_GetEditInPlace,(self,) + _args, _kwargs)

         return val
         return val

-    def SetEditInPlace(self,*args):
-        val = apply(windows2c.wxGrid_SetEditInPlace,(self.this,)+args)
+    def SetEditInPlace(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGrid_SetEditInPlace,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxGrid instance>"
+        return "<C wxGrid instance at %s>" % (self.this,)

 class wxGrid(wxGridPtr):
 class wxGrid(wxGridPtr):

-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(windows2c.new_wxGrid,(arg0.this,arg1,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(windows2c.new_wxGrid,_args,_kwargs)

         self.thisown = 1
         wx._StdWindowCallbacks(self)
         wx._checkForCallback(self, 'OnSelectCell',           wxEVT_GRID_SELECT_CELL)
         self.thisown = 1
         wx._StdWindowCallbacks(self)
         wx._checkForCallback(self, 'OnSelectCell',           wxEVT_GRID_SELECT_CELL)


@@ -322,68 +315,67 @@ class wxGridEventPtr(wxEventPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetRow(self):
-        val = windows2c.wxGridEvent_GetRow(self.this)
+    def GetRow(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGridEvent_GetRow,(self,) + _args, _kwargs)

         return val
         return val

-    def GetCol(self):
-        val = windows2c.wxGridEvent_GetCol(self.this)
+    def GetCol(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGridEvent_GetCol,(self,) + _args, _kwargs)

         return val
         return val

-    def GetPosition(self):
-        val = windows2c.wxGridEvent_GetPosition(self.this)
-        val = wxPointPtr(val)
-        val.thisown = 1
+    def GetPosition(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGridEvent_GetPosition,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1

         return val
         return val

-    def ControlDown(self):
-        val = windows2c.wxGridEvent_ControlDown(self.this)
+    def ControlDown(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGridEvent_ControlDown,(self,) + _args, _kwargs)

         return val
         return val

-    def ShiftDown(self):
-        val = windows2c.wxGridEvent_ShiftDown(self.this)
+    def ShiftDown(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGridEvent_ShiftDown,(self,) + _args, _kwargs)

         return val
         return val

-    def GetCell(self):
-        val = windows2c.wxGridEvent_GetCell(self.this)
-        val = wxGridCellPtr(val)
+    def GetCell(self, *_args, **_kwargs):
+        val = apply(windows2c.wxGridEvent_GetCell,(self,) + _args, _kwargs)
+        if val: val = wxGridCellPtr(val) 

         return val
     def __setattr__(self,name,value):
         if name == "m_row" :
         return val
     def __setattr__(self,name,value):
         if name == "m_row" :

-            windows2c.wxGridEvent_m_row_set(self.this,value)
+            windows2c.wxGridEvent_m_row_set(self,value)

             return
         if name == "m_col" :
             return
         if name == "m_col" :

-            windows2c.wxGridEvent_m_col_set(self.this,value)
+            windows2c.wxGridEvent_m_col_set(self,value)

             return
         if name == "m_x" :
             return
         if name == "m_x" :

-            windows2c.wxGridEvent_m_x_set(self.this,value)
+            windows2c.wxGridEvent_m_x_set(self,value)

             return
         if name == "m_y" :
             return
         if name == "m_y" :

-            windows2c.wxGridEvent_m_y_set(self.this,value)
+            windows2c.wxGridEvent_m_y_set(self,value)

             return
         if name == "m_control" :
             return
         if name == "m_control" :

-            windows2c.wxGridEvent_m_control_set(self.this,value)
+            windows2c.wxGridEvent_m_control_set(self,value)

             return
         if name == "m_shift" :
             return
         if name == "m_shift" :

-            windows2c.wxGridEvent_m_shift_set(self.this,value)
+            windows2c.wxGridEvent_m_shift_set(self,value)

             return
         if name == "m_cell" :
             return
         if name == "m_cell" :

-            windows2c.wxGridEvent_m_cell_set(self.this,value.this)
+            windows2c.wxGridEvent_m_cell_set(self,value.this)

             return
         self.__dict__[name] = value
     def __getattr__(self,name):
         if name == "m_row" : 
             return
         self.__dict__[name] = value
     def __getattr__(self,name):
         if name == "m_row" : 

-            return windows2c.wxGridEvent_m_row_get(self.this)
+            return windows2c.wxGridEvent_m_row_get(self)

         if name == "m_col" : 
         if name == "m_col" : 

-            return windows2c.wxGridEvent_m_col_get(self.this)
+            return windows2c.wxGridEvent_m_col_get(self)

         if name == "m_x" : 
         if name == "m_x" : 

-            return windows2c.wxGridEvent_m_x_get(self.this)
+            return windows2c.wxGridEvent_m_x_get(self)

         if name == "m_y" : 
         if name == "m_y" : 

-            return windows2c.wxGridEvent_m_y_get(self.this)
+            return windows2c.wxGridEvent_m_y_get(self)

         if name == "m_control" : 
         if name == "m_control" : 

-            return windows2c.wxGridEvent_m_control_get(self.this)
+            return windows2c.wxGridEvent_m_control_get(self)

         if name == "m_shift" : 
         if name == "m_shift" : 

-            return windows2c.wxGridEvent_m_shift_get(self.this)
+            return windows2c.wxGridEvent_m_shift_get(self)

         if name == "m_cell" : 
         if name == "m_cell" : 

-            return wxGridCellPtr(windows2c.wxGridEvent_m_cell_get(self.this))
+            return wxGridCellPtr(windows2c.wxGridEvent_m_cell_get(self))

         raise AttributeError,name
     def __repr__(self):
         raise AttributeError,name
     def __repr__(self):

-        return "<C wxGridEvent instance>"
+        return "<C wxGridEvent instance at %s>" % (self.this,)

 class wxGridEvent(wxGridEventPtr):
     def __init__(self,this):
         self.this = this
 class wxGridEvent(wxGridEventPtr):
     def __init__(self,this):
         self.this = this


@@ -395,20 +387,20 @@ class wxNotebookEventPtr(wxNotifyEventPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetSelection(self):
-        val = windows2c.wxNotebookEvent_GetSelection(self.this)
+    def GetSelection(self, *_args, **_kwargs):
+        val = apply(windows2c.wxNotebookEvent_GetSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def GetOldSelection(self):
-        val = windows2c.wxNotebookEvent_GetOldSelection(self.this)
+    def GetOldSelection(self, *_args, **_kwargs):
+        val = apply(windows2c.wxNotebookEvent_GetOldSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def SetOldSelection(self,arg0):
-        val = windows2c.wxNotebookEvent_SetOldSelection(self.this,arg0)
+    def SetOldSelection(self, *_args, **_kwargs):
+        val = apply(windows2c.wxNotebookEvent_SetOldSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def SetSelection(self,arg0):
-        val = windows2c.wxNotebookEvent_SetSelection(self.this,arg0)
+    def SetSelection(self, *_args, **_kwargs):
+        val = apply(windows2c.wxNotebookEvent_SetSelection,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxNotebookEvent instance>"
+        return "<C wxNotebookEvent instance at %s>" % (self.this,)

 class wxNotebookEvent(wxNotebookEventPtr):
     def __init__(self,this):
         self.this = this
 class wxNotebookEvent(wxNotebookEventPtr):
     def __init__(self,this):
         self.this = this


@@ -420,73 +412,67 @@ class wxNotebookPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetPageCount(self):
-        val = windows2c.wxNotebook_GetPageCount(self.this)
+    def GetPageCount(self, *_args, **_kwargs):
+        val = apply(windows2c.wxNotebook_GetPageCount,(self,) + _args, _kwargs)

         return val
         return val

-    def SetSelection(self,arg0):
-        val = windows2c.wxNotebook_SetSelection(self.this,arg0)
+    def SetSelection(self, *_args, **_kwargs):
+        val = apply(windows2c.wxNotebook_SetSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def AdvanceSelection(self,*args):
-        val = apply(windows2c.wxNotebook_AdvanceSelection,(self.this,)+args)
+    def AdvanceSelection(self, *_args, **_kwargs):
+        val = apply(windows2c.wxNotebook_AdvanceSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def GetSelection(self):
-        val = windows2c.wxNotebook_GetSelection(self.this)
+    def GetSelection(self, *_args, **_kwargs):
+        val = apply(windows2c.wxNotebook_GetSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def SetPageText(self,arg0,arg1):
-        val = windows2c.wxNotebook_SetPageText(self.this,arg0,arg1)
+    def SetPageText(self, *_args, **_kwargs):
+        val = apply(windows2c.wxNotebook_SetPageText,(self,) + _args, _kwargs)

         return val
         return val

-    def GetPageText(self,arg0):
-        val = windows2c.wxNotebook_GetPageText(self.this,arg0)
+    def GetPageText(self, *_args, **_kwargs):
+        val = apply(windows2c.wxNotebook_GetPageText,(self,) + _args, _kwargs)

         return val
         return val

-    def SetImageList(self,arg0):
-        val = windows2c.wxNotebook_SetImageList(self.this,arg0.this)
+    def SetImageList(self, *_args, **_kwargs):
+        val = apply(windows2c.wxNotebook_SetImageList,(self,) + _args, _kwargs)

         return val
         return val

-    def GetImageList(self):
-        val = windows2c.wxNotebook_GetImageList(self.this)
-        val = wxImageListPtr(val)
+    def GetImageList(self, *_args, **_kwargs):
+        val = apply(windows2c.wxNotebook_GetImageList,(self,) + _args, _kwargs)
+        if val: val = wxImageListPtr(val) 

         return val
         return val

-    def GetPageImage(self,arg0):
-        val = windows2c.wxNotebook_GetPageImage(self.this,arg0)
+    def GetPageImage(self, *_args, **_kwargs):
+        val = apply(windows2c.wxNotebook_GetPageImage,(self,) + _args, _kwargs)

         return val
         return val

-    def SetPageImage(self,arg0,arg1):
-        val = windows2c.wxNotebook_SetPageImage(self.this,arg0,arg1)
+    def SetPageImage(self, *_args, **_kwargs):
+        val = apply(windows2c.wxNotebook_SetPageImage,(self,) + _args, _kwargs)

         return val
         return val

-    def GetRowCount(self):
-        val = windows2c.wxNotebook_GetRowCount(self.this)
+    def GetRowCount(self, *_args, **_kwargs):
+        val = apply(windows2c.wxNotebook_GetRowCount,(self,) + _args, _kwargs)

         return val
         return val

-    def DeletePage(self,arg0):
-        val = windows2c.wxNotebook_DeletePage(self.this,arg0)
+    def DeletePage(self, *_args, **_kwargs):
+        val = apply(windows2c.wxNotebook_DeletePage,(self,) + _args, _kwargs)

         return val
         return val

-    def RemovePage(self,arg0):
-        val = windows2c.wxNotebook_RemovePage(self.this,arg0)
+    def RemovePage(self, *_args, **_kwargs):
+        val = apply(windows2c.wxNotebook_RemovePage,(self,) + _args, _kwargs)

         return val
         return val

-    def DeleteAllPages(self):
-        val = windows2c.wxNotebook_DeleteAllPages(self.this)
+    def DeleteAllPages(self, *_args, **_kwargs):
+        val = apply(windows2c.wxNotebook_DeleteAllPages,(self,) + _args, _kwargs)

         return val
         return val

-    def AddPage(self,arg0,arg1,*args):
-        val = apply(windows2c.wxNotebook_AddPage,(self.this,arg0.this,arg1,)+args)
+    def AddPage(self, *_args, **_kwargs):
+        val = apply(windows2c.wxNotebook_AddPage,(self,) + _args, _kwargs)

         return val
         return val

-    def InsertPage(self,arg0,arg1,arg2,*args):
-        val = apply(windows2c.wxNotebook_InsertPage,(self.this,arg0,arg1.this,arg2,)+args)
+    def InsertPage(self, *_args, **_kwargs):
+        val = apply(windows2c.wxNotebook_InsertPage,(self,) + _args, _kwargs)

         return val
         return val

-    def GetPage(self,arg0):
-        val = windows2c.wxNotebook_GetPage(self.this,arg0)
-        val = wxWindowPtr(val)
+    def GetPage(self, *_args, **_kwargs):
+        val = apply(windows2c.wxNotebook_GetPage,(self,) + _args, _kwargs)
+        if val: val = wxWindowPtr(val) 

         return val
         return val

-    def ResizeChildren(self):
-        val = windows2c.wxNotebook_ResizeChildren(self.this)
+    def ResizeChildren(self, *_args, **_kwargs):
+        val = apply(windows2c.wxNotebook_ResizeChildren,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxNotebook instance>"
+        return "<C wxNotebook instance at %s>" % (self.this,)

 class wxNotebook(wxNotebookPtr):
 class wxNotebook(wxNotebookPtr):

-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(windows2c.new_wxNotebook,(arg0.this,arg1,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(windows2c.new_wxNotebook,_args,_kwargs)

         self.thisown = 1
         wx._StdWindowCallbacks(self)
 
         self.thisown = 1
         wx._StdWindowCallbacks(self)
 


@@ -497,24 +483,24 @@ class wxSplitterEventPtr(wxCommandEventPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetSashPosition(self):
-        val = windows2c.wxSplitterEvent_GetSashPosition(self.this)
+    def GetSashPosition(self, *_args, **_kwargs):
+        val = apply(windows2c.wxSplitterEvent_GetSashPosition,(self,) + _args, _kwargs)

         return val
         return val

-    def GetX(self):
-        val = windows2c.wxSplitterEvent_GetX(self.this)
+    def GetX(self, *_args, **_kwargs):
+        val = apply(windows2c.wxSplitterEvent_GetX,(self,) + _args, _kwargs)

         return val
         return val

-    def GetY(self):
-        val = windows2c.wxSplitterEvent_GetY(self.this)
+    def GetY(self, *_args, **_kwargs):
+        val = apply(windows2c.wxSplitterEvent_GetY,(self,) + _args, _kwargs)

         return val
         return val

-    def GetWindowBeingRemoved(self):
-        val = windows2c.wxSplitterEvent_GetWindowBeingRemoved(self.this)
-        val = wxWindowPtr(val)
+    def GetWindowBeingRemoved(self, *_args, **_kwargs):
+        val = apply(windows2c.wxSplitterEvent_GetWindowBeingRemoved,(self,) + _args, _kwargs)
+        if val: val = wxWindowPtr(val) 

         return val
         return val

-    def SetSashPosition(self,arg0):
-        val = windows2c.wxSplitterEvent_SetSashPosition(self.this,arg0)
+    def SetSashPosition(self, *_args, **_kwargs):
+        val = apply(windows2c.wxSplitterEvent_SetSashPosition,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxSplitterEvent instance>"
+        return "<C wxSplitterEvent instance at %s>" % (self.this,)

 class wxSplitterEvent(wxSplitterEventPtr):
     def __init__(self,this):
         self.this = this
 class wxSplitterEvent(wxSplitterEventPtr):
     def __init__(self,this):
         self.this = this


@@ -526,74 +512,64 @@ class wxSplitterWindowPtr(wxWindowPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetBorderSize(self):
-        val = windows2c.wxSplitterWindow_GetBorderSize(self.this)
+    def GetBorderSize(self, *_args, **_kwargs):
+        val = apply(windows2c.wxSplitterWindow_GetBorderSize,(self,) + _args, _kwargs)

         return val
         return val

-    def GetMinimumPaneSize(self):
-        val = windows2c.wxSplitterWindow_GetMinimumPaneSize(self.this)
+    def GetMinimumPaneSize(self, *_args, **_kwargs):
+        val = apply(windows2c.wxSplitterWindow_GetMinimumPaneSize,(self,) + _args, _kwargs)

         return val
         return val

-    def GetSashPosition(self):
-        val = windows2c.wxSplitterWindow_GetSashPosition(self.this)
+    def GetSashPosition(self, *_args, **_kwargs):
+        val = apply(windows2c.wxSplitterWindow_GetSashPosition,(self,) + _args, _kwargs)

         return val
         return val

-    def GetSashSize(self):
-        val = windows2c.wxSplitterWindow_GetSashSize(self.this)
+    def GetSashSize(self, *_args, **_kwargs):
+        val = apply(windows2c.wxSplitterWindow_GetSashSize,(self,) + _args, _kwargs)

         return val
         return val

-    def GetSplitMode(self):
-        val = windows2c.wxSplitterWindow_GetSplitMode(self.this)
+    def GetSplitMode(self, *_args, **_kwargs):
+        val = apply(windows2c.wxSplitterWindow_GetSplitMode,(self,) + _args, _kwargs)

         return val
         return val

-    def GetWindow1(self):
-        val = windows2c.wxSplitterWindow_GetWindow1(self.this)
-        val = wxWindowPtr(val)
+    def GetWindow1(self, *_args, **_kwargs):
+        val = apply(windows2c.wxSplitterWindow_GetWindow1,(self,) + _args, _kwargs)
+        if val: val = wxWindowPtr(val) 

         return val
         return val

-    def GetWindow2(self):
-        val = windows2c.wxSplitterWindow_GetWindow2(self.this)
-        val = wxWindowPtr(val)
+    def GetWindow2(self, *_args, **_kwargs):
+        val = apply(windows2c.wxSplitterWindow_GetWindow2,(self,) + _args, _kwargs)
+        if val: val = wxWindowPtr(val) 

         return val
         return val

-    def Initialize(self,arg0):
-        val = windows2c.wxSplitterWindow_Initialize(self.this,arg0.this)
+    def Initialize(self, *_args, **_kwargs):
+        val = apply(windows2c.wxSplitterWindow_Initialize,(self,) + _args, _kwargs)

         return val
         return val

-    def IsSplit(self):
-        val = windows2c.wxSplitterWindow_IsSplit(self.this)
+    def IsSplit(self, *_args, **_kwargs):
+        val = apply(windows2c.wxSplitterWindow_IsSplit,(self,) + _args, _kwargs)

         return val
         return val

-    def SetBorderSize(self,arg0):
-        val = windows2c.wxSplitterWindow_SetBorderSize(self.this,arg0)
+    def SetBorderSize(self, *_args, **_kwargs):
+        val = apply(windows2c.wxSplitterWindow_SetBorderSize,(self,) + _args, _kwargs)

         return val
         return val

-    def SetSashPosition(self,arg0,*args):
-        val = apply(windows2c.wxSplitterWindow_SetSashPosition,(self.this,arg0,)+args)
+    def SetSashPosition(self, *_args, **_kwargs):
+        val = apply(windows2c.wxSplitterWindow_SetSashPosition,(self,) + _args, _kwargs)

         return val
         return val

-    def SetSashSize(self,arg0):
-        val = windows2c.wxSplitterWindow_SetSashSize(self.this,arg0)
+    def SetSashSize(self, *_args, **_kwargs):
+        val = apply(windows2c.wxSplitterWindow_SetSashSize,(self,) + _args, _kwargs)

         return val
         return val

-    def SetMinimumPaneSize(self,arg0):
-        val = windows2c.wxSplitterWindow_SetMinimumPaneSize(self.this,arg0)
+    def SetMinimumPaneSize(self, *_args, **_kwargs):
+        val = apply(windows2c.wxSplitterWindow_SetMinimumPaneSize,(self,) + _args, _kwargs)

         return val
         return val

-    def SetSplitMode(self,arg0):
-        val = windows2c.wxSplitterWindow_SetSplitMode(self.this,arg0)
+    def SetSplitMode(self, *_args, **_kwargs):
+        val = apply(windows2c.wxSplitterWindow_SetSplitMode,(self,) + _args, _kwargs)

         return val
         return val

-    def SplitHorizontally(self,arg0,arg1,*args):
-        val = apply(windows2c.wxSplitterWindow_SplitHorizontally,(self.this,arg0.this,arg1.this,)+args)
+    def SplitHorizontally(self, *_args, **_kwargs):
+        val = apply(windows2c.wxSplitterWindow_SplitHorizontally,(self,) + _args, _kwargs)

         return val
         return val

-    def SplitVertically(self,arg0,arg1,*args):
-        val = apply(windows2c.wxSplitterWindow_SplitVertically,(self.this,arg0.this,arg1.this,)+args)
+    def SplitVertically(self, *_args, **_kwargs):
+        val = apply(windows2c.wxSplitterWindow_SplitVertically,(self,) + _args, _kwargs)

         return val
         return val

-    def Unsplit(self,*args):
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        args = tuple(argl)
-        val = apply(windows2c.wxSplitterWindow_Unsplit,(self.this,)+args)
+    def Unsplit(self, *_args, **_kwargs):
+        val = apply(windows2c.wxSplitterWindow_Unsplit,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxSplitterWindow instance>"
+        return "<C wxSplitterWindow instance at %s>" % (self.this,)

 class wxSplitterWindow(wxSplitterWindowPtr):
 class wxSplitterWindow(wxSplitterWindowPtr):

-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(windows2c.new_wxSplitterWindow,(arg0.this,arg1,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(windows2c.new_wxSplitterWindow,_args,_kwargs)

         self.thisown = 1
         wx._StdWindowCallbacks(self)
 
         self.thisown = 1
         wx._StdWindowCallbacks(self)
 


@@ -604,23 +580,23 @@ class wxTaskBarIconPtr(wxEvtHandlerPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self, windows2c=windows2c):
+    def __del__(self,windows2c=windows2c):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            windows2c.delete_wxTaskBarIcon(self.this)
-    def SetIcon(self,arg0,*args):
-        val = apply(windows2c.wxTaskBarIcon_SetIcon,(self.this,arg0.this,)+args)
+            windows2c.delete_wxTaskBarIcon(self)
+    def SetIcon(self, *_args, **_kwargs):
+        val = apply(windows2c.wxTaskBarIcon_SetIcon,(self,) + _args, _kwargs)

         return val
         return val

-    def RemoveIcon(self):
-        val = windows2c.wxTaskBarIcon_RemoveIcon(self.this)
+    def RemoveIcon(self, *_args, **_kwargs):
+        val = apply(windows2c.wxTaskBarIcon_RemoveIcon,(self,) + _args, _kwargs)

         return val
         return val

-    def PopupMenu(self,arg0):
-        val = windows2c.wxTaskBarIcon_PopupMenu(self.this,arg0.this)
+    def PopupMenu(self, *_args, **_kwargs):
+        val = apply(windows2c.wxTaskBarIcon_PopupMenu,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxTaskBarIcon instance>"
+        return "<C wxTaskBarIcon instance at %s>" % (self.this,)

 class wxTaskBarIcon(wxTaskBarIconPtr):
 class wxTaskBarIcon(wxTaskBarIconPtr):

-    def __init__(self) :
-        self.this = windows2c.new_wxTaskBarIcon()
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(windows2c.new_wxTaskBarIcon,_args,_kwargs)

         self.thisown = 1
         wx._checkForCallback(self, 'OnMouseMove',    wxEVT_TASKBAR_MOVE)
         wx._checkForCallback(self, 'OnLButtonDown',  wxEVT_TASKBAR_LEFT_DOWN)
         self.thisown = 1
         wx._checkForCallback(self, 'OnMouseMove',    wxEVT_TASKBAR_MOVE)
         wx._checkForCallback(self, 'OnLButtonDown',  wxEVT_TASKBAR_LEFT_DOWN)

diff --git a/utils/wxPython/src/msw/windows3.cpp b/utils/wxPython/src/msw/windows3.cpp
index 7c6f60e716b1bd865ce6d94008103b4f44f88eff..68fd76920c0117bcd39d6de1257bfadbba292cc7 100644 (file)
--- a/utils/wxPython/src/msw/windows3.cpp
+++ b/utils/wxPython/src/msw/windows3.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)

- * Version 1.1 (Patch 5)
+ * Version 1.1 (Patch 6)

  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.


@@ -24,16 +24,16 @@
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)

-#      define SWIGEXPORT(a,b) __declspec(dllexport) a b
+#      define SWIGEXPORT(a) __declspec(dllexport) a

 #   else
 #      if defined(__BORLANDC__)
 #   else
 #      if defined(__BORLANDC__)

-#          define SWIGEXPORT(a,b) a _export b
+#          define SWIGEXPORT(a) a _export 

 #      else
 #      else

-#          define SWIGEXPORT(a,b) a b
+#          define SWIGEXPORT(a) a 

 #      endif
 #   endif
 #else
 #      endif
 #   endif
 #else

-#   define SWIGEXPORT(a,b) a b
+#   define SWIGEXPORT(a) a 

 #endif
 
 #ifdef __cplusplus
 #endif
 
 #ifdef __cplusplus


@@ -43,12 +43,12 @@ extern "C" {
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);

+extern char *SWIG_GetPtrObj(PyObject *, void **, char *);

 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif
 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif

-

 #define SWIG_init    initwindows3c
 
 #define SWIG_name    "windows3c"
 #define SWIG_init    initwindows3c
 
 #define SWIG_name    "windows3c"


@@ -59,12 +59,13 @@ extern PyObject *SWIG_newvarlink(void);
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;

-    if (!target) {
+    PyObject*   o3;
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);
         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);


@@ -81,23 +82,23 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
     PyObject*   o3;
 
     PyObject*   o2;
     PyObject*   o3;
 

-    if (!target) {
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }
         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }

-        o3 = PyTuple_New(1);
-        PyTuple_SetItem(o3, 0, o);
+        o3 = PyTuple_New(1);            
+        PyTuple_SetItem(o3, 0, o);      

 
         o2 = target;
 
         o2 = target;

-        target = PySequence_Concat(o2, o3);
-        Py_DECREF(o2);
+        target = PySequence_Concat(o2, o3); 
+        Py_DECREF(o2);                      

         Py_DECREF(o3);
     }
     return target;
         Py_DECREF(o3);
     }
     return target;


@@ -115,6 +116,9 @@ extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
 
 
 static char* wxStringErrorMsg = "string type is required for parameter";
 
 
 static char* wxStringErrorMsg = "string type is required for parameter";

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

 static void *SwigwxSashEventTowxCommandEvent(void *ptr) {
     wxSashEvent *src;
     wxCommandEvent *dest;
 static void *SwigwxSashEventTowxCommandEvent(void *ptr) {
     wxSashEvent *src;
     wxCommandEvent *dest;


@@ -136,13 +140,14 @@ static PyObject *_wrap_wxSashEvent_SetEdge(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxSashEvent * _arg0;
     wxSashEdgePosition  _arg1;
     PyObject * _resultobj;
     wxSashEvent * _arg0;
     wxSashEdgePosition  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxSashEvent_SetEdge",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxSashEvent_SetEdge",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSashEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSashEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashEvent_SetEdge. Expected _wxSashEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashEvent_SetEdge. Expected _wxSashEvent_p.");
         return NULL;
         }


@@ -162,13 +167,14 @@ static PyObject *_wrap_wxSashEvent_GetEdge(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxSashEdgePosition  _result;
     wxSashEvent * _arg0;
     PyObject * _resultobj;
     wxSashEdgePosition  _result;
     wxSashEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSashEvent_GetEdge",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSashEvent_GetEdge",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSashEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSashEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashEvent_GetEdge. Expected _wxSashEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashEvent_GetEdge. Expected _wxSashEvent_p.");
         return NULL;
         }


@@ -187,20 +193,22 @@ static PyObject *_wrap_wxSashEvent_SetDragRect(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxSashEvent * _arg0;
     wxRect * _arg1;
     PyObject * _resultobj;
     wxSashEvent * _arg0;
     wxRect * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxSashEvent_SetDragRect",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxSashEvent_SetDragRect",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSashEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSashEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashEvent_SetDragRect. Expected _wxSashEvent_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashEvent_SetDragRect. Expected _wxSashEvent_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxRect_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSashEvent_SetDragRect. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSashEvent_SetDragRect. Expected _wxRect_p.");
         return NULL;
         }


@@ -220,14 +228,15 @@ static PyObject *_wrap_wxSashEvent_GetDragRect(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRect * _result;
     wxSashEvent * _arg0;
     PyObject * _resultobj;
     wxRect * _result;
     wxSashEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSashEvent_GetDragRect",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSashEvent_GetDragRect",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSashEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSashEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashEvent_GetDragRect. Expected _wxSashEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashEvent_GetDragRect. Expected _wxSashEvent_p.");
         return NULL;
         }


@@ -247,13 +256,14 @@ static PyObject *_wrap_wxSashEvent_SetDragStatus(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxSashEvent * _arg0;
     wxSashDragStatus  _arg1;
     PyObject * _resultobj;
     wxSashEvent * _arg0;
     wxSashDragStatus  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxSashEvent_SetDragStatus",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxSashEvent_SetDragStatus",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSashEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSashEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashEvent_SetDragStatus. Expected _wxSashEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashEvent_SetDragStatus. Expected _wxSashEvent_p.");
         return NULL;
         }


@@ -273,13 +283,14 @@ static PyObject *_wrap_wxSashEvent_GetDragStatus(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxSashDragStatus  _result;
     wxSashEvent * _arg0;
     PyObject * _resultobj;
     wxSashDragStatus  _result;
     wxSashEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSashEvent_GetDragStatus",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSashEvent_GetDragStatus",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSashEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSashEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashEvent_GetDragStatus. Expected _wxSashEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashEvent_GetDragStatus. Expected _wxSashEvent_p.");
         return NULL;
         }


@@ -315,32 +326,35 @@ static PyObject *_wrap_new_wxSashWindow(PyObject *self, PyObject *args) {
     wxSashWindow * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxSashWindow * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;

-    wxPoint * _arg2 = &wxPyDefaultPosition;
-    wxSize * _arg3 = &wxPyDefaultSize;
-    long  _arg4 = (wxCLIP_CHILDREN)|(wxSW_3D);
-    char * _arg5 = "sashWindow";
-    char * _argc0 = 0;
-    char * _argc2 = 0;
-    char * _argc3 = 0;
+    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    long  _arg4 = (long ) wxCLIP_CHILDREN|(wxSW_3D);
+    char * _arg5 = (char *) "sashWindow";
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;
+    PyObject * _argo3 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si|ssls:new_wxSashWindow",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTuple(args,"Oi|OOls:new_wxSashWindow",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxSashWindow. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxSashWindow. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxSashWindow. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxSashWindow. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxSize_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxSashWindow. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxSashWindow. Expected _wxSize_p.");
         return NULL;
         }


@@ -350,8 +364,13 @@ static PyObject *_wrap_new_wxSashWindow(PyObject *self, PyObject *args) {
         _result = (wxSashWindow *)new_wxSashWindow(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxSashWindow *)new_wxSashWindow(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxSashWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxSashWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -361,13 +380,14 @@ static PyObject *_wrap_wxSashWindow_GetSashVisible(PyObject *self, PyObject *arg
     bool  _result;
     wxSashWindow * _arg0;
     wxSashEdgePosition  _arg1;
     bool  _result;
     wxSashWindow * _arg0;
     wxSashEdgePosition  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxSashWindow_GetSashVisible",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxSashWindow_GetSashVisible",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSashWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSashWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashWindow_GetSashVisible. Expected _wxSashWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashWindow_GetSashVisible. Expected _wxSashWindow_p.");
         return NULL;
         }


@@ -386,13 +406,14 @@ static PyObject *_wrap_wxSashWindow_GetDefaultBorderSize(PyObject *self, PyObjec
     PyObject * _resultobj;
     int  _result;
     wxSashWindow * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxSashWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSashWindow_GetDefaultBorderSize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSashWindow_GetDefaultBorderSize",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSashWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSashWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashWindow_GetDefaultBorderSize. Expected _wxSashWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashWindow_GetDefaultBorderSize. Expected _wxSashWindow_p.");
         return NULL;
         }


@@ -412,13 +433,14 @@ static PyObject *_wrap_wxSashWindow_GetEdgeMargin(PyObject *self, PyObject *args
     int  _result;
     wxSashWindow * _arg0;
     wxSashEdgePosition  _arg1;
     int  _result;
     wxSashWindow * _arg0;
     wxSashEdgePosition  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxSashWindow_GetEdgeMargin",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxSashWindow_GetEdgeMargin",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSashWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSashWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashWindow_GetEdgeMargin. Expected _wxSashWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashWindow_GetEdgeMargin. Expected _wxSashWindow_p.");
         return NULL;
         }


@@ -437,13 +459,14 @@ static PyObject *_wrap_wxSashWindow_GetExtraBorderSize(PyObject *self, PyObject
     PyObject * _resultobj;
     int  _result;
     wxSashWindow * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxSashWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSashWindow_GetExtraBorderSize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSashWindow_GetExtraBorderSize",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSashWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSashWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashWindow_GetExtraBorderSize. Expected _wxSashWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashWindow_GetExtraBorderSize. Expected _wxSashWindow_p.");
         return NULL;
         }


@@ -462,13 +485,14 @@ static PyObject *_wrap_wxSashWindow_GetMaximumSizeX(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     int  _result;
     wxSashWindow * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxSashWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSashWindow_GetMaximumSizeX",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSashWindow_GetMaximumSizeX",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSashWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSashWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashWindow_GetMaximumSizeX. Expected _wxSashWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashWindow_GetMaximumSizeX. Expected _wxSashWindow_p.");
         return NULL;
         }


@@ -487,13 +511,14 @@ static PyObject *_wrap_wxSashWindow_GetMaximumSizeY(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     int  _result;
     wxSashWindow * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxSashWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSashWindow_GetMaximumSizeY",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSashWindow_GetMaximumSizeY",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSashWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSashWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashWindow_GetMaximumSizeY. Expected _wxSashWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashWindow_GetMaximumSizeY. Expected _wxSashWindow_p.");
         return NULL;
         }


@@ -512,13 +537,14 @@ static PyObject *_wrap_wxSashWindow_GetMinimumSizeX(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     int  _result;
     wxSashWindow * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxSashWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSashWindow_GetMinimumSizeX",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSashWindow_GetMinimumSizeX",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSashWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSashWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashWindow_GetMinimumSizeX. Expected _wxSashWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashWindow_GetMinimumSizeX. Expected _wxSashWindow_p.");
         return NULL;
         }


@@ -537,13 +563,14 @@ static PyObject *_wrap_wxSashWindow_GetMinimumSizeY(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     int  _result;
     wxSashWindow * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxSashWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSashWindow_GetMinimumSizeY",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSashWindow_GetMinimumSizeY",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSashWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSashWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashWindow_GetMinimumSizeY. Expected _wxSashWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashWindow_GetMinimumSizeY. Expected _wxSashWindow_p.");
         return NULL;
         }


@@ -563,13 +590,14 @@ static PyObject *_wrap_wxSashWindow_HasBorder(PyObject *self, PyObject *args) {
     bool  _result;
     wxSashWindow * _arg0;
     wxSashEdgePosition  _arg1;
     bool  _result;
     wxSashWindow * _arg0;
     wxSashEdgePosition  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxSashWindow_HasBorder",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxSashWindow_HasBorder",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSashWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSashWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashWindow_HasBorder. Expected _wxSashWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashWindow_HasBorder. Expected _wxSashWindow_p.");
         return NULL;
         }


@@ -588,13 +616,14 @@ static PyObject *_wrap_wxSashWindow_SetDefaultBorderSize(PyObject *self, PyObjec
     PyObject * _resultobj;
     wxSashWindow * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxSashWindow * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxSashWindow_SetDefaultBorderSize",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxSashWindow_SetDefaultBorderSize",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSashWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSashWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashWindow_SetDefaultBorderSize. Expected _wxSashWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashWindow_SetDefaultBorderSize. Expected _wxSashWindow_p.");
         return NULL;
         }


@@ -614,13 +643,14 @@ static PyObject *_wrap_wxSashWindow_SetExtraBorderSize(PyObject *self, PyObject
     PyObject * _resultobj;
     wxSashWindow * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxSashWindow * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxSashWindow_SetExtraBorderSize",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxSashWindow_SetExtraBorderSize",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSashWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSashWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashWindow_SetExtraBorderSize. Expected _wxSashWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashWindow_SetExtraBorderSize. Expected _wxSashWindow_p.");
         return NULL;
         }


@@ -640,13 +670,14 @@ static PyObject *_wrap_wxSashWindow_SetMaximumSizeX(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     wxSashWindow * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxSashWindow * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxSashWindow_SetMaximumSizeX",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxSashWindow_SetMaximumSizeX",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSashWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSashWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashWindow_SetMaximumSizeX. Expected _wxSashWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashWindow_SetMaximumSizeX. Expected _wxSashWindow_p.");
         return NULL;
         }


@@ -666,13 +697,14 @@ static PyObject *_wrap_wxSashWindow_SetMaximumSizeY(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     wxSashWindow * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxSashWindow * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxSashWindow_SetMaximumSizeY",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxSashWindow_SetMaximumSizeY",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSashWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSashWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashWindow_SetMaximumSizeY. Expected _wxSashWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashWindow_SetMaximumSizeY. Expected _wxSashWindow_p.");
         return NULL;
         }


@@ -692,13 +724,14 @@ static PyObject *_wrap_wxSashWindow_SetMinimumSizeX(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     wxSashWindow * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxSashWindow * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxSashWindow_SetMinimumSizeX",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxSashWindow_SetMinimumSizeX",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSashWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSashWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashWindow_SetMinimumSizeX. Expected _wxSashWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashWindow_SetMinimumSizeX. Expected _wxSashWindow_p.");
         return NULL;
         }


@@ -718,13 +751,14 @@ static PyObject *_wrap_wxSashWindow_SetMinimumSizeY(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     wxSashWindow * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxSashWindow * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxSashWindow_SetMinimumSizeY",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxSashWindow_SetMinimumSizeY",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSashWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSashWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashWindow_SetMinimumSizeY. Expected _wxSashWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashWindow_SetMinimumSizeY. Expected _wxSashWindow_p.");
         return NULL;
         }


@@ -745,14 +779,15 @@ static PyObject *_wrap_wxSashWindow_SetSashVisible(PyObject *self, PyObject *arg
     wxSashWindow * _arg0;
     wxSashEdgePosition  _arg1;
     bool  _arg2;
     wxSashWindow * _arg0;
     wxSashEdgePosition  _arg1;
     bool  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool2;
 
     self = self;
     int tempbool2;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxSashWindow_SetSashVisible",&_argc0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxSashWindow_SetSashVisible",&_argo0,&_arg1,&tempbool2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSashWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSashWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashWindow_SetSashVisible. Expected _wxSashWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashWindow_SetSashVisible. Expected _wxSashWindow_p.");
         return NULL;
         }


@@ -774,14 +809,15 @@ static PyObject *_wrap_wxSashWindow_SetSashBorder(PyObject *self, PyObject *args
     wxSashWindow * _arg0;
     wxSashEdgePosition  _arg1;
     bool  _arg2;
     wxSashWindow * _arg0;
     wxSashEdgePosition  _arg1;
     bool  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool2;
 
     self = self;
     int tempbool2;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxSashWindow_SetSashBorder",&_argc0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTuple(args,"Oii:wxSashWindow_SetSashBorder",&_argo0,&_arg1,&tempbool2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSashWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSashWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashWindow_SetSashBorder. Expected _wxSashWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashWindow_SetSashBorder. Expected _wxSashWindow_p.");
         return NULL;
         }


@@ -810,13 +846,14 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_SetRequestedLength(PyObject *self,
     PyObject * _resultobj;
     wxQueryLayoutInfoEvent * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxQueryLayoutInfoEvent * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxQueryLayoutInfoEvent_SetRequestedLength",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxQueryLayoutInfoEvent_SetRequestedLength",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxQueryLayoutInfoEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxQueryLayoutInfoEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxQueryLayoutInfoEvent_SetRequestedLength. Expected _wxQueryLayoutInfoEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxQueryLayoutInfoEvent_SetRequestedLength. Expected _wxQueryLayoutInfoEvent_p.");
         return NULL;
         }


@@ -836,13 +873,14 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_GetRequestedLength(PyObject *self,
     PyObject * _resultobj;
     int  _result;
     wxQueryLayoutInfoEvent * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxQueryLayoutInfoEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxQueryLayoutInfoEvent_GetRequestedLength",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxQueryLayoutInfoEvent_GetRequestedLength",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxQueryLayoutInfoEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxQueryLayoutInfoEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxQueryLayoutInfoEvent_GetRequestedLength. Expected _wxQueryLayoutInfoEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxQueryLayoutInfoEvent_GetRequestedLength. Expected _wxQueryLayoutInfoEvent_p.");
         return NULL;
         }


@@ -861,13 +899,14 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_SetFlags(PyObject *self, PyObject
     PyObject * _resultobj;
     wxQueryLayoutInfoEvent * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxQueryLayoutInfoEvent * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxQueryLayoutInfoEvent_SetFlags",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxQueryLayoutInfoEvent_SetFlags",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxQueryLayoutInfoEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxQueryLayoutInfoEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxQueryLayoutInfoEvent_SetFlags. Expected _wxQueryLayoutInfoEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxQueryLayoutInfoEvent_SetFlags. Expected _wxQueryLayoutInfoEvent_p.");
         return NULL;
         }


@@ -887,13 +926,14 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_GetFlags(PyObject *self, PyObject
     PyObject * _resultobj;
     int  _result;
     wxQueryLayoutInfoEvent * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxQueryLayoutInfoEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxQueryLayoutInfoEvent_GetFlags",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxQueryLayoutInfoEvent_GetFlags",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxQueryLayoutInfoEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxQueryLayoutInfoEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxQueryLayoutInfoEvent_GetFlags. Expected _wxQueryLayoutInfoEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxQueryLayoutInfoEvent_GetFlags. Expected _wxQueryLayoutInfoEvent_p.");
         return NULL;
         }


@@ -912,20 +952,22 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_SetSize(PyObject *self, PyObject *
     PyObject * _resultobj;
     wxQueryLayoutInfoEvent * _arg0;
     wxSize * _arg1;
     PyObject * _resultobj;
     wxQueryLayoutInfoEvent * _arg0;
     wxSize * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxQueryLayoutInfoEvent_SetSize",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxQueryLayoutInfoEvent_SetSize",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxQueryLayoutInfoEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxQueryLayoutInfoEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxQueryLayoutInfoEvent_SetSize. Expected _wxQueryLayoutInfoEvent_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxQueryLayoutInfoEvent_SetSize. Expected _wxQueryLayoutInfoEvent_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxSize_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxQueryLayoutInfoEvent_SetSize. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxQueryLayoutInfoEvent_SetSize. Expected _wxSize_p.");
         return NULL;
         }


@@ -945,14 +987,15 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_GetSize(PyObject *self, PyObject *
     PyObject * _resultobj;
     wxSize * _result;
     wxQueryLayoutInfoEvent * _arg0;
     PyObject * _resultobj;
     wxSize * _result;
     wxQueryLayoutInfoEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxQueryLayoutInfoEvent_GetSize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxQueryLayoutInfoEvent_GetSize",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxQueryLayoutInfoEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxQueryLayoutInfoEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxQueryLayoutInfoEvent_GetSize. Expected _wxQueryLayoutInfoEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxQueryLayoutInfoEvent_GetSize. Expected _wxQueryLayoutInfoEvent_p.");
         return NULL;
         }


@@ -972,13 +1015,14 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_SetOrientation(PyObject *self, PyO
     PyObject * _resultobj;
     wxQueryLayoutInfoEvent * _arg0;
     wxLayoutOrientation  _arg1;
     PyObject * _resultobj;
     wxQueryLayoutInfoEvent * _arg0;
     wxLayoutOrientation  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxQueryLayoutInfoEvent_SetOrientation",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxQueryLayoutInfoEvent_SetOrientation",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxQueryLayoutInfoEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxQueryLayoutInfoEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxQueryLayoutInfoEvent_SetOrientation. Expected _wxQueryLayoutInfoEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxQueryLayoutInfoEvent_SetOrientation. Expected _wxQueryLayoutInfoEvent_p.");
         return NULL;
         }


@@ -998,13 +1042,14 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_GetOrientation(PyObject *self, PyO
     PyObject * _resultobj;
     wxLayoutOrientation  _result;
     wxQueryLayoutInfoEvent * _arg0;
     PyObject * _resultobj;
     wxLayoutOrientation  _result;
     wxQueryLayoutInfoEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxQueryLayoutInfoEvent_GetOrientation",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxQueryLayoutInfoEvent_GetOrientation",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxQueryLayoutInfoEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxQueryLayoutInfoEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxQueryLayoutInfoEvent_GetOrientation. Expected _wxQueryLayoutInfoEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxQueryLayoutInfoEvent_GetOrientation. Expected _wxQueryLayoutInfoEvent_p.");
         return NULL;
         }


@@ -1023,13 +1068,14 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_SetAlignment(PyObject *self, PyObj
     PyObject * _resultobj;
     wxQueryLayoutInfoEvent * _arg0;
     wxLayoutAlignment  _arg1;
     PyObject * _resultobj;
     wxQueryLayoutInfoEvent * _arg0;
     wxLayoutAlignment  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxQueryLayoutInfoEvent_SetAlignment",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxQueryLayoutInfoEvent_SetAlignment",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxQueryLayoutInfoEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxQueryLayoutInfoEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxQueryLayoutInfoEvent_SetAlignment. Expected _wxQueryLayoutInfoEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxQueryLayoutInfoEvent_SetAlignment. Expected _wxQueryLayoutInfoEvent_p.");
         return NULL;
         }


@@ -1049,13 +1095,14 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_GetAlignment(PyObject *self, PyObj
     PyObject * _resultobj;
     wxLayoutAlignment  _result;
     wxQueryLayoutInfoEvent * _arg0;
     PyObject * _resultobj;
     wxLayoutAlignment  _result;
     wxQueryLayoutInfoEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxQueryLayoutInfoEvent_GetAlignment",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxQueryLayoutInfoEvent_GetAlignment",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxQueryLayoutInfoEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxQueryLayoutInfoEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxQueryLayoutInfoEvent_GetAlignment. Expected _wxQueryLayoutInfoEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxQueryLayoutInfoEvent_GetAlignment. Expected _wxQueryLayoutInfoEvent_p.");
         return NULL;
         }


@@ -1082,13 +1129,14 @@ static PyObject *_wrap_wxCalculateLayoutEvent_SetFlags(PyObject *self, PyObject
     PyObject * _resultobj;
     wxCalculateLayoutEvent * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxCalculateLayoutEvent * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxCalculateLayoutEvent_SetFlags",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxCalculateLayoutEvent_SetFlags",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCalculateLayoutEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCalculateLayoutEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCalculateLayoutEvent_SetFlags. Expected _wxCalculateLayoutEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCalculateLayoutEvent_SetFlags. Expected _wxCalculateLayoutEvent_p.");
         return NULL;
         }


@@ -1108,13 +1156,14 @@ static PyObject *_wrap_wxCalculateLayoutEvent_GetFlags(PyObject *self, PyObject
     PyObject * _resultobj;
     int  _result;
     wxCalculateLayoutEvent * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxCalculateLayoutEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxCalculateLayoutEvent_GetFlags",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxCalculateLayoutEvent_GetFlags",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCalculateLayoutEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCalculateLayoutEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCalculateLayoutEvent_GetFlags. Expected _wxCalculateLayoutEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCalculateLayoutEvent_GetFlags. Expected _wxCalculateLayoutEvent_p.");
         return NULL;
         }


@@ -1133,20 +1182,22 @@ static PyObject *_wrap_wxCalculateLayoutEvent_SetRect(PyObject *self, PyObject *
     PyObject * _resultobj;
     wxCalculateLayoutEvent * _arg0;
     wxRect * _arg1;
     PyObject * _resultobj;
     wxCalculateLayoutEvent * _arg0;
     wxRect * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxCalculateLayoutEvent_SetRect",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxCalculateLayoutEvent_SetRect",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCalculateLayoutEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCalculateLayoutEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCalculateLayoutEvent_SetRect. Expected _wxCalculateLayoutEvent_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCalculateLayoutEvent_SetRect. Expected _wxCalculateLayoutEvent_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxRect_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxCalculateLayoutEvent_SetRect. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxCalculateLayoutEvent_SetRect. Expected _wxRect_p.");
         return NULL;
         }


@@ -1166,14 +1217,15 @@ static PyObject *_wrap_wxCalculateLayoutEvent_GetRect(PyObject *self, PyObject *
     PyObject * _resultobj;
     wxRect * _result;
     wxCalculateLayoutEvent * _arg0;
     PyObject * _resultobj;
     wxRect * _result;
     wxCalculateLayoutEvent * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxCalculateLayoutEvent_GetRect",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxCalculateLayoutEvent_GetRect",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCalculateLayoutEvent_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCalculateLayoutEvent_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCalculateLayoutEvent_GetRect. Expected _wxCalculateLayoutEvent_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCalculateLayoutEvent_GetRect. Expected _wxCalculateLayoutEvent_p.");
         return NULL;
         }


@@ -1218,32 +1270,35 @@ static PyObject *_wrap_new_wxSashLayoutWindow(PyObject *self, PyObject *args) {
     wxSashLayoutWindow * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxSashLayoutWindow * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;

-    wxPoint * _arg2 = &wxPyDefaultPosition;
-    wxSize * _arg3 = &wxPyDefaultSize;
-    long  _arg4 = (wxCLIP_CHILDREN)|(wxSW_3D);
-    char * _arg5 = "layoutWindow";
-    char * _argc0 = 0;
-    char * _argc2 = 0;
-    char * _argc3 = 0;
+    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    long  _arg4 = (long ) wxCLIP_CHILDREN|(wxSW_3D);
+    char * _arg5 = (char *) "layoutWindow";
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;
+    PyObject * _argo3 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si|ssls:new_wxSashLayoutWindow",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTuple(args,"Oi|OOls:new_wxSashLayoutWindow",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxSashLayoutWindow. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxSashLayoutWindow. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxSashLayoutWindow. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxSashLayoutWindow. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxSize_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxSashLayoutWindow. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxSashLayoutWindow. Expected _wxSize_p.");
         return NULL;
         }


@@ -1253,8 +1308,13 @@ static PyObject *_wrap_new_wxSashLayoutWindow(PyObject *self, PyObject *args) {
         _result = (wxSashLayoutWindow *)new_wxSashLayoutWindow(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxSashLayoutWindow *)new_wxSashLayoutWindow(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxSashLayoutWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxSashLayoutWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1263,13 +1323,14 @@ static PyObject *_wrap_wxSashLayoutWindow_GetAlignment(PyObject *self, PyObject
     PyObject * _resultobj;
     wxLayoutAlignment  _result;
     wxSashLayoutWindow * _arg0;
     PyObject * _resultobj;
     wxLayoutAlignment  _result;
     wxSashLayoutWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSashLayoutWindow_GetAlignment",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSashLayoutWindow_GetAlignment",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSashLayoutWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSashLayoutWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashLayoutWindow_GetAlignment. Expected _wxSashLayoutWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashLayoutWindow_GetAlignment. Expected _wxSashLayoutWindow_p.");
         return NULL;
         }


@@ -1288,13 +1349,14 @@ static PyObject *_wrap_wxSashLayoutWindow_GetOrientation(PyObject *self, PyObjec
     PyObject * _resultobj;
     wxLayoutOrientation  _result;
     wxSashLayoutWindow * _arg0;
     PyObject * _resultobj;
     wxLayoutOrientation  _result;
     wxSashLayoutWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSashLayoutWindow_GetOrientation",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSashLayoutWindow_GetOrientation",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSashLayoutWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSashLayoutWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashLayoutWindow_GetOrientation. Expected _wxSashLayoutWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashLayoutWindow_GetOrientation. Expected _wxSashLayoutWindow_p.");
         return NULL;
         }


@@ -1313,13 +1375,14 @@ static PyObject *_wrap_wxSashLayoutWindow_SetAlignment(PyObject *self, PyObject
     PyObject * _resultobj;
     wxSashLayoutWindow * _arg0;
     wxLayoutAlignment  _arg1;
     PyObject * _resultobj;
     wxSashLayoutWindow * _arg0;
     wxLayoutAlignment  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxSashLayoutWindow_SetAlignment",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxSashLayoutWindow_SetAlignment",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSashLayoutWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSashLayoutWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashLayoutWindow_SetAlignment. Expected _wxSashLayoutWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashLayoutWindow_SetAlignment. Expected _wxSashLayoutWindow_p.");
         return NULL;
         }


@@ -1339,20 +1402,22 @@ static PyObject *_wrap_wxSashLayoutWindow_SetDefaultSize(PyObject *self, PyObjec
     PyObject * _resultobj;
     wxSashLayoutWindow * _arg0;
     wxSize * _arg1;
     PyObject * _resultobj;
     wxSashLayoutWindow * _arg0;
     wxSize * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxSashLayoutWindow_SetDefaultSize",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxSashLayoutWindow_SetDefaultSize",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSashLayoutWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSashLayoutWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashLayoutWindow_SetDefaultSize. Expected _wxSashLayoutWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashLayoutWindow_SetDefaultSize. Expected _wxSashLayoutWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxSize_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSashLayoutWindow_SetDefaultSize. Expected _wxSize_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSashLayoutWindow_SetDefaultSize. Expected _wxSize_p.");
         return NULL;
         }


@@ -1372,13 +1437,14 @@ static PyObject *_wrap_wxSashLayoutWindow_SetOrientation(PyObject *self, PyObjec
     PyObject * _resultobj;
     wxSashLayoutWindow * _arg0;
     wxLayoutOrientation  _arg1;
     PyObject * _resultobj;
     wxSashLayoutWindow * _arg0;
     wxLayoutOrientation  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxSashLayoutWindow_SetOrientation",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxSashLayoutWindow_SetOrientation",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSashLayoutWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSashLayoutWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashLayoutWindow_SetOrientation. Expected _wxSashLayoutWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSashLayoutWindow_SetOrientation. Expected _wxSashLayoutWindow_p.");
         return NULL;
         }


@@ -1407,8 +1473,13 @@ static PyObject *_wrap_new_wxLayoutAlgorithm(PyObject *self, PyObject *args) {
         _result = (wxLayoutAlgorithm *)new_wxLayoutAlgorithm();
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxLayoutAlgorithm *)new_wxLayoutAlgorithm();
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxLayoutAlgorithm_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxLayoutAlgorithm_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1416,13 +1487,14 @@ static PyObject *_wrap_new_wxLayoutAlgorithm(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxLayoutAlgorithm(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxLayoutAlgorithm * _arg0;
 static PyObject *_wrap_delete_wxLayoutAlgorithm(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxLayoutAlgorithm * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:delete_wxLayoutAlgorithm",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxLayoutAlgorithm",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxLayoutAlgorithm_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLayoutAlgorithm_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxLayoutAlgorithm. Expected _wxLayoutAlgorithm_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxLayoutAlgorithm. Expected _wxLayoutAlgorithm_p.");
         return NULL;
         }


@@ -1443,28 +1515,31 @@ static PyObject *_wrap_wxLayoutAlgorithm_LayoutMDIFrame(PyObject *self, PyObject
     bool  _result;
     wxLayoutAlgorithm * _arg0;
     wxMDIParentFrame * _arg1;
     bool  _result;
     wxLayoutAlgorithm * _arg0;
     wxMDIParentFrame * _arg1;

-    wxRect * _arg2 = NULL;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
-    char * _argc2 = 0;
+    wxRect * _arg2 = (wxRect *) NULL;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss|s:wxLayoutAlgorithm_LayoutMDIFrame",&_argc0,&_argc1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"OO|O:wxLayoutAlgorithm_LayoutMDIFrame",&_argo0,&_argo1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxLayoutAlgorithm_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLayoutAlgorithm_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLayoutAlgorithm_LayoutMDIFrame. Expected _wxLayoutAlgorithm_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLayoutAlgorithm_LayoutMDIFrame. Expected _wxLayoutAlgorithm_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxMDIParentFrame_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxMDIParentFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxLayoutAlgorithm_LayoutMDIFrame. Expected _wxMDIParentFrame_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxLayoutAlgorithm_LayoutMDIFrame. Expected _wxMDIParentFrame_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxRect_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxLayoutAlgorithm_LayoutMDIFrame. Expected _wxRect_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxLayoutAlgorithm_LayoutMDIFrame. Expected _wxRect_p.");
         return NULL;
         }


@@ -1484,28 +1559,31 @@ static PyObject *_wrap_wxLayoutAlgorithm_LayoutFrame(PyObject *self, PyObject *a
     bool  _result;
     wxLayoutAlgorithm * _arg0;
     wxFrame * _arg1;
     bool  _result;
     wxLayoutAlgorithm * _arg0;
     wxFrame * _arg1;

-    wxWindow * _arg2 = NULL;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
-    char * _argc2 = 0;
+    wxWindow * _arg2 = (wxWindow *) NULL;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss|s:wxLayoutAlgorithm_LayoutFrame",&_argc0,&_argc1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"OO|O:wxLayoutAlgorithm_LayoutFrame",&_argo0,&_argo1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxLayoutAlgorithm_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLayoutAlgorithm_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLayoutAlgorithm_LayoutFrame. Expected _wxLayoutAlgorithm_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLayoutAlgorithm_LayoutFrame. Expected _wxLayoutAlgorithm_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxFrame_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxFrame_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxLayoutAlgorithm_LayoutFrame. Expected _wxFrame_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxLayoutAlgorithm_LayoutFrame. Expected _wxFrame_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxWindow_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxLayoutAlgorithm_LayoutFrame. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxLayoutAlgorithm_LayoutFrame. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1525,28 +1603,31 @@ static PyObject *_wrap_wxLayoutAlgorithm_LayoutWindow(PyObject *self, PyObject *
     bool  _result;
     wxLayoutAlgorithm * _arg0;
     wxWindow * _arg1;
     bool  _result;
     wxLayoutAlgorithm * _arg0;
     wxWindow * _arg1;

-    wxWindow * _arg2 = NULL;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
-    char * _argc2 = 0;
+    wxWindow * _arg2 = (wxWindow *) NULL;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    PyObject * _argo2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss|s:wxLayoutAlgorithm_LayoutWindow",&_argc0,&_argc1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"OO|O:wxLayoutAlgorithm_LayoutWindow",&_argo0,&_argo1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxLayoutAlgorithm_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLayoutAlgorithm_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLayoutAlgorithm_LayoutWindow. Expected _wxLayoutAlgorithm_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLayoutAlgorithm_LayoutWindow. Expected _wxLayoutAlgorithm_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxLayoutAlgorithm_LayoutWindow. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxLayoutAlgorithm_LayoutWindow. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxWindow_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxLayoutAlgorithm_LayoutWindow. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxLayoutAlgorithm_LayoutWindow. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1561,62 +1642,377 @@ static PyObject *_wrap_wxLayoutAlgorithm_LayoutWindow(PyObject *self, PyObject *
 }
 
 static PyMethodDef windows3cMethods[] = {
 }
 
 static PyMethodDef windows3cMethods[] = {

-        { "wxLayoutAlgorithm_LayoutWindow", _wrap_wxLayoutAlgorithm_LayoutWindow, 1 },
-        { "wxLayoutAlgorithm_LayoutFrame", _wrap_wxLayoutAlgorithm_LayoutFrame, 1 },
-        { "wxLayoutAlgorithm_LayoutMDIFrame", _wrap_wxLayoutAlgorithm_LayoutMDIFrame, 1 },
-        { "delete_wxLayoutAlgorithm", _wrap_delete_wxLayoutAlgorithm, 1 },
-        { "new_wxLayoutAlgorithm", _wrap_new_wxLayoutAlgorithm, 1 },
-        { "wxSashLayoutWindow_SetOrientation", _wrap_wxSashLayoutWindow_SetOrientation, 1 },
-        { "wxSashLayoutWindow_SetDefaultSize", _wrap_wxSashLayoutWindow_SetDefaultSize, 1 },
-        { "wxSashLayoutWindow_SetAlignment", _wrap_wxSashLayoutWindow_SetAlignment, 1 },
-        { "wxSashLayoutWindow_GetOrientation", _wrap_wxSashLayoutWindow_GetOrientation, 1 },
-        { "wxSashLayoutWindow_GetAlignment", _wrap_wxSashLayoutWindow_GetAlignment, 1 },
-        { "new_wxSashLayoutWindow", _wrap_new_wxSashLayoutWindow, 1 },
-        { "wxCalculateLayoutEvent_GetRect", _wrap_wxCalculateLayoutEvent_GetRect, 1 },
-        { "wxCalculateLayoutEvent_SetRect", _wrap_wxCalculateLayoutEvent_SetRect, 1 },
-        { "wxCalculateLayoutEvent_GetFlags", _wrap_wxCalculateLayoutEvent_GetFlags, 1 },
-        { "wxCalculateLayoutEvent_SetFlags", _wrap_wxCalculateLayoutEvent_SetFlags, 1 },
-        { "wxQueryLayoutInfoEvent_GetAlignment", _wrap_wxQueryLayoutInfoEvent_GetAlignment, 1 },
-        { "wxQueryLayoutInfoEvent_SetAlignment", _wrap_wxQueryLayoutInfoEvent_SetAlignment, 1 },
-        { "wxQueryLayoutInfoEvent_GetOrientation", _wrap_wxQueryLayoutInfoEvent_GetOrientation, 1 },
-        { "wxQueryLayoutInfoEvent_SetOrientation", _wrap_wxQueryLayoutInfoEvent_SetOrientation, 1 },
-        { "wxQueryLayoutInfoEvent_GetSize", _wrap_wxQueryLayoutInfoEvent_GetSize, 1 },
-        { "wxQueryLayoutInfoEvent_SetSize", _wrap_wxQueryLayoutInfoEvent_SetSize, 1 },
-        { "wxQueryLayoutInfoEvent_GetFlags", _wrap_wxQueryLayoutInfoEvent_GetFlags, 1 },
-        { "wxQueryLayoutInfoEvent_SetFlags", _wrap_wxQueryLayoutInfoEvent_SetFlags, 1 },
-        { "wxQueryLayoutInfoEvent_GetRequestedLength", _wrap_wxQueryLayoutInfoEvent_GetRequestedLength, 1 },
-        { "wxQueryLayoutInfoEvent_SetRequestedLength", _wrap_wxQueryLayoutInfoEvent_SetRequestedLength, 1 },
-        { "wxSashWindow_SetSashBorder", _wrap_wxSashWindow_SetSashBorder, 1 },
-        { "wxSashWindow_SetSashVisible", _wrap_wxSashWindow_SetSashVisible, 1 },
-        { "wxSashWindow_SetMinimumSizeY", _wrap_wxSashWindow_SetMinimumSizeY, 1 },
-        { "wxSashWindow_SetMinimumSizeX", _wrap_wxSashWindow_SetMinimumSizeX, 1 },
-        { "wxSashWindow_SetMaximumSizeY", _wrap_wxSashWindow_SetMaximumSizeY, 1 },
-        { "wxSashWindow_SetMaximumSizeX", _wrap_wxSashWindow_SetMaximumSizeX, 1 },
-        { "wxSashWindow_SetExtraBorderSize", _wrap_wxSashWindow_SetExtraBorderSize, 1 },
-        { "wxSashWindow_SetDefaultBorderSize", _wrap_wxSashWindow_SetDefaultBorderSize, 1 },
-        { "wxSashWindow_HasBorder", _wrap_wxSashWindow_HasBorder, 1 },
-        { "wxSashWindow_GetMinimumSizeY", _wrap_wxSashWindow_GetMinimumSizeY, 1 },
-        { "wxSashWindow_GetMinimumSizeX", _wrap_wxSashWindow_GetMinimumSizeX, 1 },
-        { "wxSashWindow_GetMaximumSizeY", _wrap_wxSashWindow_GetMaximumSizeY, 1 },
-        { "wxSashWindow_GetMaximumSizeX", _wrap_wxSashWindow_GetMaximumSizeX, 1 },
-        { "wxSashWindow_GetExtraBorderSize", _wrap_wxSashWindow_GetExtraBorderSize, 1 },
-        { "wxSashWindow_GetEdgeMargin", _wrap_wxSashWindow_GetEdgeMargin, 1 },
-        { "wxSashWindow_GetDefaultBorderSize", _wrap_wxSashWindow_GetDefaultBorderSize, 1 },
-        { "wxSashWindow_GetSashVisible", _wrap_wxSashWindow_GetSashVisible, 1 },
-        { "new_wxSashWindow", _wrap_new_wxSashWindow, 1 },
-        { "wxSashEvent_GetDragStatus", _wrap_wxSashEvent_GetDragStatus, 1 },
-        { "wxSashEvent_SetDragStatus", _wrap_wxSashEvent_SetDragStatus, 1 },
-        { "wxSashEvent_GetDragRect", _wrap_wxSashEvent_GetDragRect, 1 },
-        { "wxSashEvent_SetDragRect", _wrap_wxSashEvent_SetDragRect, 1 },
-        { "wxSashEvent_GetEdge", _wrap_wxSashEvent_GetEdge, 1 },
-        { "wxSashEvent_SetEdge", _wrap_wxSashEvent_SetEdge, 1 },
+        { "wxLayoutAlgorithm_LayoutWindow", _wrap_wxLayoutAlgorithm_LayoutWindow, METH_VARARGS },
+        { "wxLayoutAlgorithm_LayoutFrame", _wrap_wxLayoutAlgorithm_LayoutFrame, METH_VARARGS },
+        { "wxLayoutAlgorithm_LayoutMDIFrame", _wrap_wxLayoutAlgorithm_LayoutMDIFrame, METH_VARARGS },
+        { "delete_wxLayoutAlgorithm", _wrap_delete_wxLayoutAlgorithm, METH_VARARGS },
+        { "new_wxLayoutAlgorithm", _wrap_new_wxLayoutAlgorithm, METH_VARARGS },
+        { "wxSashLayoutWindow_SetOrientation", _wrap_wxSashLayoutWindow_SetOrientation, METH_VARARGS },
+        { "wxSashLayoutWindow_SetDefaultSize", _wrap_wxSashLayoutWindow_SetDefaultSize, METH_VARARGS },
+        { "wxSashLayoutWindow_SetAlignment", _wrap_wxSashLayoutWindow_SetAlignment, METH_VARARGS },
+        { "wxSashLayoutWindow_GetOrientation", _wrap_wxSashLayoutWindow_GetOrientation, METH_VARARGS },
+        { "wxSashLayoutWindow_GetAlignment", _wrap_wxSashLayoutWindow_GetAlignment, METH_VARARGS },
+        { "new_wxSashLayoutWindow", _wrap_new_wxSashLayoutWindow, METH_VARARGS },
+        { "wxCalculateLayoutEvent_GetRect", _wrap_wxCalculateLayoutEvent_GetRect, METH_VARARGS },
+        { "wxCalculateLayoutEvent_SetRect", _wrap_wxCalculateLayoutEvent_SetRect, METH_VARARGS },
+        { "wxCalculateLayoutEvent_GetFlags", _wrap_wxCalculateLayoutEvent_GetFlags, METH_VARARGS },
+        { "wxCalculateLayoutEvent_SetFlags", _wrap_wxCalculateLayoutEvent_SetFlags, METH_VARARGS },
+        { "wxQueryLayoutInfoEvent_GetAlignment", _wrap_wxQueryLayoutInfoEvent_GetAlignment, METH_VARARGS },
+        { "wxQueryLayoutInfoEvent_SetAlignment", _wrap_wxQueryLayoutInfoEvent_SetAlignment, METH_VARARGS },
+        { "wxQueryLayoutInfoEvent_GetOrientation", _wrap_wxQueryLayoutInfoEvent_GetOrientation, METH_VARARGS },
+        { "wxQueryLayoutInfoEvent_SetOrientation", _wrap_wxQueryLayoutInfoEvent_SetOrientation, METH_VARARGS },
+        { "wxQueryLayoutInfoEvent_GetSize", _wrap_wxQueryLayoutInfoEvent_GetSize, METH_VARARGS },
+        { "wxQueryLayoutInfoEvent_SetSize", _wrap_wxQueryLayoutInfoEvent_SetSize, METH_VARARGS },
+        { "wxQueryLayoutInfoEvent_GetFlags", _wrap_wxQueryLayoutInfoEvent_GetFlags, METH_VARARGS },
+        { "wxQueryLayoutInfoEvent_SetFlags", _wrap_wxQueryLayoutInfoEvent_SetFlags, METH_VARARGS },
+        { "wxQueryLayoutInfoEvent_GetRequestedLength", _wrap_wxQueryLayoutInfoEvent_GetRequestedLength, METH_VARARGS },
+        { "wxQueryLayoutInfoEvent_SetRequestedLength", _wrap_wxQueryLayoutInfoEvent_SetRequestedLength, METH_VARARGS },
+        { "wxSashWindow_SetSashBorder", _wrap_wxSashWindow_SetSashBorder, METH_VARARGS },
+        { "wxSashWindow_SetSashVisible", _wrap_wxSashWindow_SetSashVisible, METH_VARARGS },
+        { "wxSashWindow_SetMinimumSizeY", _wrap_wxSashWindow_SetMinimumSizeY, METH_VARARGS },
+        { "wxSashWindow_SetMinimumSizeX", _wrap_wxSashWindow_SetMinimumSizeX, METH_VARARGS },
+        { "wxSashWindow_SetMaximumSizeY", _wrap_wxSashWindow_SetMaximumSizeY, METH_VARARGS },
+        { "wxSashWindow_SetMaximumSizeX", _wrap_wxSashWindow_SetMaximumSizeX, METH_VARARGS },
+        { "wxSashWindow_SetExtraBorderSize", _wrap_wxSashWindow_SetExtraBorderSize, METH_VARARGS },
+        { "wxSashWindow_SetDefaultBorderSize", _wrap_wxSashWindow_SetDefaultBorderSize, METH_VARARGS },
+        { "wxSashWindow_HasBorder", _wrap_wxSashWindow_HasBorder, METH_VARARGS },
+        { "wxSashWindow_GetMinimumSizeY", _wrap_wxSashWindow_GetMinimumSizeY, METH_VARARGS },
+        { "wxSashWindow_GetMinimumSizeX", _wrap_wxSashWindow_GetMinimumSizeX, METH_VARARGS },
+        { "wxSashWindow_GetMaximumSizeY", _wrap_wxSashWindow_GetMaximumSizeY, METH_VARARGS },
+        { "wxSashWindow_GetMaximumSizeX", _wrap_wxSashWindow_GetMaximumSizeX, METH_VARARGS },
+        { "wxSashWindow_GetExtraBorderSize", _wrap_wxSashWindow_GetExtraBorderSize, METH_VARARGS },
+        { "wxSashWindow_GetEdgeMargin", _wrap_wxSashWindow_GetEdgeMargin, METH_VARARGS },
+        { "wxSashWindow_GetDefaultBorderSize", _wrap_wxSashWindow_GetDefaultBorderSize, METH_VARARGS },
+        { "wxSashWindow_GetSashVisible", _wrap_wxSashWindow_GetSashVisible, METH_VARARGS },
+        { "new_wxSashWindow", _wrap_new_wxSashWindow, METH_VARARGS },
+        { "wxSashEvent_GetDragStatus", _wrap_wxSashEvent_GetDragStatus, METH_VARARGS },
+        { "wxSashEvent_SetDragStatus", _wrap_wxSashEvent_SetDragStatus, METH_VARARGS },
+        { "wxSashEvent_GetDragRect", _wrap_wxSashEvent_GetDragRect, METH_VARARGS },
+        { "wxSashEvent_SetDragRect", _wrap_wxSashEvent_SetDragRect, METH_VARARGS },
+        { "wxSashEvent_GetEdge", _wrap_wxSashEvent_GetEdge, METH_VARARGS },
+        { "wxSashEvent_SetEdge", _wrap_wxSashEvent_SetEdge, METH_VARARGS },

         { NULL, NULL }
 };
         { NULL, NULL }
 };

+#ifdef __cplusplus
+}
+#endif
+/*
+ * This table is used by the pointer type-checker
+ */
+static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
+    { "_wxAcceleratorTable","_class_wxAcceleratorTable",0},
+    { "_wxEvent","_class_wxCalculateLayoutEvent",SwigwxCalculateLayoutEventTowxEvent},
+    { "_wxEvent","_wxCalculateLayoutEvent",SwigwxCalculateLayoutEventTowxEvent},
+    { "_wxEvent","_class_wxQueryLayoutInfoEvent",SwigwxQueryLayoutInfoEventTowxEvent},
+    { "_wxEvent","_wxQueryLayoutInfoEvent",SwigwxQueryLayoutInfoEventTowxEvent},
+    { "_wxEvent","_class_wxSashEvent",SwigwxSashEventTowxEvent},
+    { "_wxEvent","_wxSashEvent",SwigwxSashEventTowxEvent},
+    { "_wxEvent","_class_wxEvent",0},
+    { "_class_wxActivateEvent","_wxActivateEvent",0},
+    { "_signed_long","_long",0},
+    { "_wxMenuEvent","_class_wxMenuEvent",0},
+    { "_wxPrintQuality","_int",0},
+    { "_wxPrintQuality","_signed_int",0},
+    { "_wxPrintQuality","_unsigned_int",0},
+    { "_wxPrintQuality","_wxWindowID",0},
+    { "_wxPrintQuality","_uint",0},
+    { "_wxPrintQuality","_EBool",0},
+    { "_wxPrintQuality","_size_t",0},
+    { "_class_wxRegionIterator","_wxRegionIterator",0},
+    { "_class_wxMenuBar","_wxMenuBar",0},
+    { "_class_wxEvtHandler","_class_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxSashWindow",SwigwxSashWindowTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxSashWindow",SwigwxSashWindowTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxEvtHandler",0},
+    { "_wxPaintEvent","_class_wxPaintEvent",0},
+    { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
+    { "_wxCursor","_class_wxCursor",0},
+    { "_wxNotifyEvent","_class_wxNotifyEvent",0},
+    { "_wxMask","_class_wxMask",0},
+    { "_wxGrid","_class_wxGrid",0},
+    { "_wxPen","_class_wxPen",0},
+    { "_wxUpdateUIEvent","_class_wxUpdateUIEvent",0},
+    { "_byte","_unsigned_char",0},
+    { "_wxStaticBox","_class_wxStaticBox",0},
+    { "_wxChoice","_class_wxChoice",0},
+    { "_wxSlider","_class_wxSlider",0},
+    { "_wxNotebookEvent","_class_wxNotebookEvent",0},
+    { "_long","_wxDash",0},
+    { "_long","_unsigned_long",0},
+    { "_long","_signed_long",0},
+    { "_wxImageList","_class_wxImageList",0},
+    { "_wxDropFilesEvent","_class_wxDropFilesEvent",0},
+    { "_wxBitmapButton","_class_wxBitmapButton",0},
+    { "_wxSashWindow","_class_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxSashWindow},
+    { "_wxSashWindow","_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxSashWindow},
+    { "_wxSashWindow","_class_wxSashWindow",0},
+    { "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
+    { "_class_wxGauge","_wxGauge",0},
+    { "_class_wxSashEvent","_wxSashEvent",0},
+    { "_wxDC","_class_wxDC",0},
+    { "_wxSpinEvent","_class_wxSpinEvent",0},
+    { "_wxSashLayoutWindow","_class_wxSashLayoutWindow",0},
+    { "_size_t","_wxPrintQuality",0},
+    { "_size_t","_unsigned_int",0},
+    { "_size_t","_int",0},
+    { "_size_t","_wxWindowID",0},
+    { "_size_t","_uint",0},
+    { "_class_wxRealPoint","_wxRealPoint",0},
+    { "_wxPrinterDC","_class_wxPrinterDC",0},
+    { "_class_wxMenuItem","_wxMenuItem",0},
+    { "_class_wxPaintEvent","_wxPaintEvent",0},
+    { "_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0},
+    { "_class_wxStatusBar","_wxStatusBar",0},
+    { "_wxPanel","_class_wxPanel",0},
+    { "_wxInitDialogEvent","_class_wxInitDialogEvent",0},
+    { "_wxCheckBox","_class_wxCheckBox",0},
+    { "_wxPyEvent","_class_wxPyEvent",0},
+    { "_wxTextCtrl","_class_wxTextCtrl",0},
+    { "_class_wxMask","_wxMask",0},
+    { "_class_wxKeyEvent","_wxKeyEvent",0},
+    { "_class_wxGrid","_wxGrid",0},
+    { "_wxColour","_class_wxColour",0},
+    { "_class_wxDialog","_wxDialog",0},
+    { "_wxIdleEvent","_class_wxIdleEvent",0},
+    { "_class_wxUpdateUIEvent","_wxUpdateUIEvent",0},
+    { "_wxToolBar","_class_wxToolBar",0},
+    { "_wxStaticLine","_class_wxStaticLine",0},
+    { "_class_wxLayoutAlgorithm","_wxLayoutAlgorithm",0},
+    { "_wxBrush","_class_wxBrush",0},
+    { "_class_wxNotebookEvent","_wxNotebookEvent",0},
+    { "_wxMiniFrame","_class_wxMiniFrame",0},
+    { "_class_wxSashWindow","_class_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxSashWindow},
+    { "_class_wxSashWindow","_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxSashWindow},
+    { "_class_wxSashWindow","_wxSashWindow",0},
+    { "_wxShowEvent","_class_wxShowEvent",0},
+    { "_uint","_wxPrintQuality",0},
+    { "_uint","_size_t",0},
+    { "_uint","_unsigned_int",0},
+    { "_uint","_int",0},
+    { "_uint","_wxWindowID",0},
+    { "_class_wxEvent","_class_wxCalculateLayoutEvent",SwigwxCalculateLayoutEventTowxEvent},
+    { "_class_wxEvent","_wxCalculateLayoutEvent",SwigwxCalculateLayoutEventTowxEvent},
+    { "_class_wxEvent","_class_wxQueryLayoutInfoEvent",SwigwxQueryLayoutInfoEventTowxEvent},
+    { "_class_wxEvent","_wxQueryLayoutInfoEvent",SwigwxQueryLayoutInfoEventTowxEvent},
+    { "_class_wxEvent","_class_wxSashEvent",SwigwxSashEventTowxEvent},
+    { "_class_wxEvent","_wxSashEvent",SwigwxSashEventTowxEvent},
+    { "_class_wxEvent","_wxEvent",0},
+    { "_wxCheckListBox","_class_wxCheckListBox",0},
+    { "_wxSplitterEvent","_class_wxSplitterEvent",0},
+    { "_wxGridEvent","_class_wxGridEvent",0},
+    { "_wxRect","_class_wxRect",0},
+    { "_wxCommandEvent","_class_wxSashEvent",SwigwxSashEventTowxCommandEvent},
+    { "_wxCommandEvent","_wxSashEvent",SwigwxSashEventTowxCommandEvent},
+    { "_wxCommandEvent","_class_wxCommandEvent",0},
+    { "_wxSizeEvent","_class_wxSizeEvent",0},
+    { "_wxPoint","_class_wxPoint",0},
+    { "_class_wxSashLayoutWindow","_wxSashLayoutWindow",0},
+    { "_class_wxButton","_wxButton",0},
+    { "_wxRadioBox","_class_wxRadioBox",0},
+    { "_wxBitmap","_class_wxBitmap",0},
+    { "_wxTaskBarIcon","_class_wxTaskBarIcon",0},
+    { "_wxPyTimer","_class_wxPyTimer",0},
+    { "_wxWindowDC","_class_wxWindowDC",0},
+    { "_wxScrollBar","_class_wxScrollBar",0},
+    { "_wxSpinButton","_class_wxSpinButton",0},
+    { "_wxToolBarTool","_class_wxToolBarTool",0},
+    { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
+    { "_class_wxNotifyEvent","_wxNotifyEvent",0},
+    { "_class_wxPyEvent","_wxPyEvent",0},
+    { "_class_wxIconizeEvent","_wxIconizeEvent",0},
+    { "_class_wxStaticBitmap","_wxStaticBitmap",0},
+    { "_wxMDIChildFrame","_class_wxMDIChildFrame",0},
+    { "_class_wxToolBar","_wxToolBar",0},
+    { "_class_wxStaticLine","_wxStaticLine",0},
+    { "_wxScrollEvent","_class_wxScrollEvent",0},
+    { "_wxCalculateLayoutEvent","_class_wxCalculateLayoutEvent",0},
+    { "_EBool","_wxPrintQuality",0},
+    { "_EBool","_signed_int",0},
+    { "_EBool","_int",0},
+    { "_EBool","_wxWindowID",0},
+    { "_class_wxRegion","_wxRegion",0},
+    { "_class_wxDropFilesEvent","_wxDropFilesEvent",0},
+    { "_wxStaticText","_class_wxStaticText",0},
+    { "_wxFont","_class_wxFont",0},
+    { "_wxCloseEvent","_class_wxCloseEvent",0},
+    { "_class_wxSplitterEvent","_wxSplitterEvent",0},
+    { "_wxNotebook","_class_wxNotebook",0},
+    { "_unsigned_long","_wxDash",0},
+    { "_unsigned_long","_long",0},
+    { "_class_wxRect","_wxRect",0},
+    { "_class_wxDC","_wxDC",0},
+    { "_wxMDIParentFrame","_class_wxMDIParentFrame",0},
+    { "_class_wxPyTimer","_wxPyTimer",0},
+    { "_wxFocusEvent","_class_wxFocusEvent",0},
+    { "_wxMaximizeEvent","_class_wxMaximizeEvent",0},
+    { "_class_wxSpinButton","_wxSpinButton",0},
+    { "_wxAcceleratorEntry","_class_wxAcceleratorEntry",0},
+    { "_class_wxPanel","_wxPanel",0},
+    { "_class_wxCheckBox","_wxCheckBox",0},
+    { "_wxComboBox","_class_wxComboBox",0},
+    { "_wxRadioButton","_class_wxRadioButton",0},
+    { "_signed_int","_wxPrintQuality",0},
+    { "_signed_int","_EBool",0},
+    { "_signed_int","_wxWindowID",0},
+    { "_signed_int","_int",0},
+    { "_class_wxTextCtrl","_wxTextCtrl",0},
+    { "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
+    { "_wxMetaFileDC","_class_wxMetaFileDC",0},
+    { "_wxMenu","_class_wxMenu",0},
+    { "_class_wxMoveEvent","_wxMoveEvent",0},
+    { "_wxListBox","_class_wxListBox",0},
+    { "_wxScreenDC","_class_wxScreenDC",0},
+    { "_class_wxMDIChildFrame","_wxMDIChildFrame",0},
+    { "_WXTYPE","_short",0},
+    { "_WXTYPE","_signed_short",0},
+    { "_WXTYPE","_unsigned_short",0},
+    { "_class_wxMDIClientWindow","_wxMDIClientWindow",0},
+    { "_class_wxBrush","_wxBrush",0},
+    { "_unsigned_short","_WXTYPE",0},
+    { "_unsigned_short","_short",0},
+    { "_class_wxWindow","_class_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxWindow},
+    { "_class_wxWindow","_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxWindow},
+    { "_class_wxWindow","_class_wxSashWindow",SwigwxSashWindowTowxWindow},
+    { "_class_wxWindow","_wxSashWindow",SwigwxSashWindowTowxWindow},
+    { "_class_wxWindow","_wxWindow",0},
+    { "_wxSplitterWindow","_class_wxSplitterWindow",0},
+    { "_class_wxStaticText","_wxStaticText",0},
+    { "_class_wxFont","_wxFont",0},
+    { "_class_wxCloseEvent","_wxCloseEvent",0},
+    { "_wxSashEvent","_class_wxSashEvent",0},
+    { "_class_wxMenuEvent","_wxMenuEvent",0},
+    { "_wxClientDC","_class_wxClientDC",0},
+    { "_wxMouseEvent","_class_wxMouseEvent",0},
+    { "_class_wxPoint","_wxPoint",0},
+    { "_wxRealPoint","_class_wxRealPoint",0},
+    { "_class_wxRadioBox","_wxRadioBox",0},
+    { "_wxGridCell","_class_wxGridCell",0},
+    { "_signed_short","_WXTYPE",0},
+    { "_signed_short","_short",0},
+    { "_wxMemoryDC","_class_wxMemoryDC",0},
+    { "_class_wxTaskBarIcon","_wxTaskBarIcon",0},
+    { "_wxPaintDC","_class_wxPaintDC",0},
+    { "_class_wxWindowDC","_wxWindowDC",0},
+    { "_class_wxFocusEvent","_wxFocusEvent",0},
+    { "_class_wxMaximizeEvent","_wxMaximizeEvent",0},
+    { "_wxStatusBar","_class_wxStatusBar",0},
+    { "_class_wxToolBarTool","_wxToolBarTool",0},
+    { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
+    { "_class_wxCursor","_wxCursor",0},
+    { "_wxScrolledWindow","_class_wxScrolledWindow",0},
+    { "_unsigned_char","_byte",0},
+    { "_class_wxMetaFileDC","_wxMetaFileDC",0},
+    { "_class_wxMenu","_wxMenu",0},
+    { "_wxControl","_class_wxControl",0},
+    { "_class_wxListBox","_wxListBox",0},
+    { "_unsigned_int","_wxPrintQuality",0},
+    { "_unsigned_int","_size_t",0},
+    { "_unsigned_int","_uint",0},
+    { "_unsigned_int","_wxWindowID",0},
+    { "_unsigned_int","_int",0},
+    { "_wxIcon","_class_wxIcon",0},
+    { "_wxDialog","_class_wxDialog",0},
+    { "_class_wxPen","_wxPen",0},
+    { "_wxQueryLayoutInfoEvent","_class_wxQueryLayoutInfoEvent",0},
+    { "_short","_WXTYPE",0},
+    { "_short","_unsigned_short",0},
+    { "_short","_signed_short",0},
+    { "_class_wxStaticBox","_wxStaticBox",0},
+    { "_wxLayoutAlgorithm","_class_wxLayoutAlgorithm",0},
+    { "_class_wxScrollEvent","_wxScrollEvent",0},
+    { "_wxJoystickEvent","_class_wxJoystickEvent",0},
+    { "_class_wxChoice","_wxChoice",0},
+    { "_class_wxSlider","_wxSlider",0},
+    { "_class_wxCalculateLayoutEvent","_wxCalculateLayoutEvent",0},
+    { "_class_wxImageList","_wxImageList",0},
+    { "_class_wxBitmapButton","_wxBitmapButton",0},
+    { "_wxFrame","_class_wxFrame",0},
+    { "_class_wxNotebook","_wxNotebook",0},
+    { "_wxWindowID","_wxPrintQuality",0},
+    { "_wxWindowID","_size_t",0},
+    { "_wxWindowID","_EBool",0},
+    { "_wxWindowID","_uint",0},
+    { "_wxWindowID","_int",0},
+    { "_wxWindowID","_signed_int",0},
+    { "_wxWindowID","_unsigned_int",0},
+    { "_int","_wxPrintQuality",0},
+    { "_int","_size_t",0},
+    { "_int","_EBool",0},
+    { "_int","_uint",0},
+    { "_int","_wxWindowID",0},
+    { "_int","_unsigned_int",0},
+    { "_int","_signed_int",0},
+    { "_class_wxMouseEvent","_wxMouseEvent",0},
+    { "_class_wxSpinEvent","_wxSpinEvent",0},
+    { "_wxButton","_class_wxButton",0},
+    { "_wxSize","_class_wxSize",0},
+    { "_wxRegionIterator","_class_wxRegionIterator",0},
+    { "_class_wxPrinterDC","_wxPrinterDC",0},
+    { "_class_wxMDIParentFrame","_wxMDIParentFrame",0},
+    { "_class_wxPaintDC","_wxPaintDC",0},
+    { "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0},
+    { "_class_wxInitDialogEvent","_wxInitDialogEvent",0},
+    { "_class_wxComboBox","_wxComboBox",0},
+    { "_class_wxRadioButton","_wxRadioButton",0},
+    { "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
+    { "_wxIconizeEvent","_class_wxIconizeEvent",0},
+    { "_class_wxControl","_wxControl",0},
+    { "_wxStaticBitmap","_class_wxStaticBitmap",0},
+    { "_class_wxIcon","_wxIcon",0},
+    { "_class_wxColour","_wxColour",0},
+    { "_class_wxScreenDC","_wxScreenDC",0},
+    { "_wxPalette","_class_wxPalette",0},
+    { "_class_wxIdleEvent","_wxIdleEvent",0},
+    { "_wxEraseEvent","_class_wxEraseEvent",0},
+    { "_class_wxJoystickEvent","_wxJoystickEvent",0},
+    { "_class_wxMiniFrame","_wxMiniFrame",0},
+    { "_wxRegion","_class_wxRegion",0},
+    { "_class_wxSplitterWindow","_wxSplitterWindow",0},
+    { "_class_wxShowEvent","_wxShowEvent",0},
+    { "_wxActivateEvent","_class_wxActivateEvent",0},
+    { "_wxGauge","_class_wxGauge",0},
+    { "_class_wxCheckListBox","_wxCheckListBox",0},
+    { "_class_wxGridEvent","_wxGridEvent",0},
+    { "_class_wxCommandEvent","_class_wxSashEvent",SwigwxSashEventTowxCommandEvent},
+    { "_class_wxCommandEvent","_wxSashEvent",SwigwxSashEventTowxCommandEvent},
+    { "_class_wxCommandEvent","_wxCommandEvent",0},
+    { "_class_wxClientDC","_wxClientDC",0},
+    { "_class_wxSizeEvent","_wxSizeEvent",0},
+    { "_class_wxGridCell","_wxGridCell",0},
+    { "_class_wxSize","_wxSize",0},
+    { "_class_wxBitmap","_wxBitmap",0},
+    { "_class_wxMemoryDC","_wxMemoryDC",0},
+    { "_wxMenuBar","_class_wxMenuBar",0},
+    { "_wxEvtHandler","_class_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxEvtHandler},
+    { "_wxEvtHandler","_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxSashWindow",SwigwxSashWindowTowxEvtHandler},
+    { "_wxEvtHandler","_wxSashWindow",SwigwxSashWindowTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxEvtHandler",0},
+    { "_wxMenuItem","_class_wxMenuItem",0},
+    { "_class_wxScrollBar","_wxScrollBar",0},
+    { "_wxDash","_unsigned_long",0},
+    { "_wxDash","_long",0},
+    { "_class_wxScrolledWindow","_wxScrolledWindow",0},
+    { "_wxKeyEvent","_class_wxKeyEvent",0},
+    { "_wxMoveEvent","_class_wxMoveEvent",0},
+    { "_class_wxPalette","_wxPalette",0},
+    { "_class_wxQueryLayoutInfoEvent","_wxQueryLayoutInfoEvent",0},
+    { "_class_wxEraseEvent","_wxEraseEvent",0},
+    { "_wxMDIClientWindow","_class_wxMDIClientWindow",0},
+    { "_wxWindow","_class_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxWindow},
+    { "_wxWindow","_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxWindow},
+    { "_wxWindow","_class_wxSashWindow",SwigwxSashWindowTowxWindow},
+    { "_wxWindow","_wxSashWindow",SwigwxSashWindowTowxWindow},
+    { "_wxWindow","_class_wxWindow",0},
+    { "_class_wxFrame","_wxFrame",0},
+{0,0,0}};
+

 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif
 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif

-SWIGEXPORT(void,initwindows3c)() {
+SWIGEXPORT(void) initwindows3c() {

         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("windows3c", windows3cMethods);
         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("windows3c", windows3cMethods);


@@ -1639,314 +2035,9 @@ SWIGEXPORT(void,initwindows3c)() {
         PyDict_SetItemString(d,"wxLAYOUT_BOTTOM", PyInt_FromLong((long) wxLAYOUT_BOTTOM));
         PyDict_SetItemString(d,"wxEVT_QUERY_LAYOUT_INFO", PyInt_FromLong((long) wxEVT_QUERY_LAYOUT_INFO));
         PyDict_SetItemString(d,"wxEVT_CALCULATE_LAYOUT", PyInt_FromLong((long) wxEVT_CALCULATE_LAYOUT));
         PyDict_SetItemString(d,"wxLAYOUT_BOTTOM", PyInt_FromLong((long) wxLAYOUT_BOTTOM));
         PyDict_SetItemString(d,"wxEVT_QUERY_LAYOUT_INFO", PyInt_FromLong((long) wxEVT_QUERY_LAYOUT_INFO));
         PyDict_SetItemString(d,"wxEVT_CALCULATE_LAYOUT", PyInt_FromLong((long) wxEVT_CALCULATE_LAYOUT));

-/*
- * These are the pointer type-equivalency mappings. 
- * (Used by the SWIG pointer type-checker).
- */
-        SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_wxEvent","_class_wxCalculateLayoutEvent",SwigwxCalculateLayoutEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_wxCalculateLayoutEvent",SwigwxCalculateLayoutEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_class_wxQueryLayoutInfoEvent",SwigwxQueryLayoutInfoEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_wxQueryLayoutInfoEvent",SwigwxQueryLayoutInfoEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_class_wxSashEvent",SwigwxSashEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_wxSashEvent",SwigwxSashEventTowxEvent);
-        SWIG_RegisterMapping("_wxEvent","_class_wxEvent",0);
-        SWIG_RegisterMapping("_class_wxActivateEvent","_wxActivateEvent",0);
-        SWIG_RegisterMapping("_signed_long","_long",0);
-        SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_signed_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_unsigned_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_wxWindowID",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_uint",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_EBool",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_size_t",0);
-        SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
-        SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxSashWindow",SwigwxSashWindowTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxSashWindow",SwigwxSashWindowTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxEvtHandler",0);
-        SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
-        SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
-        SWIG_RegisterMapping("_wxNotifyEvent","_class_wxNotifyEvent",0);
-        SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
-        SWIG_RegisterMapping("_wxGrid","_class_wxGrid",0);
-        SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
-        SWIG_RegisterMapping("_wxUpdateUIEvent","_class_wxUpdateUIEvent",0);
-        SWIG_RegisterMapping("_byte","_unsigned_char",0);
-        SWIG_RegisterMapping("_wxStaticBox","_class_wxStaticBox",0);
-        SWIG_RegisterMapping("_wxChoice","_class_wxChoice",0);
-        SWIG_RegisterMapping("_wxSlider","_class_wxSlider",0);
-        SWIG_RegisterMapping("_wxNotebookEvent","_class_wxNotebookEvent",0);
-        SWIG_RegisterMapping("_long","_wxDash",0);
-        SWIG_RegisterMapping("_long","_unsigned_long",0);
-        SWIG_RegisterMapping("_long","_signed_long",0);
-        SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0);
-        SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0);
-        SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0);
-        SWIG_RegisterMapping("_wxSashWindow","_class_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxSashWindow);
-        SWIG_RegisterMapping("_wxSashWindow","_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxSashWindow);
-        SWIG_RegisterMapping("_wxSashWindow","_class_wxSashWindow",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_class_wxGauge","_wxGauge",0);
-        SWIG_RegisterMapping("_class_wxSashEvent","_wxSashEvent",0);
-        SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
-        SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0);
-        SWIG_RegisterMapping("_wxSashLayoutWindow","_class_wxSashLayoutWindow",0);
-        SWIG_RegisterMapping("_size_t","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_size_t","_unsigned_int",0);
-        SWIG_RegisterMapping("_size_t","_int",0);
-        SWIG_RegisterMapping("_size_t","_wxWindowID",0);
-        SWIG_RegisterMapping("_size_t","_uint",0);
-        SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
-        SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0);
-        SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0);
-        SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0);
-        SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0);
-        SWIG_RegisterMapping("_class_wxStatusBar","_wxStatusBar",0);
-        SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);
-        SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
-        SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
-        SWIG_RegisterMapping("_wxPyEvent","_class_wxPyEvent",0);
-        SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);
-        SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
-        SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0);
-        SWIG_RegisterMapping("_class_wxGrid","_wxGrid",0);
-        SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
-        SWIG_RegisterMapping("_class_wxDialog","_wxDialog",0);
-        SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0);
-        SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0);
-        SWIG_RegisterMapping("_wxToolBar","_class_wxToolBar",0);
-        SWIG_RegisterMapping("_wxStaticLine","_class_wxStaticLine",0);
-        SWIG_RegisterMapping("_class_wxLayoutAlgorithm","_wxLayoutAlgorithm",0);
-        SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
-        SWIG_RegisterMapping("_class_wxNotebookEvent","_wxNotebookEvent",0);
-        SWIG_RegisterMapping("_wxMiniFrame","_class_wxMiniFrame",0);
-        SWIG_RegisterMapping("_class_wxSashWindow","_class_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxSashWindow);
-        SWIG_RegisterMapping("_class_wxSashWindow","_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxSashWindow);
-        SWIG_RegisterMapping("_class_wxSashWindow","_wxSashWindow",0);
-        SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0);
-        SWIG_RegisterMapping("_uint","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_uint","_size_t",0);
-        SWIG_RegisterMapping("_uint","_unsigned_int",0);
-        SWIG_RegisterMapping("_uint","_int",0);
-        SWIG_RegisterMapping("_uint","_wxWindowID",0);
-        SWIG_RegisterMapping("_class_wxEvent","_class_wxCalculateLayoutEvent",SwigwxCalculateLayoutEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxCalculateLayoutEvent",SwigwxCalculateLayoutEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_class_wxQueryLayoutInfoEvent",SwigwxQueryLayoutInfoEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxQueryLayoutInfoEvent",SwigwxQueryLayoutInfoEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_class_wxSashEvent",SwigwxSashEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxSashEvent",SwigwxSashEventTowxEvent);
-        SWIG_RegisterMapping("_class_wxEvent","_wxEvent",0);
-        SWIG_RegisterMapping("_wxCheckListBox","_class_wxCheckListBox",0);
-        SWIG_RegisterMapping("_wxSplitterEvent","_class_wxSplitterEvent",0);
-        SWIG_RegisterMapping("_wxGridEvent","_class_wxGridEvent",0);
-        SWIG_RegisterMapping("_wxRect","_class_wxRect",0);
-        SWIG_RegisterMapping("_wxCommandEvent","_class_wxSashEvent",SwigwxSashEventTowxCommandEvent);
-        SWIG_RegisterMapping("_wxCommandEvent","_wxSashEvent",SwigwxSashEventTowxCommandEvent);
-        SWIG_RegisterMapping("_wxCommandEvent","_class_wxCommandEvent",0);
-        SWIG_RegisterMapping("_wxSizeEvent","_class_wxSizeEvent",0);
-        SWIG_RegisterMapping("_wxPoint","_class_wxPoint",0);
-        SWIG_RegisterMapping("_class_wxSashLayoutWindow","_wxSashLayoutWindow",0);
-        SWIG_RegisterMapping("_class_wxButton","_wxButton",0);
-        SWIG_RegisterMapping("_wxRadioBox","_class_wxRadioBox",0);
-        SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
-        SWIG_RegisterMapping("_wxTaskBarIcon","_class_wxTaskBarIcon",0);
-        SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0);
-        SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0);
-        SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0);
-        SWIG_RegisterMapping("_wxToolBarTool","_class_wxToolBarTool",0);
-        SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_class_wxNotifyEvent","_wxNotifyEvent",0);
-        SWIG_RegisterMapping("_class_wxPyEvent","_wxPyEvent",0);
-        SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
-        SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
-        SWIG_RegisterMapping("_wxMDIChildFrame","_class_wxMDIChildFrame",0);
-        SWIG_RegisterMapping("_class_wxToolBar","_wxToolBar",0);
-        SWIG_RegisterMapping("_class_wxStaticLine","_wxStaticLine",0);
-        SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0);
-        SWIG_RegisterMapping("_wxCalculateLayoutEvent","_class_wxCalculateLayoutEvent",0);
-        SWIG_RegisterMapping("_EBool","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_EBool","_signed_int",0);
-        SWIG_RegisterMapping("_EBool","_int",0);
-        SWIG_RegisterMapping("_EBool","_wxWindowID",0);
-        SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
-        SWIG_RegisterMapping("_class_wxDropFilesEvent","_wxDropFilesEvent",0);
-        SWIG_RegisterMapping("_wxStaticText","_class_wxStaticText",0);
-        SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
-        SWIG_RegisterMapping("_wxCloseEvent","_class_wxCloseEvent",0);
-        SWIG_RegisterMapping("_class_wxSplitterEvent","_wxSplitterEvent",0);
-        SWIG_RegisterMapping("_wxNotebook","_class_wxNotebook",0);
-        SWIG_RegisterMapping("_unsigned_long","_wxDash",0);
-        SWIG_RegisterMapping("_unsigned_long","_long",0);
-        SWIG_RegisterMapping("_class_wxRect","_wxRect",0);
-        SWIG_RegisterMapping("_class_wxDC","_wxDC",0);
-        SWIG_RegisterMapping("_wxMDIParentFrame","_class_wxMDIParentFrame",0);
-        SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxFocusEvent","_class_wxFocusEvent",0);
-        SWIG_RegisterMapping("_wxMaximizeEvent","_class_wxMaximizeEvent",0);
-        SWIG_RegisterMapping("_class_wxSpinButton","_wxSpinButton",0);
-        SWIG_RegisterMapping("_wxAcceleratorEntry","_class_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_class_wxPanel","_wxPanel",0);
-        SWIG_RegisterMapping("_class_wxCheckBox","_wxCheckBox",0);
-        SWIG_RegisterMapping("_wxComboBox","_class_wxComboBox",0);
-        SWIG_RegisterMapping("_wxRadioButton","_class_wxRadioButton",0);
-        SWIG_RegisterMapping("_signed_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_signed_int","_EBool",0);
-        SWIG_RegisterMapping("_signed_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_signed_int","_int",0);
-        SWIG_RegisterMapping("_class_wxTextCtrl","_wxTextCtrl",0);
-        SWIG_RegisterMapping("_wxLayoutConstraints","_class_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_wxMetaFileDC","_class_wxMetaFileDC",0);
-        SWIG_RegisterMapping("_wxMenu","_class_wxMenu",0);
-        SWIG_RegisterMapping("_class_wxMoveEvent","_wxMoveEvent",0);
-        SWIG_RegisterMapping("_wxListBox","_class_wxListBox",0);
-        SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0);
-        SWIG_RegisterMapping("_class_wxMDIChildFrame","_wxMDIChildFrame",0);
-        SWIG_RegisterMapping("_WXTYPE","_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_signed_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_unsigned_short",0);
-        SWIG_RegisterMapping("_class_wxMDIClientWindow","_wxMDIClientWindow",0);
-        SWIG_RegisterMapping("_class_wxBrush","_wxBrush",0);
-        SWIG_RegisterMapping("_unsigned_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_unsigned_short","_short",0);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxSashWindow",SwigwxSashWindowTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxSashWindow",SwigwxSashWindowTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxWindow",0);
-        SWIG_RegisterMapping("_wxSplitterWindow","_class_wxSplitterWindow",0);
-        SWIG_RegisterMapping("_class_wxStaticText","_wxStaticText",0);
-        SWIG_RegisterMapping("_class_wxFont","_wxFont",0);
-        SWIG_RegisterMapping("_class_wxCloseEvent","_wxCloseEvent",0);
-        SWIG_RegisterMapping("_wxSashEvent","_class_wxSashEvent",0);
-        SWIG_RegisterMapping("_class_wxMenuEvent","_wxMenuEvent",0);
-        SWIG_RegisterMapping("_wxClientDC","_class_wxClientDC",0);
-        SWIG_RegisterMapping("_wxMouseEvent","_class_wxMouseEvent",0);
-        SWIG_RegisterMapping("_class_wxPoint","_wxPoint",0);
-        SWIG_RegisterMapping("_wxRealPoint","_class_wxRealPoint",0);
-        SWIG_RegisterMapping("_class_wxRadioBox","_wxRadioBox",0);
-        SWIG_RegisterMapping("_wxGridCell","_class_wxGridCell",0);
-        SWIG_RegisterMapping("_signed_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_signed_short","_short",0);
-        SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0);
-        SWIG_RegisterMapping("_class_wxTaskBarIcon","_wxTaskBarIcon",0);
-        SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
-        SWIG_RegisterMapping("_class_wxWindowDC","_wxWindowDC",0);
-        SWIG_RegisterMapping("_class_wxFocusEvent","_wxFocusEvent",0);
-        SWIG_RegisterMapping("_class_wxMaximizeEvent","_wxMaximizeEvent",0);
-        SWIG_RegisterMapping("_wxStatusBar","_class_wxStatusBar",0);
-        SWIG_RegisterMapping("_class_wxToolBarTool","_wxToolBarTool",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
-        SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0);
-        SWIG_RegisterMapping("_unsigned_char","_byte",0);
-        SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0);
-        SWIG_RegisterMapping("_class_wxMenu","_wxMenu",0);
-        SWIG_RegisterMapping("_wxControl","_class_wxControl",0);
-        SWIG_RegisterMapping("_class_wxListBox","_wxListBox",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_unsigned_int","_size_t",0);
-        SWIG_RegisterMapping("_unsigned_int","_uint",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_unsigned_int","_int",0);
-        SWIG_RegisterMapping("_wxIcon","_class_wxIcon",0);
-        SWIG_RegisterMapping("_wxDialog","_class_wxDialog",0);
-        SWIG_RegisterMapping("_class_wxPen","_wxPen",0);
-        SWIG_RegisterMapping("_wxQueryLayoutInfoEvent","_class_wxQueryLayoutInfoEvent",0);
-        SWIG_RegisterMapping("_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_short","_unsigned_short",0);
-        SWIG_RegisterMapping("_short","_signed_short",0);
-        SWIG_RegisterMapping("_class_wxStaticBox","_wxStaticBox",0);
-        SWIG_RegisterMapping("_wxLayoutAlgorithm","_class_wxLayoutAlgorithm",0);
-        SWIG_RegisterMapping("_class_wxScrollEvent","_wxScrollEvent",0);
-        SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0);
-        SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
-        SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);
-        SWIG_RegisterMapping("_class_wxCalculateLayoutEvent","_wxCalculateLayoutEvent",0);
-        SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0);
-        SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
-        SWIG_RegisterMapping("_wxFrame","_class_wxFrame",0);
-        SWIG_RegisterMapping("_class_wxNotebook","_wxNotebook",0);
-        SWIG_RegisterMapping("_wxWindowID","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_wxWindowID","_size_t",0);
-        SWIG_RegisterMapping("_wxWindowID","_EBool",0);
-        SWIG_RegisterMapping("_wxWindowID","_uint",0);
-        SWIG_RegisterMapping("_wxWindowID","_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_signed_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_int","_size_t",0);
-        SWIG_RegisterMapping("_int","_EBool",0);
-        SWIG_RegisterMapping("_int","_uint",0);
-        SWIG_RegisterMapping("_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_int","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_signed_int",0);
-        SWIG_RegisterMapping("_class_wxMouseEvent","_wxMouseEvent",0);
-        SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0);
-        SWIG_RegisterMapping("_wxButton","_class_wxButton",0);
-        SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
-        SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
-        SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
-        SWIG_RegisterMapping("_class_wxMDIParentFrame","_wxMDIParentFrame",0);
-        SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
-        SWIG_RegisterMapping("_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0);
-        SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0);
-        SWIG_RegisterMapping("_class_wxComboBox","_wxComboBox",0);
-        SWIG_RegisterMapping("_class_wxRadioButton","_wxRadioButton",0);
-        SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_wxIconizeEvent","_class_wxIconizeEvent",0);
-        SWIG_RegisterMapping("_class_wxControl","_wxControl",0);
-        SWIG_RegisterMapping("_wxStaticBitmap","_class_wxStaticBitmap",0);
-        SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
-        SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
-        SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
-        SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
-        SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0);
-        SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
-        SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
-        SWIG_RegisterMapping("_class_wxMiniFrame","_wxMiniFrame",0);
-        SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
-        SWIG_RegisterMapping("_class_wxSplitterWindow","_wxSplitterWindow",0);
-        SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
-        SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
-        SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0);
-        SWIG_RegisterMapping("_class_wxCheckListBox","_wxCheckListBox",0);
-        SWIG_RegisterMapping("_class_wxGridEvent","_wxGridEvent",0);
-        SWIG_RegisterMapping("_class_wxCommandEvent","_class_wxSashEvent",SwigwxSashEventTowxCommandEvent);
-        SWIG_RegisterMapping("_class_wxCommandEvent","_wxSashEvent",SwigwxSashEventTowxCommandEvent);
-        SWIG_RegisterMapping("_class_wxCommandEvent","_wxCommandEvent",0);
-        SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
-        SWIG_RegisterMapping("_class_wxSizeEvent","_wxSizeEvent",0);
-        SWIG_RegisterMapping("_class_wxGridCell","_wxGridCell",0);
-        SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
-        SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0);
-        SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0);
-        SWIG_RegisterMapping("_wxMenuBar","_class_wxMenuBar",0);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxSashWindow",SwigwxSashWindowTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxSashWindow",SwigwxSashWindowTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxEvtHandler",0);
-        SWIG_RegisterMapping("_wxMenuItem","_class_wxMenuItem",0);
-        SWIG_RegisterMapping("_class_wxScrollBar","_wxScrollBar",0);
-        SWIG_RegisterMapping("_wxDash","_unsigned_long",0);
-        SWIG_RegisterMapping("_wxDash","_long",0);
-        SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
-        SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0);
-        SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0);
-        SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
-        SWIG_RegisterMapping("_class_wxQueryLayoutInfoEvent","_wxQueryLayoutInfoEvent",0);
-        SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0);
-        SWIG_RegisterMapping("_wxMDIClientWindow","_class_wxMDIClientWindow",0);
-        SWIG_RegisterMapping("_wxWindow","_class_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxSashWindow",SwigwxSashWindowTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxSashWindow",SwigwxSashWindowTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxWindow",0);
-        SWIG_RegisterMapping("_class_wxFrame","_wxFrame",0);
+{
+   int i;
+   for (i = 0; _swig_mapping[i].n1; i++)
+        SWIG_RegisterMapping(_swig_mapping[i].n1,_swig_mapping[i].n2,_swig_mapping[i].pcnv);
+}

 }
 }

diff --git a/utils/wxPython/src/msw/windows3.py b/utils/wxPython/src/msw/windows3.py
index c6fc7bc4dae840ee2aa5cb94aa978fabee99459d..82ea7fbd952cb62a1dd216ee0a4192c7217e4982 100644 (file)
--- a/utils/wxPython/src/msw/windows3.py
+++ b/utils/wxPython/src/msw/windows3.py
@@ -23,28 +23,27 @@ class wxSashEventPtr(wxCommandEventPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def SetEdge(self,arg0):
-        val = windows3c.wxSashEvent_SetEdge(self.this,arg0)
+    def SetEdge(self, *_args, **_kwargs):
+        val = apply(windows3c.wxSashEvent_SetEdge,(self,) + _args, _kwargs)

         return val
         return val

-    def GetEdge(self):
-        val = windows3c.wxSashEvent_GetEdge(self.this)
+    def GetEdge(self, *_args, **_kwargs):
+        val = apply(windows3c.wxSashEvent_GetEdge,(self,) + _args, _kwargs)

         return val
         return val

-    def SetDragRect(self,arg0):
-        val = windows3c.wxSashEvent_SetDragRect(self.this,arg0.this)
+    def SetDragRect(self, *_args, **_kwargs):
+        val = apply(windows3c.wxSashEvent_SetDragRect,(self,) + _args, _kwargs)

         return val
         return val

-    def GetDragRect(self):
-        val = windows3c.wxSashEvent_GetDragRect(self.this)
-        val = wxRectPtr(val)
-        val.thisown = 1
+    def GetDragRect(self, *_args, **_kwargs):
+        val = apply(windows3c.wxSashEvent_GetDragRect,(self,) + _args, _kwargs)
+        if val: val = wxRectPtr(val) ; val.thisown = 1

         return val
         return val

-    def SetDragStatus(self,arg0):
-        val = windows3c.wxSashEvent_SetDragStatus(self.this,arg0)
+    def SetDragStatus(self, *_args, **_kwargs):
+        val = apply(windows3c.wxSashEvent_SetDragStatus,(self,) + _args, _kwargs)

         return val
         return val

-    def GetDragStatus(self):
-        val = windows3c.wxSashEvent_GetDragStatus(self.this)
+    def GetDragStatus(self, *_args, **_kwargs):
+        val = apply(windows3c.wxSashEvent_GetDragStatus,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxSashEvent instance>"
+        return "<C wxSashEvent instance at %s>" % (self.this,)

 class wxSashEvent(wxSashEventPtr):
     def __init__(self,this):
         self.this = this
 class wxSashEvent(wxSashEventPtr):
     def __init__(self,this):
         self.this = this


@@ -56,68 +55,62 @@ class wxSashWindowPtr(wxWindowPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetSashVisible(self,arg0):
-        val = windows3c.wxSashWindow_GetSashVisible(self.this,arg0)
+    def GetSashVisible(self, *_args, **_kwargs):
+        val = apply(windows3c.wxSashWindow_GetSashVisible,(self,) + _args, _kwargs)

         return val
         return val

-    def GetDefaultBorderSize(self):
-        val = windows3c.wxSashWindow_GetDefaultBorderSize(self.this)
+    def GetDefaultBorderSize(self, *_args, **_kwargs):
+        val = apply(windows3c.wxSashWindow_GetDefaultBorderSize,(self,) + _args, _kwargs)

         return val
         return val

-    def GetEdgeMargin(self,arg0):
-        val = windows3c.wxSashWindow_GetEdgeMargin(self.this,arg0)
+    def GetEdgeMargin(self, *_args, **_kwargs):
+        val = apply(windows3c.wxSashWindow_GetEdgeMargin,(self,) + _args, _kwargs)

         return val
         return val

-    def GetExtraBorderSize(self):
-        val = windows3c.wxSashWindow_GetExtraBorderSize(self.this)
+    def GetExtraBorderSize(self, *_args, **_kwargs):
+        val = apply(windows3c.wxSashWindow_GetExtraBorderSize,(self,) + _args, _kwargs)

         return val
         return val

-    def GetMaximumSizeX(self):
-        val = windows3c.wxSashWindow_GetMaximumSizeX(self.this)
+    def GetMaximumSizeX(self, *_args, **_kwargs):
+        val = apply(windows3c.wxSashWindow_GetMaximumSizeX,(self,) + _args, _kwargs)

         return val
         return val

-    def GetMaximumSizeY(self):
-        val = windows3c.wxSashWindow_GetMaximumSizeY(self.this)
+    def GetMaximumSizeY(self, *_args, **_kwargs):
+        val = apply(windows3c.wxSashWindow_GetMaximumSizeY,(self,) + _args, _kwargs)

         return val
         return val

-    def GetMinimumSizeX(self):
-        val = windows3c.wxSashWindow_GetMinimumSizeX(self.this)
+    def GetMinimumSizeX(self, *_args, **_kwargs):
+        val = apply(windows3c.wxSashWindow_GetMinimumSizeX,(self,) + _args, _kwargs)

         return val
         return val

-    def GetMinimumSizeY(self):
-        val = windows3c.wxSashWindow_GetMinimumSizeY(self.this)
+    def GetMinimumSizeY(self, *_args, **_kwargs):
+        val = apply(windows3c.wxSashWindow_GetMinimumSizeY,(self,) + _args, _kwargs)

         return val
         return val

-    def HasBorder(self,arg0):
-        val = windows3c.wxSashWindow_HasBorder(self.this,arg0)
+    def HasBorder(self, *_args, **_kwargs):
+        val = apply(windows3c.wxSashWindow_HasBorder,(self,) + _args, _kwargs)

         return val
         return val

-    def SetDefaultBorderSize(self,arg0):
-        val = windows3c.wxSashWindow_SetDefaultBorderSize(self.this,arg0)
+    def SetDefaultBorderSize(self, *_args, **_kwargs):
+        val = apply(windows3c.wxSashWindow_SetDefaultBorderSize,(self,) + _args, _kwargs)

         return val
         return val

-    def SetExtraBorderSize(self,arg0):
-        val = windows3c.wxSashWindow_SetExtraBorderSize(self.this,arg0)
+    def SetExtraBorderSize(self, *_args, **_kwargs):
+        val = apply(windows3c.wxSashWindow_SetExtraBorderSize,(self,) + _args, _kwargs)

         return val
         return val

-    def SetMaximumSizeX(self,arg0):
-        val = windows3c.wxSashWindow_SetMaximumSizeX(self.this,arg0)
+    def SetMaximumSizeX(self, *_args, **_kwargs):
+        val = apply(windows3c.wxSashWindow_SetMaximumSizeX,(self,) + _args, _kwargs)

         return val
         return val

-    def SetMaximumSizeY(self,arg0):
-        val = windows3c.wxSashWindow_SetMaximumSizeY(self.this,arg0)
+    def SetMaximumSizeY(self, *_args, **_kwargs):
+        val = apply(windows3c.wxSashWindow_SetMaximumSizeY,(self,) + _args, _kwargs)

         return val
         return val

-    def SetMinimumSizeX(self,arg0):
-        val = windows3c.wxSashWindow_SetMinimumSizeX(self.this,arg0)
+    def SetMinimumSizeX(self, *_args, **_kwargs):
+        val = apply(windows3c.wxSashWindow_SetMinimumSizeX,(self,) + _args, _kwargs)

         return val
         return val

-    def SetMinimumSizeY(self,arg0):
-        val = windows3c.wxSashWindow_SetMinimumSizeY(self.this,arg0)
+    def SetMinimumSizeY(self, *_args, **_kwargs):
+        val = apply(windows3c.wxSashWindow_SetMinimumSizeY,(self,) + _args, _kwargs)

         return val
         return val

-    def SetSashVisible(self,arg0,arg1):
-        val = windows3c.wxSashWindow_SetSashVisible(self.this,arg0,arg1)
+    def SetSashVisible(self, *_args, **_kwargs):
+        val = apply(windows3c.wxSashWindow_SetSashVisible,(self,) + _args, _kwargs)

         return val
         return val

-    def SetSashBorder(self,arg0,arg1):
-        val = windows3c.wxSashWindow_SetSashBorder(self.this,arg0,arg1)
+    def SetSashBorder(self, *_args, **_kwargs):
+        val = apply(windows3c.wxSashWindow_SetSashBorder,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxSashWindow instance>"
+        return "<C wxSashWindow instance at %s>" % (self.this,)

 class wxSashWindow(wxSashWindowPtr):
 class wxSashWindow(wxSashWindowPtr):

-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(windows3c.new_wxSashWindow,(arg0.this,arg1,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(windows3c.new_wxSashWindow,_args,_kwargs)

         self.thisown = 1
         wx._StdWindowCallbacks(self)
 
         self.thisown = 1
         wx._StdWindowCallbacks(self)
 


@@ -128,40 +121,39 @@ class wxQueryLayoutInfoEventPtr(wxEventPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def SetRequestedLength(self,arg0):
-        val = windows3c.wxQueryLayoutInfoEvent_SetRequestedLength(self.this,arg0)
+    def SetRequestedLength(self, *_args, **_kwargs):
+        val = apply(windows3c.wxQueryLayoutInfoEvent_SetRequestedLength,(self,) + _args, _kwargs)

         return val
         return val

-    def GetRequestedLength(self):
-        val = windows3c.wxQueryLayoutInfoEvent_GetRequestedLength(self.this)
+    def GetRequestedLength(self, *_args, **_kwargs):
+        val = apply(windows3c.wxQueryLayoutInfoEvent_GetRequestedLength,(self,) + _args, _kwargs)

         return val
         return val

-    def SetFlags(self,arg0):
-        val = windows3c.wxQueryLayoutInfoEvent_SetFlags(self.this,arg0)
+    def SetFlags(self, *_args, **_kwargs):
+        val = apply(windows3c.wxQueryLayoutInfoEvent_SetFlags,(self,) + _args, _kwargs)

         return val
         return val

-    def GetFlags(self):
-        val = windows3c.wxQueryLayoutInfoEvent_GetFlags(self.this)
+    def GetFlags(self, *_args, **_kwargs):
+        val = apply(windows3c.wxQueryLayoutInfoEvent_GetFlags,(self,) + _args, _kwargs)

         return val
         return val

-    def SetSize(self,arg0):
-        val = windows3c.wxQueryLayoutInfoEvent_SetSize(self.this,arg0.this)
+    def SetSize(self, *_args, **_kwargs):
+        val = apply(windows3c.wxQueryLayoutInfoEvent_SetSize,(self,) + _args, _kwargs)

         return val
         return val

-    def GetSize(self):
-        val = windows3c.wxQueryLayoutInfoEvent_GetSize(self.this)
-        val = wxSizePtr(val)
-        val.thisown = 1
+    def GetSize(self, *_args, **_kwargs):
+        val = apply(windows3c.wxQueryLayoutInfoEvent_GetSize,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1

         return val
         return val

-    def SetOrientation(self,arg0):
-        val = windows3c.wxQueryLayoutInfoEvent_SetOrientation(self.this,arg0)
+    def SetOrientation(self, *_args, **_kwargs):
+        val = apply(windows3c.wxQueryLayoutInfoEvent_SetOrientation,(self,) + _args, _kwargs)

         return val
         return val

-    def GetOrientation(self):
-        val = windows3c.wxQueryLayoutInfoEvent_GetOrientation(self.this)
+    def GetOrientation(self, *_args, **_kwargs):
+        val = apply(windows3c.wxQueryLayoutInfoEvent_GetOrientation,(self,) + _args, _kwargs)

         return val
         return val

-    def SetAlignment(self,arg0):
-        val = windows3c.wxQueryLayoutInfoEvent_SetAlignment(self.this,arg0)
+    def SetAlignment(self, *_args, **_kwargs):
+        val = apply(windows3c.wxQueryLayoutInfoEvent_SetAlignment,(self,) + _args, _kwargs)

         return val
         return val

-    def GetAlignment(self):
-        val = windows3c.wxQueryLayoutInfoEvent_GetAlignment(self.this)
+    def GetAlignment(self, *_args, **_kwargs):
+        val = apply(windows3c.wxQueryLayoutInfoEvent_GetAlignment,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxQueryLayoutInfoEvent instance>"
+        return "<C wxQueryLayoutInfoEvent instance at %s>" % (self.this,)

 class wxQueryLayoutInfoEvent(wxQueryLayoutInfoEventPtr):
     def __init__(self,this):
         self.this = this
 class wxQueryLayoutInfoEvent(wxQueryLayoutInfoEventPtr):
     def __init__(self,this):
         self.this = this


@@ -173,22 +165,21 @@ class wxCalculateLayoutEventPtr(wxEventPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def SetFlags(self,arg0):
-        val = windows3c.wxCalculateLayoutEvent_SetFlags(self.this,arg0)
+    def SetFlags(self, *_args, **_kwargs):
+        val = apply(windows3c.wxCalculateLayoutEvent_SetFlags,(self,) + _args, _kwargs)

         return val
         return val

-    def GetFlags(self):
-        val = windows3c.wxCalculateLayoutEvent_GetFlags(self.this)
+    def GetFlags(self, *_args, **_kwargs):
+        val = apply(windows3c.wxCalculateLayoutEvent_GetFlags,(self,) + _args, _kwargs)

         return val
         return val

-    def SetRect(self,arg0):
-        val = windows3c.wxCalculateLayoutEvent_SetRect(self.this,arg0.this)
+    def SetRect(self, *_args, **_kwargs):
+        val = apply(windows3c.wxCalculateLayoutEvent_SetRect,(self,) + _args, _kwargs)

         return val
         return val

-    def GetRect(self):
-        val = windows3c.wxCalculateLayoutEvent_GetRect(self.this)
-        val = wxRectPtr(val)
-        val.thisown = 1
+    def GetRect(self, *_args, **_kwargs):
+        val = apply(windows3c.wxCalculateLayoutEvent_GetRect,(self,) + _args, _kwargs)
+        if val: val = wxRectPtr(val) ; val.thisown = 1

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxCalculateLayoutEvent instance>"
+        return "<C wxCalculateLayoutEvent instance at %s>" % (self.this,)

 class wxCalculateLayoutEvent(wxCalculateLayoutEventPtr):
     def __init__(self,this):
         self.this = this
 class wxCalculateLayoutEvent(wxCalculateLayoutEventPtr):
     def __init__(self,this):
         self.this = this


@@ -200,32 +191,26 @@ class wxSashLayoutWindowPtr(wxSashWindowPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetAlignment(self):
-        val = windows3c.wxSashLayoutWindow_GetAlignment(self.this)
+    def GetAlignment(self, *_args, **_kwargs):
+        val = apply(windows3c.wxSashLayoutWindow_GetAlignment,(self,) + _args, _kwargs)

         return val
         return val

-    def GetOrientation(self):
-        val = windows3c.wxSashLayoutWindow_GetOrientation(self.this)
+    def GetOrientation(self, *_args, **_kwargs):
+        val = apply(windows3c.wxSashLayoutWindow_GetOrientation,(self,) + _args, _kwargs)

         return val
         return val

-    def SetAlignment(self,arg0):
-        val = windows3c.wxSashLayoutWindow_SetAlignment(self.this,arg0)
+    def SetAlignment(self, *_args, **_kwargs):
+        val = apply(windows3c.wxSashLayoutWindow_SetAlignment,(self,) + _args, _kwargs)

         return val
         return val

-    def SetDefaultSize(self,arg0):
-        val = windows3c.wxSashLayoutWindow_SetDefaultSize(self.this,arg0.this)
+    def SetDefaultSize(self, *_args, **_kwargs):
+        val = apply(windows3c.wxSashLayoutWindow_SetDefaultSize,(self,) + _args, _kwargs)

         return val
         return val

-    def SetOrientation(self,arg0):
-        val = windows3c.wxSashLayoutWindow_SetOrientation(self.this,arg0)
+    def SetOrientation(self, *_args, **_kwargs):
+        val = apply(windows3c.wxSashLayoutWindow_SetOrientation,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxSashLayoutWindow instance>"
+        return "<C wxSashLayoutWindow instance at %s>" % (self.this,)

 class wxSashLayoutWindow(wxSashLayoutWindowPtr):
 class wxSashLayoutWindow(wxSashLayoutWindowPtr):

-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(windows3c.new_wxSashLayoutWindow,(arg0.this,arg1,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(windows3c.new_wxSashLayoutWindow,_args,_kwargs)

         self.thisown = 1
         wx._StdWindowCallbacks(self)
         wx._checkForCallback(self, 'OnCalculateLayout',    wxEVT_CALCULATE_LAYOUT)
         self.thisown = 1
         wx._StdWindowCallbacks(self)
         wx._checkForCallback(self, 'OnCalculateLayout',    wxEVT_CALCULATE_LAYOUT)


@@ -238,35 +223,23 @@ class wxLayoutAlgorithmPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self, windows3c=windows3c):
+    def __del__(self,windows3c=windows3c):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            windows3c.delete_wxLayoutAlgorithm(self.this)
-    def LayoutMDIFrame(self,arg0,*args):
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        args = tuple(argl)
-        val = apply(windows3c.wxLayoutAlgorithm_LayoutMDIFrame,(self.this,arg0.this,)+args)
-        return val
-    def LayoutFrame(self,arg0,*args):
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        args = tuple(argl)
-        val = apply(windows3c.wxLayoutAlgorithm_LayoutFrame,(self.this,arg0.this,)+args)
-        return val
-    def LayoutWindow(self,arg0,*args):
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        args = tuple(argl)
-        val = apply(windows3c.wxLayoutAlgorithm_LayoutWindow,(self.this,arg0.this,)+args)
+            windows3c.delete_wxLayoutAlgorithm(self)
+    def LayoutMDIFrame(self, *_args, **_kwargs):
+        val = apply(windows3c.wxLayoutAlgorithm_LayoutMDIFrame,(self,) + _args, _kwargs)
+        return val
+    def LayoutFrame(self, *_args, **_kwargs):
+        val = apply(windows3c.wxLayoutAlgorithm_LayoutFrame,(self,) + _args, _kwargs)
+        return val
+    def LayoutWindow(self, *_args, **_kwargs):
+        val = apply(windows3c.wxLayoutAlgorithm_LayoutWindow,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxLayoutAlgorithm instance>"
+        return "<C wxLayoutAlgorithm instance at %s>" % (self.this,)

 class wxLayoutAlgorithm(wxLayoutAlgorithmPtr):
 class wxLayoutAlgorithm(wxLayoutAlgorithmPtr):

-    def __init__(self) :
-        self.this = windows3c.new_wxLayoutAlgorithm()
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(windows3c.new_wxLayoutAlgorithm,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 

diff --git a/utils/wxPython/src/msw/wx.cpp b/utils/wxPython/src/msw/wx.cpp
index 5c4e604bd5a897fa82a02ac78927b7e89ab2137c..ab8822d7a3ccfbc756fc145ad3181b329d1b1000 100644 (file)
--- a/utils/wxPython/src/msw/wx.cpp
+++ b/utils/wxPython/src/msw/wx.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)

- * Version 1.1 (Patch 5)
+ * Version 1.1 (Patch 6)

  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.


@@ -24,16 +24,16 @@
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)

-#      define SWIGEXPORT(a,b) __declspec(dllexport) a b
+#      define SWIGEXPORT(a) __declspec(dllexport) a

 #   else
 #      if defined(__BORLANDC__)
 #   else
 #      if defined(__BORLANDC__)

-#          define SWIGEXPORT(a,b) a _export b
+#          define SWIGEXPORT(a) a _export 

 #      else
 #      else

-#          define SWIGEXPORT(a,b) a b
+#          define SWIGEXPORT(a) a 

 #      endif
 #   endif
 #else
 #      endif
 #   endif
 #else

-#   define SWIGEXPORT(a,b) a b
+#   define SWIGEXPORT(a) a 

 #endif
 
 #ifdef __cplusplus
 #endif
 
 #ifdef __cplusplus


@@ -43,12 +43,12 @@ extern "C" {
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);

+extern char *SWIG_GetPtrObj(PyObject *, void **, char *);

 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif
 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif

-

 #define SWIG_init    initwxc
 
 #define SWIG_name    "wxc"
 #define SWIG_init    initwxc
 
 #define SWIG_name    "wxc"


@@ -57,12 +57,13 @@ extern PyObject *SWIG_newvarlink(void);
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;

-    if (!target) {
+    PyObject*   o3;
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);
         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);


@@ -79,23 +80,23 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
     PyObject*   o3;
 
     PyObject*   o2;
     PyObject*   o3;
 

-    if (!target) {
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }
         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }

-        o3 = PyTuple_New(1);
-        PyTuple_SetItem(o3, 0, o);
+        o3 = PyTuple_New(1);            
+        PyTuple_SetItem(o3, 0, o);      

 
         o2 = target;
 
         o2 = target;

-        target = PySequence_Concat(o2, o3);
-        Py_DECREF(o2);
+        target = PySequence_Concat(o2, o3); 
+        Py_DECREF(o2);                      

         Py_DECREF(o3);
     }
     return target;
         Py_DECREF(o3);
     }
     return target;


@@ -630,25 +631,28 @@ public:
     ~__wxPyCleanup() { wxApp::CleanUp(); }
 };
 
     ~__wxPyCleanup() { wxApp::CleanUp(); }
 };
 

-extern "C" SWIGEXPORT(void,initwindowsc)();
-extern "C" SWIGEXPORT(void,initwindows2c)();
-extern "C" SWIGEXPORT(void,initeventsc)();
-extern "C" SWIGEXPORT(void,initmiscc)();
-extern "C" SWIGEXPORT(void,initmisc2c)();
-extern "C" SWIGEXPORT(void,initgdic)();
-extern "C" SWIGEXPORT(void,initmdic)();
-extern "C" SWIGEXPORT(void,initcontrolsc)();
-extern "C" SWIGEXPORT(void,initcontrols2c)();
-extern "C" SWIGEXPORT(void,initcmndlgsc)();
-extern "C" SWIGEXPORT(void,initstattoolc)();
-extern "C" SWIGEXPORT(void,initframesc)();
-extern "C" SWIGEXPORT(void,initwindows3c)();
-extern "C" SWIGEXPORT(void,initimagec)();
-extern "C" SWIGEXPORT(void,initprintfwc)();
+extern "C" SWIGEXPORT(void) initwindowsc();
+extern "C" SWIGEXPORT(void) initwindows2c();
+extern "C" SWIGEXPORT(void) initeventsc();
+extern "C" SWIGEXPORT(void) initmiscc();
+extern "C" SWIGEXPORT(void) initmisc2c();
+extern "C" SWIGEXPORT(void) initgdic();
+extern "C" SWIGEXPORT(void) initmdic();
+extern "C" SWIGEXPORT(void) initcontrolsc();
+extern "C" SWIGEXPORT(void) initcontrols2c();
+extern "C" SWIGEXPORT(void) initcmndlgsc();
+extern "C" SWIGEXPORT(void) initstattoolc();
+extern "C" SWIGEXPORT(void) initframesc();
+extern "C" SWIGEXPORT(void) initwindows3c();
+extern "C" SWIGEXPORT(void) initimagec();
+extern "C" SWIGEXPORT(void) initprintfwc();

 #ifndef SEPARATE
 #ifndef SEPARATE

-extern "C" SWIGEXPORT(void,initutilsc)();
-//extern "C" SWIGEXPORT(void,initoglc)();
-extern "C" SWIGEXPORT(void,initglcanvasc)();
+extern "C" SWIGEXPORT(void) initutilsc();
+//extern "C" SWIGEXPORT(void) initoglc();
+extern "C" SWIGEXPORT(void) initglcanvasc();
+#endif
+#ifdef __cplusplus
+extern "C" {

 #endif
 static PyObject *_wrap_ptrcast(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #endif
 static PyObject *_wrap_ptrcast(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -678,8 +682,8 @@ static PyObject *_wrap_ptrvalue(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     PyObject * _result;
     PyObject * _arg0;
     PyObject * _resultobj;
     PyObject * _result;
     PyObject * _arg0;

-    int  _arg1 = 0;
-    char * _arg2 = 0;
+    int  _arg1 = (int ) 0;
+    char * _arg2 = (char *) 0;

     PyObject * _obj0 = 0;
 
     self = self;
     PyObject * _obj0 = 0;
 
     self = self;


@@ -704,8 +708,8 @@ static PyObject *_wrap_ptrset(PyObject *self, PyObject *args) {
     PyObject * _result;
     PyObject * _arg0;
     PyObject * _arg1;
     PyObject * _result;
     PyObject * _arg0;
     PyObject * _arg1;

-    int  _arg2 = 0;
-    char * _arg3 = 0;
+    int  _arg2 = (int ) 0;
+    char * _arg3 = (char *) 0;

     PyObject * _obj0 = 0;
     PyObject * _obj1 = 0;
 
     PyObject * _obj0 = 0;
     PyObject * _obj1 = 0;
 


@@ -733,8 +737,8 @@ static PyObject *_wrap_ptrcreate(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     PyObject * _result;
     char * _arg0;
     PyObject * _resultobj;
     PyObject * _result;
     char * _arg0;

-    PyObject * _arg1 = 0;
-    int  _arg2 = 1;
+    PyObject * _arg1 = (PyObject *) 0;
+    int  _arg2 = (int ) 1;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;


@@ -821,16 +825,11 @@ static PyObject *_wrap_ptrmap(PyObject *self, PyObject *args) {
 }
 
 static int _wrap_wxPyDefaultPosition_set(PyObject *val) {
 }
 
 static int _wrap_wxPyDefaultPosition_set(PyObject *val) {

-    char * tval;

     wxPoint * temp;
 
     wxPoint * temp;
 

-    tval = (char *) PyString_AsString(val);
-    if (PyErr_Occurred()) {
-        PyErr_SetString(PyExc_TypeError,"C variable 'wxPyDefaultPosition'(wxPoint *)");
-        return 1; 
-    }
-    if (tval) {
-        if (SWIG_GetPtr(tval,(void **) &temp,"_wxPoint_p")) {
+    if (val) {
+        if (val == Py_None) { temp = NULL; }
+        else if (SWIG_GetPtrObj(val,(void **) &temp,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in value of wxPyDefaultPosition. Expected _wxPoint_p.");
         return 1;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in value of wxPyDefaultPosition. Expected _wxPoint_p.");
         return 1;
         }


@@ -849,16 +848,11 @@ static PyObject *_wrap_wxPyDefaultPosition_get() {
 }
 
 static int _wrap_wxPyDefaultSize_set(PyObject *val) {
 }
 
 static int _wrap_wxPyDefaultSize_set(PyObject *val) {

-    char * tval;

     wxSize * temp;
 
     wxSize * temp;
 

-    tval = (char *) PyString_AsString(val);
-    if (PyErr_Occurred()) {
-        PyErr_SetString(PyExc_TypeError,"C variable 'wxPyDefaultSize'(wxSize *)");
-        return 1; 
-    }
-    if (tval) {
-        if (SWIG_GetPtr(tval,(void **) &temp,"_wxSize_p")) {
+    if (val) {
+        if (val == Py_None) { temp = NULL; }
+        else if (SWIG_GetPtrObj(val,(void **) &temp,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in value of wxPyDefaultSize. Expected _wxSize_p.");
         return 1;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in value of wxPyDefaultSize. Expected _wxSize_p.");
         return 1;
         }


@@ -902,8 +896,13 @@ static PyObject *_wrap_new_wxPyApp(PyObject *self, PyObject *args) {
         _result = (wxPyApp *)new_wxPyApp();
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxPyApp *)new_wxPyApp();
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyApp_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyApp_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -911,13 +910,14 @@ static PyObject *_wrap_new_wxPyApp(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxPyApp(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyApp * _arg0;
 static PyObject *_wrap_delete_wxPyApp(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyApp * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:delete_wxPyApp",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxPyApp",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyApp_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyApp_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPyApp. Expected _wxPyApp_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPyApp. Expected _wxPyApp_p.");
         return NULL;
         }


@@ -937,13 +937,14 @@ static PyObject *_wrap_wxPyApp_GetAppName(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxPyApp * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxPyApp * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPyApp_GetAppName",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPyApp_GetAppName",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyApp_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyApp_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_GetAppName. Expected _wxPyApp_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_GetAppName. Expected _wxPyApp_p.");
         return NULL;
         }


@@ -967,13 +968,14 @@ static PyObject *_wrap_wxPyApp_GetAuto3D(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxPyApp * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxPyApp * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPyApp_GetAuto3D",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPyApp_GetAuto3D",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyApp_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyApp_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_GetAuto3D. Expected _wxPyApp_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_GetAuto3D. Expected _wxPyApp_p.");
         return NULL;
         }


@@ -992,13 +994,14 @@ static PyObject *_wrap_wxPyApp_GetClassName(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxPyApp * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxPyApp * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPyApp_GetClassName",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPyApp_GetClassName",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyApp_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyApp_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_GetClassName. Expected _wxPyApp_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_GetClassName. Expected _wxPyApp_p.");
         return NULL;
         }


@@ -1022,13 +1025,14 @@ static PyObject *_wrap_wxPyApp_GetExitOnFrameDelete(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     bool  _result;
     wxPyApp * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxPyApp * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPyApp_GetExitOnFrameDelete",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPyApp_GetExitOnFrameDelete",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyApp_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyApp_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_GetExitOnFrameDelete. Expected _wxPyApp_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_GetExitOnFrameDelete. Expected _wxPyApp_p.");
         return NULL;
         }


@@ -1047,13 +1051,14 @@ static PyObject *_wrap_wxPyApp_GetPrintMode(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxPyApp * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxPyApp * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPyApp_GetPrintMode",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPyApp_GetPrintMode",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyApp_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyApp_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_GetPrintMode. Expected _wxPyApp_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_GetPrintMode. Expected _wxPyApp_p.");
         return NULL;
         }


@@ -1072,14 +1077,15 @@ static PyObject *_wrap_wxPyApp_GetTopWindow(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _result;
     wxPyApp * _arg0;
     PyObject * _resultobj;
     wxWindow * _result;
     wxPyApp * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPyApp_GetTopWindow",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPyApp_GetTopWindow",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyApp_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyApp_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_GetTopWindow. Expected _wxPyApp_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_GetTopWindow. Expected _wxPyApp_p.");
         return NULL;
         }


@@ -1089,8 +1095,13 @@ static PyObject *_wrap_wxPyApp_GetTopWindow(PyObject *self, PyObject *args) {
         _result = (wxWindow *)wxPyApp_GetTopWindow(_arg0);
 
     wxPy_END_ALLOW_THREADS;
         _result = (wxWindow *)wxPyApp_GetTopWindow(_arg0);
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1099,13 +1110,14 @@ static PyObject *_wrap_wxPyApp_GetVendorName(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxPyApp * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxPyApp * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPyApp_GetVendorName",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPyApp_GetVendorName",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyApp_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyApp_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_GetVendorName. Expected _wxPyApp_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_GetVendorName. Expected _wxPyApp_p.");
         return NULL;
         }


@@ -1128,13 +1140,14 @@ static PyObject *_wrap_wxPyApp_GetVendorName(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxPyApp_Dispatch(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyApp * _arg0;
 static PyObject *_wrap_wxPyApp_Dispatch(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyApp * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPyApp_Dispatch",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPyApp_Dispatch",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyApp_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyApp_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_Dispatch. Expected _wxPyApp_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_Dispatch. Expected _wxPyApp_p.");
         return NULL;
         }


@@ -1153,13 +1166,14 @@ static PyObject *_wrap_wxPyApp_Dispatch(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxPyApp_ExitMainLoop(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyApp * _arg0;
 static PyObject *_wrap_wxPyApp_ExitMainLoop(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyApp * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPyApp_ExitMainLoop",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPyApp_ExitMainLoop",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyApp_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyApp_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_ExitMainLoop. Expected _wxPyApp_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_ExitMainLoop. Expected _wxPyApp_p.");
         return NULL;
         }


@@ -1179,13 +1193,14 @@ static PyObject *_wrap_wxPyApp_Initialized(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxPyApp * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxPyApp * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPyApp_Initialized",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPyApp_Initialized",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyApp_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyApp_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_Initialized. Expected _wxPyApp_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_Initialized. Expected _wxPyApp_p.");
         return NULL;
         }


@@ -1204,13 +1219,14 @@ static PyObject *_wrap_wxPyApp_MainLoop(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxPyApp * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxPyApp * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPyApp_MainLoop",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPyApp_MainLoop",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyApp_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyApp_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_MainLoop. Expected _wxPyApp_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_MainLoop. Expected _wxPyApp_p.");
         return NULL;
         }


@@ -1229,13 +1245,14 @@ static PyObject *_wrap_wxPyApp_Pending(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxPyApp * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxPyApp * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPyApp_Pending",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPyApp_Pending",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyApp_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyApp_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_Pending. Expected _wxPyApp_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_Pending. Expected _wxPyApp_p.");
         return NULL;
         }


@@ -1254,13 +1271,14 @@ static PyObject *_wrap_wxPyApp_ProcessIdle(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxPyApp * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxPyApp * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPyApp_ProcessIdle",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPyApp_ProcessIdle",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyApp_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyApp_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_ProcessIdle. Expected _wxPyApp_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_ProcessIdle. Expected _wxPyApp_p.");
         return NULL;
         }


@@ -1279,14 +1297,15 @@ static PyObject *_wrap_wxPyApp_SetAppName(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyApp * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxPyApp * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxPyApp_SetAppName",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxPyApp_SetAppName",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyApp_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyApp_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_SetAppName. Expected _wxPyApp_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_SetAppName. Expected _wxPyApp_p.");
         return NULL;
         }


@@ -1317,14 +1336,15 @@ static PyObject *_wrap_wxPyApp_SetAuto3D(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyApp * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxPyApp * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPyApp_SetAuto3D",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPyApp_SetAuto3D",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyApp_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyApp_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_SetAuto3D. Expected _wxPyApp_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_SetAuto3D. Expected _wxPyApp_p.");
         return NULL;
         }


@@ -1345,14 +1365,15 @@ static PyObject *_wrap_wxPyApp_SetClassName(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyApp * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxPyApp * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxPyApp_SetClassName",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxPyApp_SetClassName",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyApp_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyApp_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_SetClassName. Expected _wxPyApp_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_SetClassName. Expected _wxPyApp_p.");
         return NULL;
         }


@@ -1383,14 +1404,15 @@ static PyObject *_wrap_wxPyApp_SetExitOnFrameDelete(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     wxPyApp * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxPyApp * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
 
     self = self;
     int tempbool1;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPyApp_SetExitOnFrameDelete",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPyApp_SetExitOnFrameDelete",&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyApp_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyApp_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_SetExitOnFrameDelete. Expected _wxPyApp_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_SetExitOnFrameDelete. Expected _wxPyApp_p.");
         return NULL;
         }


@@ -1411,13 +1433,14 @@ static PyObject *_wrap_wxPyApp_SetPrintMode(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyApp * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxPyApp * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPyApp_SetPrintMode",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPyApp_SetPrintMode",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyApp_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyApp_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_SetPrintMode. Expected _wxPyApp_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_SetPrintMode. Expected _wxPyApp_p.");
         return NULL;
         }


@@ -1437,20 +1460,22 @@ static PyObject *_wrap_wxPyApp_SetTopWindow(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyApp * _arg0;
     wxWindow * _arg1;
     PyObject * _resultobj;
     wxPyApp * _arg0;
     wxWindow * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxPyApp_SetTopWindow",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxPyApp_SetTopWindow",&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyApp_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyApp_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_SetTopWindow. Expected _wxPyApp_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_SetTopWindow. Expected _wxPyApp_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyApp_SetTopWindow. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyApp_SetTopWindow. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1470,14 +1495,15 @@ static PyObject *_wrap_wxPyApp_SetVendorName(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyApp * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxPyApp * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
 
     self = self;
     PyObject * _obj1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxPyApp_SetVendorName",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxPyApp_SetVendorName",&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyApp_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyApp_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_SetVendorName. Expected _wxPyApp_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_SetVendorName. Expected _wxPyApp_p.");
         return NULL;
         }


@@ -1509,14 +1535,15 @@ static PyObject *_wrap_wxPyApp_GetStdIcon(PyObject *self, PyObject *args) {
     wxIcon * _result;
     wxPyApp * _arg0;
     int  _arg1;
     wxIcon * _result;
     wxPyApp * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPyApp_GetStdIcon",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPyApp_GetStdIcon",&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyApp_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyApp_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_GetStdIcon. Expected _wxPyApp_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_GetStdIcon. Expected _wxPyApp_p.");
         return NULL;
         }


@@ -1545,8 +1572,13 @@ static PyObject *_wrap_new___wxPyCleanup(PyObject *self, PyObject *args) {
         _result = (__wxPyCleanup *)new___wxPyCleanup();
 
     wxPy_END_ALLOW_THREADS;
         _result = (__wxPyCleanup *)new___wxPyCleanup();
 
     wxPy_END_ALLOW_THREADS;

-}    SWIG_MakePtr(_ptemp, (char *) _result,"___wxPyCleanup_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"___wxPyCleanup_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1554,13 +1586,14 @@ static PyObject *_wrap_new___wxPyCleanup(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete___wxPyCleanup(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     __wxPyCleanup * _arg0;
 static PyObject *_wrap_delete___wxPyCleanup(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     __wxPyCleanup * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:delete___wxPyCleanup",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete___wxPyCleanup",&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"___wxPyCleanup_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"___wxPyCleanup_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete___wxPyCleanup. Expected ___wxPyCleanup_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete___wxPyCleanup. Expected ___wxPyCleanup_p.");
         return NULL;
         }


@@ -1576,47 +1609,400 @@ static PyObject *_wrap_delete___wxPyCleanup(PyObject *self, PyObject *args) {
 }
 
 static PyMethodDef wxcMethods[] = {
 }
 
 static PyMethodDef wxcMethods[] = {

-        { "delete___wxPyCleanup", _wrap_delete___wxPyCleanup, 1 },
-        { "new___wxPyCleanup", _wrap_new___wxPyCleanup, 1 },
-        { "wxPyApp_GetStdIcon", _wrap_wxPyApp_GetStdIcon, 1 },
-        { "wxPyApp_SetVendorName", _wrap_wxPyApp_SetVendorName, 1 },
-        { "wxPyApp_SetTopWindow", _wrap_wxPyApp_SetTopWindow, 1 },
-        { "wxPyApp_SetPrintMode", _wrap_wxPyApp_SetPrintMode, 1 },
-        { "wxPyApp_SetExitOnFrameDelete", _wrap_wxPyApp_SetExitOnFrameDelete, 1 },
-        { "wxPyApp_SetClassName", _wrap_wxPyApp_SetClassName, 1 },
-        { "wxPyApp_SetAuto3D", _wrap_wxPyApp_SetAuto3D, 1 },
-        { "wxPyApp_SetAppName", _wrap_wxPyApp_SetAppName, 1 },
-        { "wxPyApp_ProcessIdle", _wrap_wxPyApp_ProcessIdle, 1 },
-        { "wxPyApp_Pending", _wrap_wxPyApp_Pending, 1 },
-        { "wxPyApp_MainLoop", _wrap_wxPyApp_MainLoop, 1 },
-        { "wxPyApp_Initialized", _wrap_wxPyApp_Initialized, 1 },
-        { "wxPyApp_ExitMainLoop", _wrap_wxPyApp_ExitMainLoop, 1 },
-        { "wxPyApp_Dispatch", _wrap_wxPyApp_Dispatch, 1 },
-        { "wxPyApp_GetVendorName", _wrap_wxPyApp_GetVendorName, 1 },
-        { "wxPyApp_GetTopWindow", _wrap_wxPyApp_GetTopWindow, 1 },
-        { "wxPyApp_GetPrintMode", _wrap_wxPyApp_GetPrintMode, 1 },
-        { "wxPyApp_GetExitOnFrameDelete", _wrap_wxPyApp_GetExitOnFrameDelete, 1 },
-        { "wxPyApp_GetClassName", _wrap_wxPyApp_GetClassName, 1 },
-        { "wxPyApp_GetAuto3D", _wrap_wxPyApp_GetAuto3D, 1 },
-        { "wxPyApp_GetAppName", _wrap_wxPyApp_GetAppName, 1 },
-        { "delete_wxPyApp", _wrap_delete_wxPyApp, 1 },
-        { "new_wxPyApp", _wrap_new_wxPyApp, 1 },
-        { "_wxSetDictionary", __wxSetDictionary, 1 },
-        { "_wxStart", __wxStart, 1 },
-        { "ptrmap", _wrap_ptrmap, 1 },
-        { "ptradd", _wrap_ptradd, 1 },
-        { "ptrfree", _wrap_ptrfree, 1 },
-        { "ptrcreate", _wrap_ptrcreate, 1 },
-        { "ptrset", _wrap_ptrset, 1 },
-        { "ptrvalue", _wrap_ptrvalue, 1 },
-        { "ptrcast", _wrap_ptrcast, 1 },
+        { "delete___wxPyCleanup", _wrap_delete___wxPyCleanup, METH_VARARGS },
+        { "new___wxPyCleanup", _wrap_new___wxPyCleanup, METH_VARARGS },
+        { "wxPyApp_GetStdIcon", _wrap_wxPyApp_GetStdIcon, METH_VARARGS },
+        { "wxPyApp_SetVendorName", _wrap_wxPyApp_SetVendorName, METH_VARARGS },
+        { "wxPyApp_SetTopWindow", _wrap_wxPyApp_SetTopWindow, METH_VARARGS },
+        { "wxPyApp_SetPrintMode", _wrap_wxPyApp_SetPrintMode, METH_VARARGS },
+        { "wxPyApp_SetExitOnFrameDelete", _wrap_wxPyApp_SetExitOnFrameDelete, METH_VARARGS },
+        { "wxPyApp_SetClassName", _wrap_wxPyApp_SetClassName, METH_VARARGS },
+        { "wxPyApp_SetAuto3D", _wrap_wxPyApp_SetAuto3D, METH_VARARGS },
+        { "wxPyApp_SetAppName", _wrap_wxPyApp_SetAppName, METH_VARARGS },
+        { "wxPyApp_ProcessIdle", _wrap_wxPyApp_ProcessIdle, METH_VARARGS },
+        { "wxPyApp_Pending", _wrap_wxPyApp_Pending, METH_VARARGS },
+        { "wxPyApp_MainLoop", _wrap_wxPyApp_MainLoop, METH_VARARGS },
+        { "wxPyApp_Initialized", _wrap_wxPyApp_Initialized, METH_VARARGS },
+        { "wxPyApp_ExitMainLoop", _wrap_wxPyApp_ExitMainLoop, METH_VARARGS },
+        { "wxPyApp_Dispatch", _wrap_wxPyApp_Dispatch, METH_VARARGS },
+        { "wxPyApp_GetVendorName", _wrap_wxPyApp_GetVendorName, METH_VARARGS },
+        { "wxPyApp_GetTopWindow", _wrap_wxPyApp_GetTopWindow, METH_VARARGS },
+        { "wxPyApp_GetPrintMode", _wrap_wxPyApp_GetPrintMode, METH_VARARGS },
+        { "wxPyApp_GetExitOnFrameDelete", _wrap_wxPyApp_GetExitOnFrameDelete, METH_VARARGS },
+        { "wxPyApp_GetClassName", _wrap_wxPyApp_GetClassName, METH_VARARGS },
+        { "wxPyApp_GetAuto3D", _wrap_wxPyApp_GetAuto3D, METH_VARARGS },
+        { "wxPyApp_GetAppName", _wrap_wxPyApp_GetAppName, METH_VARARGS },
+        { "delete_wxPyApp", _wrap_delete_wxPyApp, METH_VARARGS },
+        { "new_wxPyApp", _wrap_new_wxPyApp, METH_VARARGS },
+        { "_wxSetDictionary", __wxSetDictionary, METH_VARARGS },
+        { "_wxStart", __wxStart, METH_VARARGS },
+        { "ptrmap", _wrap_ptrmap, METH_VARARGS },
+        { "ptradd", _wrap_ptradd, METH_VARARGS },
+        { "ptrfree", _wrap_ptrfree, METH_VARARGS },
+        { "ptrcreate", _wrap_ptrcreate, METH_VARARGS },
+        { "ptrset", _wrap_ptrset, METH_VARARGS },
+        { "ptrvalue", _wrap_ptrvalue, METH_VARARGS },
+        { "ptrcast", _wrap_ptrcast, METH_VARARGS },

         { NULL, NULL }
 };
         { NULL, NULL }
 };

+#ifdef __cplusplus
+}
+#endif
+/*
+ * This table is used by the pointer type-checker
+ */
+static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
+    { "_wxAcceleratorTable","_class_wxAcceleratorTable",0},
+    { "_wxEvent","_class_wxEvent",0},
+    { "_class_wxActivateEvent","_wxActivateEvent",0},
+    { "_signed_long","_long",0},
+    { "_wxMenuEvent","_class_wxMenuEvent",0},
+    { "_class_wxJPEGHandler","_wxJPEGHandler",0},
+    { "_wxBMPHandler","_class_wxBMPHandler",0},
+    { "_wxImage","_class_wxImage",0},
+    { "_wxPrintQuality","_int",0},
+    { "_wxPrintQuality","_signed_int",0},
+    { "_wxPrintQuality","_unsigned_int",0},
+    { "_wxPrintQuality","_wxWindowID",0},
+    { "_wxPrintQuality","_uint",0},
+    { "_wxPrintQuality","_EBool",0},
+    { "_wxPrintQuality","_size_t",0},
+    { "_wxFontData","_class_wxFontData",0},
+    { "___wxPyCleanup","_class___wxPyCleanup",0},
+    { "_class_wxRegionIterator","_wxRegionIterator",0},
+    { "_class_wxMenuBar","_wxMenuBar",0},
+    { "_class_wxPyTreeItemData","_wxPyTreeItemData",0},
+    { "_class_wxEvtHandler","_class_wxPyApp",SwigwxPyAppTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxPyApp",SwigwxPyAppTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxEvtHandler",0},
+    { "_wxPaintEvent","_class_wxPaintEvent",0},
+    { "_wxGIFHandler","_class_wxGIFHandler",0},
+    { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
+    { "_wxCursor","_class_wxCursor",0},
+    { "_wxNotifyEvent","_class_wxNotifyEvent",0},
+    { "_wxImageHandler","_class_wxImageHandler",0},
+    { "_class_wxTreeCtrl","_wxTreeCtrl",0},
+    { "_wxMask","_class_wxMask",0},
+    { "_wxToolTip","_class_wxToolTip",0},
+    { "_wxGrid","_class_wxGrid",0},
+    { "_wxPNGHandler","_class_wxPNGHandler",0},
+    { "_class_wxColourData","_wxColourData",0},
+    { "_class_wxPageSetupDialogData","_wxPageSetupDialogData",0},
+    { "_wxPrinter","_class_wxPrinter",0},
+    { "_wxPen","_class_wxPen",0},
+    { "_wxUpdateUIEvent","_class_wxUpdateUIEvent",0},
+    { "_byte","_unsigned_char",0},
+    { "_wxStaticBox","_class_wxStaticBox",0},
+    { "_wxChoice","_class_wxChoice",0},
+    { "_wxSlider","_class_wxSlider",0},
+    { "_wxNotebookEvent","_class_wxNotebookEvent",0},
+    { "_wxPyPrintout","_class_wxPyPrintout",0},
+    { "_long","_wxDash",0},
+    { "_long","_unsigned_long",0},
+    { "_long","_signed_long",0},
+    { "_wxImageList","_class_wxImageList",0},
+    { "_wxDropFilesEvent","_class_wxDropFilesEvent",0},
+    { "_wxBitmapButton","_class_wxBitmapButton",0},
+    { "_wxSashWindow","_class_wxSashWindow",0},
+    { "_class_wxPrintDialogData","_wxPrintDialogData",0},
+    { "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
+    { "_class_wxGauge","_wxGauge",0},
+    { "_class_wxSashEvent","_wxSashEvent",0},
+    { "_wxDC","_class_wxDC",0},
+    { "_wxListEvent","_class_wxListEvent",0},
+    { "_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0},
+    { "_wxProgressDialog","_class_wxProgressDialog",0},
+    { "_class_wxBMPHandler","_wxBMPHandler",0},
+    { "_wxPrintPreview","_class_wxPrintPreview",0},
+    { "_wxSpinEvent","_class_wxSpinEvent",0},
+    { "_wxSashLayoutWindow","_class_wxSashLayoutWindow",0},
+    { "_size_t","_wxPrintQuality",0},
+    { "_size_t","_unsigned_int",0},
+    { "_size_t","_int",0},
+    { "_size_t","_wxWindowID",0},
+    { "_size_t","_uint",0},
+    { "_class_wxRealPoint","_wxRealPoint",0},
+    { "_wxPrinterDC","_class_wxPrinterDC",0},
+    { "_class_wxMenuItem","_wxMenuItem",0},
+    { "_class_wxPaintEvent","_wxPaintEvent",0},
+    { "_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0},
+    { "_class_wxStatusBar","_wxStatusBar",0},
+    { "_class_wxGIFHandler","_wxGIFHandler",0},
+    { "_wxPanel","_class_wxPanel",0},
+    { "_wxInitDialogEvent","_class_wxInitDialogEvent",0},
+    { "_wxCheckBox","_class_wxCheckBox",0},
+    { "_wxPyEvent","_class_wxPyEvent",0},
+    { "_wxTextCtrl","_class_wxTextCtrl",0},
+    { "_class_wxMask","_wxMask",0},
+    { "_class_wxToolTip","_wxToolTip",0},
+    { "_class_wxKeyEvent","_wxKeyEvent",0},
+    { "_class_wxGrid","_wxGrid",0},
+    { "_class_wxPNGHandler","_wxPNGHandler",0},
+    { "_wxColour","_class_wxColour",0},
+    { "_class_wxDialog","_wxDialog",0},
+    { "_wxPageSetupDialog","_class_wxPageSetupDialog",0},
+    { "_class_wxPrinter","_wxPrinter",0},
+    { "_wxIdleEvent","_class_wxIdleEvent",0},
+    { "_class_wxUpdateUIEvent","_wxUpdateUIEvent",0},
+    { "_wxToolBar","_class_wxToolBar",0},
+    { "_wxStaticLine","_class_wxStaticLine",0},
+    { "_class_wxLayoutAlgorithm","_wxLayoutAlgorithm",0},
+    { "_wxBrush","_class_wxBrush",0},
+    { "_wxMiniFrame","_class_wxMiniFrame",0},
+    { "_class_wxNotebookEvent","_wxNotebookEvent",0},
+    { "_class_wxPyPrintout","_wxPyPrintout",0},
+    { "_class_wxSashWindow","_wxSashWindow",0},
+    { "_wxShowEvent","_class_wxShowEvent",0},
+    { "_uint","_wxPrintQuality",0},
+    { "_uint","_size_t",0},
+    { "_uint","_unsigned_int",0},
+    { "_uint","_int",0},
+    { "_uint","_wxWindowID",0},
+    { "_class_wxEvent","_wxEvent",0},
+    { "_wxCheckListBox","_class_wxCheckListBox",0},
+    { "_wxSplitterEvent","_class_wxSplitterEvent",0},
+    { "_wxGridEvent","_class_wxGridEvent",0},
+    { "_wxRect","_class_wxRect",0},
+    { "_wxCommandEvent","_class_wxCommandEvent",0},
+    { "_wxSizeEvent","_class_wxSizeEvent",0},
+    { "_class_wxImage","_wxImage",0},
+    { "_wxPoint","_class_wxPoint",0},
+    { "_class_wxSashLayoutWindow","_wxSashLayoutWindow",0},
+    { "_class_wxButton","_wxButton",0},
+    { "_wxRadioBox","_class_wxRadioBox",0},
+    { "_class_wxFontData","_wxFontData",0},
+    { "_class___wxPyCleanup","___wxPyCleanup",0},
+    { "_wxBitmap","_class_wxBitmap",0},
+    { "_wxTaskBarIcon","_class_wxTaskBarIcon",0},
+    { "_wxPrintDialog","_class_wxPrintDialog",0},
+    { "_wxPyTimer","_class_wxPyTimer",0},
+    { "_wxWindowDC","_class_wxWindowDC",0},
+    { "_wxScrollBar","_class_wxScrollBar",0},
+    { "_wxSpinButton","_class_wxSpinButton",0},
+    { "_wxToolBarTool","_class_wxToolBarTool",0},
+    { "_wxColourDialog","_class_wxColourDialog",0},
+    { "_wxPrintData","_class_wxPrintData",0},
+    { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
+    { "_class_wxNotifyEvent","_wxNotifyEvent",0},
+    { "_wxMessageDialog","_class_wxMessageDialog",0},
+    { "_class_wxPyEvent","_wxPyEvent",0},
+    { "_wxTextEntryDialog","_class_wxTextEntryDialog",0},
+    { "_class_wxIconizeEvent","_wxIconizeEvent",0},
+    { "_class_wxStaticBitmap","_wxStaticBitmap",0},
+    { "_wxMDIChildFrame","_class_wxMDIChildFrame",0},
+    { "_wxListItem","_class_wxListItem",0},
+    { "_class_wxToolBar","_wxToolBar",0},
+    { "_class_wxStaticLine","_wxStaticLine",0},
+    { "_wxScrollEvent","_class_wxScrollEvent",0},
+    { "_wxCalculateLayoutEvent","_class_wxCalculateLayoutEvent",0},
+    { "_EBool","_wxPrintQuality",0},
+    { "_EBool","_signed_int",0},
+    { "_EBool","_int",0},
+    { "_EBool","_wxWindowID",0},
+    { "_class_wxRegion","_wxRegion",0},
+    { "_class_wxDropFilesEvent","_wxDropFilesEvent",0},
+    { "_class_wxPreviewFrame","_wxPreviewFrame",0},
+    { "_wxStaticText","_class_wxStaticText",0},
+    { "_wxFont","_class_wxFont",0},
+    { "_wxCloseEvent","_class_wxCloseEvent",0},
+    { "_class_wxSplitterEvent","_wxSplitterEvent",0},
+    { "_wxNotebook","_class_wxNotebook",0},
+    { "_unsigned_long","_wxDash",0},
+    { "_unsigned_long","_long",0},
+    { "_class_wxRect","_wxRect",0},
+    { "_class_wxDC","_wxDC",0},
+    { "_class_wxProgressDialog","_wxProgressDialog",0},
+    { "_wxPyApp","_class_wxPyApp",0},
+    { "_wxMDIParentFrame","_class_wxMDIParentFrame",0},
+    { "_class_wxTreeEvent","_wxTreeEvent",0},
+    { "_class_wxDirDialog","_wxDirDialog",0},
+    { "_class_wxPyTimer","_wxPyTimer",0},
+    { "_wxFocusEvent","_class_wxFocusEvent",0},
+    { "_wxMaximizeEvent","_class_wxMaximizeEvent",0},
+    { "_class_wxSpinButton","_wxSpinButton",0},
+    { "_wxAcceleratorEntry","_class_wxAcceleratorEntry",0},
+    { "_class_wxPanel","_wxPanel",0},
+    { "_class_wxCheckBox","_wxCheckBox",0},
+    { "_wxComboBox","_class_wxComboBox",0},
+    { "_wxRadioButton","_class_wxRadioButton",0},
+    { "_class_wxMessageDialog","_wxMessageDialog",0},
+    { "_signed_int","_wxPrintQuality",0},
+    { "_signed_int","_EBool",0},
+    { "_signed_int","_wxWindowID",0},
+    { "_signed_int","_int",0},
+    { "_class_wxTextCtrl","_wxTextCtrl",0},
+    { "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
+    { "_wxMetaFileDC","_class_wxMetaFileDC",0},
+    { "_wxMenu","_class_wxMenu",0},
+    { "_class_wxMoveEvent","_wxMoveEvent",0},
+    { "_wxListBox","_class_wxListBox",0},
+    { "_wxScreenDC","_class_wxScreenDC",0},
+    { "_class_wxMDIChildFrame","_wxMDIChildFrame",0},
+    { "_WXTYPE","_short",0},
+    { "_WXTYPE","_signed_short",0},
+    { "_WXTYPE","_unsigned_short",0},
+    { "_wxFileDialog","_class_wxFileDialog",0},
+    { "_class_wxMDIClientWindow","_wxMDIClientWindow",0},
+    { "_class_wxBrush","_wxBrush",0},
+    { "_unsigned_short","_WXTYPE",0},
+    { "_unsigned_short","_short",0},
+    { "_class_wxWindow","_wxWindow",0},
+    { "_wxSplitterWindow","_class_wxSplitterWindow",0},
+    { "_class_wxStaticText","_wxStaticText",0},
+    { "_wxPrintDialogData","_class_wxPrintDialogData",0},
+    { "_class_wxFont","_wxFont",0},
+    { "_class_wxCloseEvent","_wxCloseEvent",0},
+    { "_wxSashEvent","_class_wxSashEvent",0},
+    { "_class_wxMenuEvent","_wxMenuEvent",0},
+    { "_wxClientDC","_class_wxClientDC",0},
+    { "_wxMouseEvent","_class_wxMouseEvent",0},
+    { "_wxListCtrl","_class_wxListCtrl",0},
+    { "_wxSingleChoiceDialog","_class_wxSingleChoiceDialog",0},
+    { "_class_wxPoint","_wxPoint",0},
+    { "_wxRealPoint","_class_wxRealPoint",0},
+    { "_class_wxRadioBox","_wxRadioBox",0},
+    { "_wxGridCell","_class_wxGridCell",0},
+    { "_signed_short","_WXTYPE",0},
+    { "_signed_short","_short",0},
+    { "_wxMemoryDC","_class_wxMemoryDC",0},
+    { "_class_wxTaskBarIcon","_wxTaskBarIcon",0},
+    { "_class_wxPrintDialog","_wxPrintDialog",0},
+    { "_wxPaintDC","_class_wxPaintDC",0},
+    { "_class_wxWindowDC","_wxWindowDC",0},
+    { "_class_wxFocusEvent","_wxFocusEvent",0},
+    { "_class_wxMaximizeEvent","_wxMaximizeEvent",0},
+    { "_wxStatusBar","_class_wxStatusBar",0},
+    { "_class_wxToolBarTool","_wxToolBarTool",0},
+    { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
+    { "_class_wxCursor","_wxCursor",0},
+    { "_class_wxImageHandler","_wxImageHandler",0},
+    { "_wxScrolledWindow","_class_wxScrolledWindow",0},
+    { "_wxTreeItemId","_class_wxTreeItemId",0},
+    { "_unsigned_char","_byte",0},
+    { "_class_wxMetaFileDC","_wxMetaFileDC",0},
+    { "_class_wxMenu","_wxMenu",0},
+    { "_wxControl","_class_wxControl",0},
+    { "_class_wxListBox","_wxListBox",0},
+    { "_unsigned_int","_wxPrintQuality",0},
+    { "_unsigned_int","_size_t",0},
+    { "_unsigned_int","_uint",0},
+    { "_unsigned_int","_wxWindowID",0},
+    { "_unsigned_int","_int",0},
+    { "_wxIcon","_class_wxIcon",0},
+    { "_wxDialog","_class_wxDialog",0},
+    { "_class_wxListItem","_wxListItem",0},
+    { "_class_wxPen","_wxPen",0},
+    { "_class_wxFileDialog","_wxFileDialog",0},
+    { "_wxQueryLayoutInfoEvent","_class_wxQueryLayoutInfoEvent",0},
+    { "_short","_WXTYPE",0},
+    { "_short","_unsigned_short",0},
+    { "_short","_signed_short",0},
+    { "_class_wxStaticBox","_wxStaticBox",0},
+    { "_wxLayoutAlgorithm","_class_wxLayoutAlgorithm",0},
+    { "_class_wxScrollEvent","_wxScrollEvent",0},
+    { "_wxJoystickEvent","_class_wxJoystickEvent",0},
+    { "_class_wxChoice","_wxChoice",0},
+    { "_class_wxSlider","_wxSlider",0},
+    { "_class_wxCalculateLayoutEvent","_wxCalculateLayoutEvent",0},
+    { "_class_wxImageList","_wxImageList",0},
+    { "_class_wxBitmapButton","_wxBitmapButton",0},
+    { "_wxFrame","_class_wxFrame",0},
+    { "_class_wxNotebook","_wxNotebook",0},
+    { "_wxJPEGHandler","_class_wxJPEGHandler",0},
+    { "_wxWindowID","_wxPrintQuality",0},
+    { "_wxWindowID","_size_t",0},
+    { "_wxWindowID","_EBool",0},
+    { "_wxWindowID","_uint",0},
+    { "_wxWindowID","_int",0},
+    { "_wxWindowID","_signed_int",0},
+    { "_wxWindowID","_unsigned_int",0},
+    { "_int","_wxPrintQuality",0},
+    { "_int","_size_t",0},
+    { "_int","_EBool",0},
+    { "_int","_uint",0},
+    { "_int","_wxWindowID",0},
+    { "_int","_unsigned_int",0},
+    { "_int","_signed_int",0},
+    { "_class_wxMouseEvent","_wxMouseEvent",0},
+    { "_class_wxListEvent","_wxListEvent",0},
+    { "_class_wxPrintPreview","_wxPrintPreview",0},
+    { "_class_wxSpinEvent","_wxSpinEvent",0},
+    { "_wxButton","_class_wxButton",0},
+    { "_class_wxPyApp","_wxPyApp",0},
+    { "_wxSize","_class_wxSize",0},
+    { "_wxRegionIterator","_class_wxRegionIterator",0},
+    { "_class_wxPrinterDC","_wxPrinterDC",0},
+    { "_class_wxMDIParentFrame","_wxMDIParentFrame",0},
+    { "_wxPyTreeItemData","_class_wxPyTreeItemData",0},
+    { "_class_wxPaintDC","_wxPaintDC",0},
+    { "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0},
+    { "_class_wxInitDialogEvent","_wxInitDialogEvent",0},
+    { "_class_wxComboBox","_wxComboBox",0},
+    { "_class_wxRadioButton","_wxRadioButton",0},
+    { "_class_wxTreeItemId","_wxTreeItemId",0},
+    { "_wxTreeCtrl","_class_wxTreeCtrl",0},
+    { "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
+    { "_wxIconizeEvent","_class_wxIconizeEvent",0},
+    { "_class_wxControl","_wxControl",0},
+    { "_wxStaticBitmap","_class_wxStaticBitmap",0},
+    { "_class_wxIcon","_wxIcon",0},
+    { "_class_wxColour","_wxColour",0},
+    { "_class_wxScreenDC","_wxScreenDC",0},
+    { "_class_wxPageSetupDialog","_wxPageSetupDialog",0},
+    { "_wxPalette","_class_wxPalette",0},
+    { "_class_wxIdleEvent","_wxIdleEvent",0},
+    { "_wxEraseEvent","_class_wxEraseEvent",0},
+    { "_class_wxJoystickEvent","_wxJoystickEvent",0},
+    { "_class_wxMiniFrame","_wxMiniFrame",0},
+    { "_wxFontDialog","_class_wxFontDialog",0},
+    { "_wxRegion","_class_wxRegion",0},
+    { "_class_wxSplitterWindow","_wxSplitterWindow",0},
+    { "_wxPreviewFrame","_class_wxPreviewFrame",0},
+    { "_class_wxShowEvent","_wxShowEvent",0},
+    { "_wxActivateEvent","_class_wxActivateEvent",0},
+    { "_wxGauge","_class_wxGauge",0},
+    { "_class_wxCheckListBox","_wxCheckListBox",0},
+    { "_class_wxGridEvent","_wxGridEvent",0},
+    { "_class_wxCommandEvent","_wxCommandEvent",0},
+    { "_class_wxClientDC","_wxClientDC",0},
+    { "_class_wxSizeEvent","_wxSizeEvent",0},
+    { "_class_wxListCtrl","_wxListCtrl",0},
+    { "_class_wxGridCell","_wxGridCell",0},
+    { "_class_wxSize","_wxSize",0},
+    { "_class_wxBitmap","_wxBitmap",0},
+    { "_class_wxMemoryDC","_wxMemoryDC",0},
+    { "_wxMenuBar","_class_wxMenuBar",0},
+    { "_wxTreeEvent","_class_wxTreeEvent",0},
+    { "_wxDirDialog","_class_wxDirDialog",0},
+    { "_wxEvtHandler","_class_wxPyApp",SwigwxPyAppTowxEvtHandler},
+    { "_wxEvtHandler","_wxPyApp",SwigwxPyAppTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxEvtHandler",0},
+    { "_wxMenuItem","_class_wxMenuItem",0},
+    { "_class_wxScrollBar","_wxScrollBar",0},
+    { "_class_wxColourDialog","_wxColourDialog",0},
+    { "_class_wxPrintData","_wxPrintData",0},
+    { "_wxDash","_unsigned_long",0},
+    { "_wxDash","_long",0},
+    { "_class_wxScrolledWindow","_wxScrolledWindow",0},
+    { "_class_wxTextEntryDialog","_wxTextEntryDialog",0},
+    { "_wxKeyEvent","_class_wxKeyEvent",0},
+    { "_wxMoveEvent","_class_wxMoveEvent",0},
+    { "_wxColourData","_class_wxColourData",0},
+    { "_wxPageSetupDialogData","_class_wxPageSetupDialogData",0},
+    { "_class_wxPalette","_wxPalette",0},
+    { "_class_wxQueryLayoutInfoEvent","_wxQueryLayoutInfoEvent",0},
+    { "_class_wxEraseEvent","_wxEraseEvent",0},
+    { "_wxMDIClientWindow","_class_wxMDIClientWindow",0},
+    { "_class_wxFontDialog","_wxFontDialog",0},
+    { "_wxWindow","_class_wxWindow",0},
+    { "_class_wxFrame","_wxFrame",0},
+{0,0,0}};
+

 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif
 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif

-SWIGEXPORT(void,initwxc)() {
+SWIGEXPORT(void) initwxc() {

         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("wxc", wxcMethods);
         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("wxc", wxcMethods);


@@ -2231,7 +2617,7 @@ SWIGEXPORT(void,initwxc)() {
         PyDict_SetItemString(d,"wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED", PyInt_FromLong((long) wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED));
         PyDict_SetItemString(d,"wxEVT_COMMAND_SPLITTER_UNSPLIT", PyInt_FromLong((long) wxEVT_COMMAND_SPLITTER_UNSPLIT));
         PyDict_SetItemString(d,"wxEVT_COMMAND_SPLITTER_DOUBLECLICKED", PyInt_FromLong((long) wxEVT_COMMAND_SPLITTER_DOUBLECLICKED));
         PyDict_SetItemString(d,"wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED", PyInt_FromLong((long) wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED));
         PyDict_SetItemString(d,"wxEVT_COMMAND_SPLITTER_UNSPLIT", PyInt_FromLong((long) wxEVT_COMMAND_SPLITTER_UNSPLIT));
         PyDict_SetItemString(d,"wxEVT_COMMAND_SPLITTER_DOUBLECLICKED", PyInt_FromLong((long) wxEVT_COMMAND_SPLITTER_DOUBLECLICKED));

-        PyDict_SetItemString(d,"__version__", PyString_FromString("2.1b2"));
+        PyDict_SetItemString(d,"__version__", PyString_FromString("2.1b3"));

         PyDict_SetItemString(d,"cvar", SWIG_globals);
         SWIG_addvarlink(SWIG_globals,"wxPyDefaultPosition",_wrap_wxPyDefaultPosition_get, _wrap_wxPyDefaultPosition_set);
         SWIG_addvarlink(SWIG_globals,"wxPyDefaultSize",_wrap_wxPyDefaultSize_get, _wrap_wxPyDefaultSize_set);
         PyDict_SetItemString(d,"cvar", SWIG_globals);
         SWIG_addvarlink(SWIG_globals,"wxPyDefaultPosition",_wrap_wxPyDefaultPosition_get, _wrap_wxPyDefaultPosition_set);
         SWIG_addvarlink(SWIG_globals,"wxPyDefaultSize",_wrap_wxPyDefaultSize_get, _wrap_wxPyDefaultSize_set);


@@ -2265,352 +2651,9 @@ SWIGEXPORT(void,initwxc)() {
     initglcanvasc();
 #endif
 #endif
     initglcanvasc();
 #endif
 #endif

-/*
- * These are the pointer type-equivalency mappings. 
- * (Used by the SWIG pointer type-checker).
- */
-        SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_wxEvent","_class_wxEvent",0);
-        SWIG_RegisterMapping("_class_wxActivateEvent","_wxActivateEvent",0);
-        SWIG_RegisterMapping("_signed_long","_long",0);
-        SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0);
-        SWIG_RegisterMapping("_class_wxJPEGHandler","_wxJPEGHandler",0);
-        SWIG_RegisterMapping("_wxBMPHandler","_class_wxBMPHandler",0);
-        SWIG_RegisterMapping("_wxImage","_class_wxImage",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_signed_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_unsigned_int",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_wxWindowID",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_uint",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_EBool",0);
-        SWIG_RegisterMapping("_wxPrintQuality","_size_t",0);
-        SWIG_RegisterMapping("_wxFontData","_class_wxFontData",0);
-        SWIG_RegisterMapping("___wxPyCleanup","_class___wxPyCleanup",0);
-        SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
-        SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
-        SWIG_RegisterMapping("_class_wxPyTreeItemData","_wxPyTreeItemData",0);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxPyApp",SwigwxPyAppTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxPyApp",SwigwxPyAppTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxEvtHandler",0);
-        SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
-        SWIG_RegisterMapping("_wxGIFHandler","_class_wxGIFHandler",0);
-        SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
-        SWIG_RegisterMapping("_wxNotifyEvent","_class_wxNotifyEvent",0);
-        SWIG_RegisterMapping("_wxImageHandler","_class_wxImageHandler",0);
-        SWIG_RegisterMapping("_class_wxTreeCtrl","_wxTreeCtrl",0);
-        SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
-        SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0);
-        SWIG_RegisterMapping("_wxGrid","_class_wxGrid",0);
-        SWIG_RegisterMapping("_wxPNGHandler","_class_wxPNGHandler",0);
-        SWIG_RegisterMapping("_class_wxColourData","_wxColourData",0);
-        SWIG_RegisterMapping("_class_wxPageSetupDialogData","_wxPageSetupDialogData",0);
-        SWIG_RegisterMapping("_wxPrinter","_class_wxPrinter",0);
-        SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
-        SWIG_RegisterMapping("_wxUpdateUIEvent","_class_wxUpdateUIEvent",0);
-        SWIG_RegisterMapping("_byte","_unsigned_char",0);
-        SWIG_RegisterMapping("_wxStaticBox","_class_wxStaticBox",0);
-        SWIG_RegisterMapping("_wxChoice","_class_wxChoice",0);
-        SWIG_RegisterMapping("_wxSlider","_class_wxSlider",0);
-        SWIG_RegisterMapping("_wxNotebookEvent","_class_wxNotebookEvent",0);
-        SWIG_RegisterMapping("_wxPyPrintout","_class_wxPyPrintout",0);
-        SWIG_RegisterMapping("_long","_wxDash",0);
-        SWIG_RegisterMapping("_long","_unsigned_long",0);
-        SWIG_RegisterMapping("_long","_signed_long",0);
-        SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0);
-        SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0);
-        SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0);
-        SWIG_RegisterMapping("_wxSashWindow","_class_wxSashWindow",0);
-        SWIG_RegisterMapping("_class_wxPrintDialogData","_wxPrintDialogData",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_class_wxGauge","_wxGauge",0);
-        SWIG_RegisterMapping("_class_wxSashEvent","_wxSashEvent",0);
-        SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
-        SWIG_RegisterMapping("_wxListEvent","_class_wxListEvent",0);
-        SWIG_RegisterMapping("_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0);
-        SWIG_RegisterMapping("_wxProgressDialog","_class_wxProgressDialog",0);
-        SWIG_RegisterMapping("_class_wxBMPHandler","_wxBMPHandler",0);
-        SWIG_RegisterMapping("_wxPrintPreview","_class_wxPrintPreview",0);
-        SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0);
-        SWIG_RegisterMapping("_wxSashLayoutWindow","_class_wxSashLayoutWindow",0);
-        SWIG_RegisterMapping("_size_t","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_size_t","_unsigned_int",0);
-        SWIG_RegisterMapping("_size_t","_int",0);
-        SWIG_RegisterMapping("_size_t","_wxWindowID",0);
-        SWIG_RegisterMapping("_size_t","_uint",0);
-        SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
-        SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0);
-        SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0);
-        SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0);
-        SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0);
-        SWIG_RegisterMapping("_class_wxStatusBar","_wxStatusBar",0);
-        SWIG_RegisterMapping("_class_wxGIFHandler","_wxGIFHandler",0);
-        SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);
-        SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
-        SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
-        SWIG_RegisterMapping("_wxPyEvent","_class_wxPyEvent",0);
-        SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);
-        SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
-        SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0);
-        SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0);
-        SWIG_RegisterMapping("_class_wxGrid","_wxGrid",0);
-        SWIG_RegisterMapping("_class_wxPNGHandler","_wxPNGHandler",0);
-        SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
-        SWIG_RegisterMapping("_class_wxDialog","_wxDialog",0);
-        SWIG_RegisterMapping("_wxPageSetupDialog","_class_wxPageSetupDialog",0);
-        SWIG_RegisterMapping("_class_wxPrinter","_wxPrinter",0);
-        SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0);
-        SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0);
-        SWIG_RegisterMapping("_wxToolBar","_class_wxToolBar",0);
-        SWIG_RegisterMapping("_wxStaticLine","_class_wxStaticLine",0);
-        SWIG_RegisterMapping("_class_wxLayoutAlgorithm","_wxLayoutAlgorithm",0);
-        SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
-        SWIG_RegisterMapping("_wxMiniFrame","_class_wxMiniFrame",0);
-        SWIG_RegisterMapping("_class_wxNotebookEvent","_wxNotebookEvent",0);
-        SWIG_RegisterMapping("_class_wxPyPrintout","_wxPyPrintout",0);
-        SWIG_RegisterMapping("_class_wxSashWindow","_wxSashWindow",0);
-        SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0);
-        SWIG_RegisterMapping("_uint","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_uint","_size_t",0);
-        SWIG_RegisterMapping("_uint","_unsigned_int",0);
-        SWIG_RegisterMapping("_uint","_int",0);
-        SWIG_RegisterMapping("_uint","_wxWindowID",0);
-        SWIG_RegisterMapping("_class_wxEvent","_wxEvent",0);
-        SWIG_RegisterMapping("_wxCheckListBox","_class_wxCheckListBox",0);
-        SWIG_RegisterMapping("_wxSplitterEvent","_class_wxSplitterEvent",0);
-        SWIG_RegisterMapping("_wxGridEvent","_class_wxGridEvent",0);
-        SWIG_RegisterMapping("_wxRect","_class_wxRect",0);
-        SWIG_RegisterMapping("_wxCommandEvent","_class_wxCommandEvent",0);
-        SWIG_RegisterMapping("_wxSizeEvent","_class_wxSizeEvent",0);
-        SWIG_RegisterMapping("_class_wxImage","_wxImage",0);
-        SWIG_RegisterMapping("_wxPoint","_class_wxPoint",0);
-        SWIG_RegisterMapping("_class_wxSashLayoutWindow","_wxSashLayoutWindow",0);
-        SWIG_RegisterMapping("_class_wxButton","_wxButton",0);
-        SWIG_RegisterMapping("_wxRadioBox","_class_wxRadioBox",0);
-        SWIG_RegisterMapping("_class_wxFontData","_wxFontData",0);
-        SWIG_RegisterMapping("_class___wxPyCleanup","___wxPyCleanup",0);
-        SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
-        SWIG_RegisterMapping("_wxTaskBarIcon","_class_wxTaskBarIcon",0);
-        SWIG_RegisterMapping("_wxPrintDialog","_class_wxPrintDialog",0);
-        SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0);
-        SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0);
-        SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0);
-        SWIG_RegisterMapping("_wxToolBarTool","_class_wxToolBarTool",0);
-        SWIG_RegisterMapping("_wxColourDialog","_class_wxColourDialog",0);
-        SWIG_RegisterMapping("_wxPrintData","_class_wxPrintData",0);
-        SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_class_wxNotifyEvent","_wxNotifyEvent",0);
-        SWIG_RegisterMapping("_wxMessageDialog","_class_wxMessageDialog",0);
-        SWIG_RegisterMapping("_class_wxPyEvent","_wxPyEvent",0);
-        SWIG_RegisterMapping("_wxTextEntryDialog","_class_wxTextEntryDialog",0);
-        SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
-        SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
-        SWIG_RegisterMapping("_wxMDIChildFrame","_class_wxMDIChildFrame",0);
-        SWIG_RegisterMapping("_wxListItem","_class_wxListItem",0);
-        SWIG_RegisterMapping("_class_wxToolBar","_wxToolBar",0);
-        SWIG_RegisterMapping("_class_wxStaticLine","_wxStaticLine",0);
-        SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0);
-        SWIG_RegisterMapping("_wxCalculateLayoutEvent","_class_wxCalculateLayoutEvent",0);
-        SWIG_RegisterMapping("_EBool","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_EBool","_signed_int",0);
-        SWIG_RegisterMapping("_EBool","_int",0);
-        SWIG_RegisterMapping("_EBool","_wxWindowID",0);
-        SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
-        SWIG_RegisterMapping("_class_wxDropFilesEvent","_wxDropFilesEvent",0);
-        SWIG_RegisterMapping("_class_wxPreviewFrame","_wxPreviewFrame",0);
-        SWIG_RegisterMapping("_wxStaticText","_class_wxStaticText",0);
-        SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
-        SWIG_RegisterMapping("_wxCloseEvent","_class_wxCloseEvent",0);
-        SWIG_RegisterMapping("_class_wxSplitterEvent","_wxSplitterEvent",0);
-        SWIG_RegisterMapping("_wxNotebook","_class_wxNotebook",0);
-        SWIG_RegisterMapping("_unsigned_long","_wxDash",0);
-        SWIG_RegisterMapping("_unsigned_long","_long",0);
-        SWIG_RegisterMapping("_class_wxRect","_wxRect",0);
-        SWIG_RegisterMapping("_class_wxDC","_wxDC",0);
-        SWIG_RegisterMapping("_class_wxProgressDialog","_wxProgressDialog",0);
-        SWIG_RegisterMapping("_wxPyApp","_class_wxPyApp",0);
-        SWIG_RegisterMapping("_wxMDIParentFrame","_class_wxMDIParentFrame",0);
-        SWIG_RegisterMapping("_class_wxTreeEvent","_wxTreeEvent",0);
-        SWIG_RegisterMapping("_class_wxDirDialog","_wxDirDialog",0);
-        SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxFocusEvent","_class_wxFocusEvent",0);
-        SWIG_RegisterMapping("_wxMaximizeEvent","_class_wxMaximizeEvent",0);
-        SWIG_RegisterMapping("_class_wxSpinButton","_wxSpinButton",0);
-        SWIG_RegisterMapping("_wxAcceleratorEntry","_class_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_class_wxPanel","_wxPanel",0);
-        SWIG_RegisterMapping("_class_wxCheckBox","_wxCheckBox",0);
-        SWIG_RegisterMapping("_wxComboBox","_class_wxComboBox",0);
-        SWIG_RegisterMapping("_wxRadioButton","_class_wxRadioButton",0);
-        SWIG_RegisterMapping("_class_wxMessageDialog","_wxMessageDialog",0);
-        SWIG_RegisterMapping("_signed_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_signed_int","_EBool",0);
-        SWIG_RegisterMapping("_signed_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_signed_int","_int",0);
-        SWIG_RegisterMapping("_class_wxTextCtrl","_wxTextCtrl",0);
-        SWIG_RegisterMapping("_wxLayoutConstraints","_class_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_wxMetaFileDC","_class_wxMetaFileDC",0);
-        SWIG_RegisterMapping("_wxMenu","_class_wxMenu",0);
-        SWIG_RegisterMapping("_class_wxMoveEvent","_wxMoveEvent",0);
-        SWIG_RegisterMapping("_wxListBox","_class_wxListBox",0);
-        SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0);
-        SWIG_RegisterMapping("_class_wxMDIChildFrame","_wxMDIChildFrame",0);
-        SWIG_RegisterMapping("_WXTYPE","_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_signed_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_unsigned_short",0);
-        SWIG_RegisterMapping("_wxFileDialog","_class_wxFileDialog",0);
-        SWIG_RegisterMapping("_class_wxMDIClientWindow","_wxMDIClientWindow",0);
-        SWIG_RegisterMapping("_class_wxBrush","_wxBrush",0);
-        SWIG_RegisterMapping("_unsigned_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_unsigned_short","_short",0);
-        SWIG_RegisterMapping("_class_wxWindow","_wxWindow",0);
-        SWIG_RegisterMapping("_wxSplitterWindow","_class_wxSplitterWindow",0);
-        SWIG_RegisterMapping("_class_wxStaticText","_wxStaticText",0);
-        SWIG_RegisterMapping("_wxPrintDialogData","_class_wxPrintDialogData",0);
-        SWIG_RegisterMapping("_class_wxFont","_wxFont",0);
-        SWIG_RegisterMapping("_class_wxCloseEvent","_wxCloseEvent",0);
-        SWIG_RegisterMapping("_wxSashEvent","_class_wxSashEvent",0);
-        SWIG_RegisterMapping("_class_wxMenuEvent","_wxMenuEvent",0);
-        SWIG_RegisterMapping("_wxClientDC","_class_wxClientDC",0);
-        SWIG_RegisterMapping("_wxMouseEvent","_class_wxMouseEvent",0);
-        SWIG_RegisterMapping("_wxListCtrl","_class_wxListCtrl",0);
-        SWIG_RegisterMapping("_wxSingleChoiceDialog","_class_wxSingleChoiceDialog",0);
-        SWIG_RegisterMapping("_class_wxPoint","_wxPoint",0);
-        SWIG_RegisterMapping("_wxRealPoint","_class_wxRealPoint",0);
-        SWIG_RegisterMapping("_class_wxRadioBox","_wxRadioBox",0);
-        SWIG_RegisterMapping("_wxGridCell","_class_wxGridCell",0);
-        SWIG_RegisterMapping("_signed_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_signed_short","_short",0);
-        SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0);
-        SWIG_RegisterMapping("_class_wxTaskBarIcon","_wxTaskBarIcon",0);
-        SWIG_RegisterMapping("_class_wxPrintDialog","_wxPrintDialog",0);
-        SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
-        SWIG_RegisterMapping("_class_wxWindowDC","_wxWindowDC",0);
-        SWIG_RegisterMapping("_class_wxFocusEvent","_wxFocusEvent",0);
-        SWIG_RegisterMapping("_class_wxMaximizeEvent","_wxMaximizeEvent",0);
-        SWIG_RegisterMapping("_wxStatusBar","_class_wxStatusBar",0);
-        SWIG_RegisterMapping("_class_wxToolBarTool","_wxToolBarTool",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
-        SWIG_RegisterMapping("_class_wxImageHandler","_wxImageHandler",0);
-        SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0);
-        SWIG_RegisterMapping("_wxTreeItemId","_class_wxTreeItemId",0);
-        SWIG_RegisterMapping("_unsigned_char","_byte",0);
-        SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0);
-        SWIG_RegisterMapping("_class_wxMenu","_wxMenu",0);
-        SWIG_RegisterMapping("_wxControl","_class_wxControl",0);
-        SWIG_RegisterMapping("_class_wxListBox","_wxListBox",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_unsigned_int","_size_t",0);
-        SWIG_RegisterMapping("_unsigned_int","_uint",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_unsigned_int","_int",0);
-        SWIG_RegisterMapping("_wxIcon","_class_wxIcon",0);
-        SWIG_RegisterMapping("_wxDialog","_class_wxDialog",0);
-        SWIG_RegisterMapping("_class_wxListItem","_wxListItem",0);
-        SWIG_RegisterMapping("_class_wxPen","_wxPen",0);
-        SWIG_RegisterMapping("_class_wxFileDialog","_wxFileDialog",0);
-        SWIG_RegisterMapping("_wxQueryLayoutInfoEvent","_class_wxQueryLayoutInfoEvent",0);
-        SWIG_RegisterMapping("_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_short","_unsigned_short",0);
-        SWIG_RegisterMapping("_short","_signed_short",0);
-        SWIG_RegisterMapping("_class_wxStaticBox","_wxStaticBox",0);
-        SWIG_RegisterMapping("_wxLayoutAlgorithm","_class_wxLayoutAlgorithm",0);
-        SWIG_RegisterMapping("_class_wxScrollEvent","_wxScrollEvent",0);
-        SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0);
-        SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
-        SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);
-        SWIG_RegisterMapping("_class_wxCalculateLayoutEvent","_wxCalculateLayoutEvent",0);
-        SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0);
-        SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
-        SWIG_RegisterMapping("_wxFrame","_class_wxFrame",0);
-        SWIG_RegisterMapping("_class_wxNotebook","_wxNotebook",0);
-        SWIG_RegisterMapping("_wxJPEGHandler","_class_wxJPEGHandler",0);
-        SWIG_RegisterMapping("_wxWindowID","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_wxWindowID","_size_t",0);
-        SWIG_RegisterMapping("_wxWindowID","_EBool",0);
-        SWIG_RegisterMapping("_wxWindowID","_uint",0);
-        SWIG_RegisterMapping("_wxWindowID","_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_signed_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_wxPrintQuality",0);
-        SWIG_RegisterMapping("_int","_size_t",0);
-        SWIG_RegisterMapping("_int","_EBool",0);
-        SWIG_RegisterMapping("_int","_uint",0);
-        SWIG_RegisterMapping("_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_int","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_signed_int",0);
-        SWIG_RegisterMapping("_class_wxMouseEvent","_wxMouseEvent",0);
-        SWIG_RegisterMapping("_class_wxListEvent","_wxListEvent",0);
-        SWIG_RegisterMapping("_class_wxPrintPreview","_wxPrintPreview",0);
-        SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0);
-        SWIG_RegisterMapping("_wxButton","_class_wxButton",0);
-        SWIG_RegisterMapping("_class_wxPyApp","_wxPyApp",0);
-        SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
-        SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
-        SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
-        SWIG_RegisterMapping("_class_wxMDIParentFrame","_wxMDIParentFrame",0);
-        SWIG_RegisterMapping("_wxPyTreeItemData","_class_wxPyTreeItemData",0);
-        SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
-        SWIG_RegisterMapping("_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0);
-        SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0);
-        SWIG_RegisterMapping("_class_wxComboBox","_wxComboBox",0);
-        SWIG_RegisterMapping("_class_wxRadioButton","_wxRadioButton",0);
-        SWIG_RegisterMapping("_class_wxTreeItemId","_wxTreeItemId",0);
-        SWIG_RegisterMapping("_wxTreeCtrl","_class_wxTreeCtrl",0);
-        SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_wxIconizeEvent","_class_wxIconizeEvent",0);
-        SWIG_RegisterMapping("_class_wxControl","_wxControl",0);
-        SWIG_RegisterMapping("_wxStaticBitmap","_class_wxStaticBitmap",0);
-        SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
-        SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
-        SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
-        SWIG_RegisterMapping("_class_wxPageSetupDialog","_wxPageSetupDialog",0);
-        SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
-        SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0);
-        SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
-        SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
-        SWIG_RegisterMapping("_class_wxMiniFrame","_wxMiniFrame",0);
-        SWIG_RegisterMapping("_wxFontDialog","_class_wxFontDialog",0);
-        SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
-        SWIG_RegisterMapping("_class_wxSplitterWindow","_wxSplitterWindow",0);
-        SWIG_RegisterMapping("_wxPreviewFrame","_class_wxPreviewFrame",0);
-        SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
-        SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
-        SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0);
-        SWIG_RegisterMapping("_class_wxCheckListBox","_wxCheckListBox",0);
-        SWIG_RegisterMapping("_class_wxGridEvent","_wxGridEvent",0);
-        SWIG_RegisterMapping("_class_wxCommandEvent","_wxCommandEvent",0);
-        SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
-        SWIG_RegisterMapping("_class_wxSizeEvent","_wxSizeEvent",0);
-        SWIG_RegisterMapping("_class_wxListCtrl","_wxListCtrl",0);
-        SWIG_RegisterMapping("_class_wxGridCell","_wxGridCell",0);
-        SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
-        SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0);
-        SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0);
-        SWIG_RegisterMapping("_wxMenuBar","_class_wxMenuBar",0);
-        SWIG_RegisterMapping("_wxTreeEvent","_class_wxTreeEvent",0);
-        SWIG_RegisterMapping("_wxDirDialog","_class_wxDirDialog",0);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxPyApp",SwigwxPyAppTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxPyApp",SwigwxPyAppTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxEvtHandler",0);
-        SWIG_RegisterMapping("_wxMenuItem","_class_wxMenuItem",0);
-        SWIG_RegisterMapping("_class_wxScrollBar","_wxScrollBar",0);
-        SWIG_RegisterMapping("_class_wxColourDialog","_wxColourDialog",0);
-        SWIG_RegisterMapping("_class_wxPrintData","_wxPrintData",0);
-        SWIG_RegisterMapping("_wxDash","_unsigned_long",0);
-        SWIG_RegisterMapping("_wxDash","_long",0);
-        SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
-        SWIG_RegisterMapping("_class_wxTextEntryDialog","_wxTextEntryDialog",0);
-        SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0);
-        SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0);
-        SWIG_RegisterMapping("_wxColourData","_class_wxColourData",0);
-        SWIG_RegisterMapping("_wxPageSetupDialogData","_class_wxPageSetupDialogData",0);
-        SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
-        SWIG_RegisterMapping("_class_wxQueryLayoutInfoEvent","_wxQueryLayoutInfoEvent",0);
-        SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0);
-        SWIG_RegisterMapping("_wxMDIClientWindow","_class_wxMDIClientWindow",0);
-        SWIG_RegisterMapping("_class_wxFontDialog","_wxFontDialog",0);
-        SWIG_RegisterMapping("_wxWindow","_class_wxWindow",0);
-        SWIG_RegisterMapping("_class_wxFrame","_wxFrame",0);
+{
+   int i;
+   for (i = 0; _swig_mapping[i].n1; i++)
+        SWIG_RegisterMapping(_swig_mapping[i].n1,_swig_mapping[i].n2,_swig_mapping[i].pcnv);
+}

 }
 }

diff --git a/utils/wxPython/src/msw/wx.py b/utils/wxPython/src/msw/wx.py
index 923aefd2799a242c2c5adec8b569e87473dfdadd..30d9b78758d2eca0faaf6d102210fb9016bb4b9f 100644 (file)
--- a/utils/wxPython/src/msw/wx.py
+++ b/utils/wxPython/src/msw/wx.py
@@ -34,80 +34,79 @@ class wxPyAppPtr(wxEvtHandlerPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self, wxc=wxc):
+    def __del__(self,wxc=wxc):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            wxc.delete_wxPyApp(self.this)
-    def GetAppName(self):
-        val = wxc.wxPyApp_GetAppName(self.this)
+            wxc.delete_wxPyApp(self)
+    def GetAppName(self, *_args, **_kwargs):
+        val = apply(wxc.wxPyApp_GetAppName,(self,) + _args, _kwargs)

         return val
         return val

-    def GetAuto3D(self):
-        val = wxc.wxPyApp_GetAuto3D(self.this)
+    def GetAuto3D(self, *_args, **_kwargs):
+        val = apply(wxc.wxPyApp_GetAuto3D,(self,) + _args, _kwargs)

         return val
         return val

-    def GetClassName(self):
-        val = wxc.wxPyApp_GetClassName(self.this)
+    def GetClassName(self, *_args, **_kwargs):
+        val = apply(wxc.wxPyApp_GetClassName,(self,) + _args, _kwargs)

         return val
         return val

-    def GetExitOnFrameDelete(self):
-        val = wxc.wxPyApp_GetExitOnFrameDelete(self.this)
+    def GetExitOnFrameDelete(self, *_args, **_kwargs):
+        val = apply(wxc.wxPyApp_GetExitOnFrameDelete,(self,) + _args, _kwargs)

         return val
         return val

-    def GetPrintMode(self):
-        val = wxc.wxPyApp_GetPrintMode(self.this)
+    def GetPrintMode(self, *_args, **_kwargs):
+        val = apply(wxc.wxPyApp_GetPrintMode,(self,) + _args, _kwargs)

         return val
         return val

-    def GetTopWindow(self):
-        val = wxc.wxPyApp_GetTopWindow(self.this)
-        val = wxWindowPtr(val)
+    def GetTopWindow(self, *_args, **_kwargs):
+        val = apply(wxc.wxPyApp_GetTopWindow,(self,) + _args, _kwargs)
+        if val: val = wxWindowPtr(val) 

         return val
         return val

-    def GetVendorName(self):
-        val = wxc.wxPyApp_GetVendorName(self.this)
+    def GetVendorName(self, *_args, **_kwargs):
+        val = apply(wxc.wxPyApp_GetVendorName,(self,) + _args, _kwargs)

         return val
         return val

-    def Dispatch(self):
-        val = wxc.wxPyApp_Dispatch(self.this)
+    def Dispatch(self, *_args, **_kwargs):
+        val = apply(wxc.wxPyApp_Dispatch,(self,) + _args, _kwargs)

         return val
         return val

-    def ExitMainLoop(self):
-        val = wxc.wxPyApp_ExitMainLoop(self.this)
+    def ExitMainLoop(self, *_args, **_kwargs):
+        val = apply(wxc.wxPyApp_ExitMainLoop,(self,) + _args, _kwargs)

         return val
         return val

-    def Initialized(self):
-        val = wxc.wxPyApp_Initialized(self.this)
+    def Initialized(self, *_args, **_kwargs):
+        val = apply(wxc.wxPyApp_Initialized,(self,) + _args, _kwargs)

         return val
         return val

-    def MainLoop(self):
-        val = wxc.wxPyApp_MainLoop(self.this)
+    def MainLoop(self, *_args, **_kwargs):
+        val = apply(wxc.wxPyApp_MainLoop,(self,) + _args, _kwargs)

         return val
         return val

-    def Pending(self):
-        val = wxc.wxPyApp_Pending(self.this)
+    def Pending(self, *_args, **_kwargs):
+        val = apply(wxc.wxPyApp_Pending,(self,) + _args, _kwargs)

         return val
         return val

-    def ProcessIdle(self):
-        val = wxc.wxPyApp_ProcessIdle(self.this)
+    def ProcessIdle(self, *_args, **_kwargs):
+        val = apply(wxc.wxPyApp_ProcessIdle,(self,) + _args, _kwargs)

         return val
         return val

-    def SetAppName(self,arg0):
-        val = wxc.wxPyApp_SetAppName(self.this,arg0)
+    def SetAppName(self, *_args, **_kwargs):
+        val = apply(wxc.wxPyApp_SetAppName,(self,) + _args, _kwargs)

         return val
         return val

-    def SetAuto3D(self,arg0):
-        val = wxc.wxPyApp_SetAuto3D(self.this,arg0)
+    def SetAuto3D(self, *_args, **_kwargs):
+        val = apply(wxc.wxPyApp_SetAuto3D,(self,) + _args, _kwargs)

         return val
         return val

-    def SetClassName(self,arg0):
-        val = wxc.wxPyApp_SetClassName(self.this,arg0)
+    def SetClassName(self, *_args, **_kwargs):
+        val = apply(wxc.wxPyApp_SetClassName,(self,) + _args, _kwargs)

         return val
         return val

-    def SetExitOnFrameDelete(self,arg0):
-        val = wxc.wxPyApp_SetExitOnFrameDelete(self.this,arg0)
+    def SetExitOnFrameDelete(self, *_args, **_kwargs):
+        val = apply(wxc.wxPyApp_SetExitOnFrameDelete,(self,) + _args, _kwargs)

         return val
         return val

-    def SetPrintMode(self,arg0):
-        val = wxc.wxPyApp_SetPrintMode(self.this,arg0)
+    def SetPrintMode(self, *_args, **_kwargs):
+        val = apply(wxc.wxPyApp_SetPrintMode,(self,) + _args, _kwargs)

         return val
         return val

-    def SetTopWindow(self,arg0):
-        val = wxc.wxPyApp_SetTopWindow(self.this,arg0.this)
+    def SetTopWindow(self, *_args, **_kwargs):
+        val = apply(wxc.wxPyApp_SetTopWindow,(self,) + _args, _kwargs)

         return val
         return val

-    def SetVendorName(self,arg0):
-        val = wxc.wxPyApp_SetVendorName(self.this,arg0)
+    def SetVendorName(self, *_args, **_kwargs):
+        val = apply(wxc.wxPyApp_SetVendorName,(self,) + _args, _kwargs)

         return val
         return val

-    def GetStdIcon(self,arg0):
-        val = wxc.wxPyApp_GetStdIcon(self.this,arg0)
-        val = wxIconPtr(val)
-        val.thisown = 1
+    def GetStdIcon(self, *_args, **_kwargs):
+        val = apply(wxc.wxPyApp_GetStdIcon,(self,) + _args, _kwargs)
+        if val: val = wxIconPtr(val) ; val.thisown = 1

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxPyApp instance>"
+        return "<C wxPyApp instance at %s>" % (self.this,)

 class wxPyApp(wxPyAppPtr):
 class wxPyApp(wxPyAppPtr):

-    def __init__(self) :
-        self.this = wxc.new_wxPyApp()
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(wxc.new_wxPyApp,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -117,14 +116,14 @@ class __wxPyCleanupPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self, wxc=wxc):
+    def __del__(self,wxc=wxc):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            wxc.delete___wxPyCleanup(self.this)
+            wxc.delete___wxPyCleanup(self)

     def __repr__(self):
     def __repr__(self):

-        return "<C __wxPyCleanup instance>"
+        return "<C __wxPyCleanup instance at %s>" % (self.this,)

 class __wxPyCleanup(__wxPyCleanupPtr):
 class __wxPyCleanup(__wxPyCleanupPtr):

-    def __init__(self) :
-        self.this = wxc.new___wxPyCleanup()
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(wxc.new___wxPyCleanup,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 

diff --git a/utils/wxPython/src/wx.i b/utils/wxPython/src/wx.i
index a2ce9c208276c816abc8d1c0a614b67cd95ccbca..d266695535400b29d9d31c70dda67c7a15934751 100644 (file)
--- a/utils/wxPython/src/wx.i
+++ b/utils/wxPython/src/wx.i
@@ -49,7 +49,7 @@
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-#define __version__ "2.1b2"
+#define __version__ "2.1b3"

 
 wxPoint     wxPyDefaultPosition;
 wxSize      wxPyDefaultSize;
 
 wxPoint     wxPyDefaultPosition;
 wxSize      wxPyDefaultSize;


@@ -129,25 +129,25 @@ public:
 //----------------------------------------------------------------------
 
 %{
 //----------------------------------------------------------------------
 
 %{

-extern "C" SWIGEXPORT(void,initwindowsc)();
-extern "C" SWIGEXPORT(void,initwindows2c)();
-extern "C" SWIGEXPORT(void,initeventsc)();
-extern "C" SWIGEXPORT(void,initmiscc)();
-extern "C" SWIGEXPORT(void,initmisc2c)();
-extern "C" SWIGEXPORT(void,initgdic)();
-extern "C" SWIGEXPORT(void,initmdic)();
-extern "C" SWIGEXPORT(void,initcontrolsc)();
-extern "C" SWIGEXPORT(void,initcontrols2c)();
-extern "C" SWIGEXPORT(void,initcmndlgsc)();
-extern "C" SWIGEXPORT(void,initstattoolc)();
-extern "C" SWIGEXPORT(void,initframesc)();
-extern "C" SWIGEXPORT(void,initwindows3c)();
-extern "C" SWIGEXPORT(void,initimagec)();
-extern "C" SWIGEXPORT(void,initprintfwc)();
+extern "C" SWIGEXPORT(void) initwindowsc();
+extern "C" SWIGEXPORT(void) initwindows2c();
+extern "C" SWIGEXPORT(void) initeventsc();
+extern "C" SWIGEXPORT(void) initmiscc();
+extern "C" SWIGEXPORT(void) initmisc2c();
+extern "C" SWIGEXPORT(void) initgdic();
+extern "C" SWIGEXPORT(void) initmdic();
+extern "C" SWIGEXPORT(void) initcontrolsc();
+extern "C" SWIGEXPORT(void) initcontrols2c();
+extern "C" SWIGEXPORT(void) initcmndlgsc();
+extern "C" SWIGEXPORT(void) initstattoolc();
+extern "C" SWIGEXPORT(void) initframesc();
+extern "C" SWIGEXPORT(void) initwindows3c();
+extern "C" SWIGEXPORT(void) initimagec();
+extern "C" SWIGEXPORT(void) initprintfwc();

 #ifndef SEPARATE
 #ifndef SEPARATE

-extern "C" SWIGEXPORT(void,initutilsc)();
-//extern "C" SWIGEXPORT(void,initoglc)();
-extern "C" SWIGEXPORT(void,initglcanvasc)();
+extern "C" SWIGEXPORT(void) initutilsc();
+//extern "C" SWIGEXPORT(void) initoglc();
+extern "C" SWIGEXPORT(void) initglcanvasc();

 #endif
 %}
 
 #endif
 %}