highlight the focused item in non report mode too

[wxWidgets.git] / wxPython / src / msw / grid.cpp
diff --git a/wxPython/src/msw/grid.cpp b/wxPython/src/msw/grid.cpp

index e7acb3f64cca42905b8cbae16c0a5dd93ef550b9..aa65a43ed18015f98f041fbe128a51c533f84a07 100644 (file)
--- a/wxPython/src/msw/grid.cpp
+++ b/wxPython/src/msw/grid.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 (Build 810)
+ * Version 1.1 (Build 883)
   * 
   * 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.
@@ -41,6 +41,7 @@
  #ifdef __cplusplus
  extern "C" {
  #endif
  #ifdef __cplusplus
  extern "C" {
  #endif
+
  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 *);
@@ -54,28 +55,9 @@ extern PyObject *SWIG_newvarlink(void);
  
  #define SWIG_name    "gridc"
  
  
  #define SWIG_name    "gridc"
  
-#include "helpers.h"
+#include "export.h"
  #include <wx/grid.h>
  
  #include <wx/grid.h>
  
-static PyObject* l_output_helper(PyObject* target, PyObject* o) {
-    PyObject*   o2;
-    if (!target) {
-        target = o;
-    } else if (target == Py_None) {
-        Py_DECREF(Py_None);
-        target = o;
-    } else {
-        if (!PyList_Check(target)) {
-            o2 = target;
-            target = PyList_New(0);
-            PyList_Append(target, o2);
-           Py_XDECREF(o2);
-        }
-        PyList_Append(target,o);
-       Py_XDECREF(o);
-    }
-    return target;
-}
  
  static PyObject* t_output_helper(PyObject* target, PyObject* o) {
      PyObject*   o2;
  
  static PyObject* t_output_helper(PyObject* target, PyObject* o) {
      PyObject*   o2;
@@ -103,29 +85,33 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
      return target;
  }
  
      return target;
  }
  
-static char* wxStringErrorMsg = "string type is required for parameter";
+#if PYTHON_API_VERSION >= 1009
+    static char* wxStringErrorMsg = "String or Unicode type required";
+#else
+    static char* wxStringErrorMsg = "string type is required for parameter";
+#endif
  
  
-#define PYCALLBACK_GCA_INTINT(PCLASS, CBNAME)                           \
-    wxGridCellAttr* CBNAME(int a, int b) {                              \
-        wxGridCellAttr* rval = NULL;                                    \
-        bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME)) {                           \
-            PyObject* ro;                                               \
-            wxGridCellAttr* ptr;                                        \
-            ro = m_myInst.callCallbackObj(Py_BuildValue("(ii)", a, b)); \
-            if (ro) {                                                   \
+#define PYCALLBACK_GCA_INTINTKIND(PCLASS, CBNAME)                               \
+    wxGridCellAttr* CBNAME(int a, int b, wxGridCellAttr::wxAttrKind c) {        \
+        wxGridCellAttr* rval = NULL;                                            \
+        bool doSave = wxPyRestoreThread();                                      \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
+            PyObject* ro;                                                       \
+            wxGridCellAttr* ptr;                                                \
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(iii)", a, b, c)); \
+            if (ro) {                                                           \
                  if (!SWIG_GetPtrObj(ro, (void **)&ptr, "_wxGridCellAttr_p"))    \
                  if (!SWIG_GetPtrObj(ro, (void **)&ptr, "_wxGridCellAttr_p"))    \
-                    rval = ptr;                                         \
-                Py_DECREF(ro);                                          \
-            }                                                           \
-        }                                                               \
-        else                                                            \
-            rval = PCLASS::CBNAME(a, b);                                \
-        wxPySaveThread(doSave);                                         \
-        return rval;                                                    \
-    }                                                                   \
-    wxGridCellAttr *base_##CBNAME(int a, int b) {                       \
-        return PCLASS::CBNAME(a, b);                                    \
+                    rval = ptr;                                                 \
+                Py_DECREF(ro);                                                  \
+            }                                                                   \
+        }                                                                       \
+        else                                                                    \
+            rval = PCLASS::CBNAME(a, b, c);                                     \
+        wxPySaveThread(doSave);                                                 \
+        return rval;                                                            \
+    }                                                                           \
+    wxGridCellAttr *base_##CBNAME(int a, int b, wxGridCellAttr::wxAttrKind c) { \
+        return PCLASS::CBNAME(a, b, c);                                         \
      }
  
  
      }
  
  
@@ -133,11 +119,11 @@ static char* wxStringErrorMsg = "string type is required for parameter";
  #define PYCALLBACK__GCAINTINT(PCLASS, CBNAME)                           \
      void CBNAME(wxGridCellAttr *attr, int a, int b) {                   \
          bool doSave = wxPyRestoreThread();                              \
  #define PYCALLBACK__GCAINTINT(PCLASS, CBNAME)                           \
      void CBNAME(wxGridCellAttr *attr, int a, int b) {                   \
          bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            m_myInst.callCallback(                                      \
-                Py_BuildValue("(Oii)",                                  \
-                              wxPyConstructObject((void*)attr, "wxGridCellAttr"),    \
-                              a, b));                                   \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                           \
+            PyObject* obj = wxPyConstructObject((void*)attr, "wxGridCellAttr", 0);\
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oii)", obj, a, b));   \
+            Py_DECREF(obj);                                             \
+        }                                                               \
          else                                                            \
              PCLASS::CBNAME(attr, a, b);                                 \
          wxPySaveThread(doSave);                                         \
          else                                                            \
              PCLASS::CBNAME(attr, a, b);                                 \
          wxPySaveThread(doSave);                                         \
@@ -151,11 +137,11 @@ static char* wxStringErrorMsg = "string type is required for parameter";
  #define PYCALLBACK__GCAINT(PCLASS, CBNAME)                              \
      void CBNAME(wxGridCellAttr *attr, int val) {                        \
          bool doSave = wxPyRestoreThread();                              \
  #define PYCALLBACK__GCAINT(PCLASS, CBNAME)                              \
      void CBNAME(wxGridCellAttr *attr, int val) {                        \
          bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            m_myInst.callCallback(                                      \
-                Py_BuildValue("(Oi)",                                   \
-                              wxPyConstructObject((void*)attr, "wxGridCellAttr"),    \
-                              val));                                    \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                           \
+            PyObject* obj = wxPyConstructObject((void*)attr, "wxGridCellAttr", 0);\
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, val));     \
+            Py_DECREF(obj);                                             \
+        }                                                               \
          else                                                            \
              PCLASS::CBNAME(attr, val);                                  \
          wxPySaveThread(doSave);                                         \
          else                                                            \
              PCLASS::CBNAME(attr, val);                                  \
          wxPySaveThread(doSave);                                         \
@@ -170,8 +156,8 @@ static char* wxStringErrorMsg = "string type is required for parameter";
      int  CBNAME() {                                                     \
          bool doSave = wxPyRestoreThread();                              \
          int rval = 0;                                                   \
      int  CBNAME() {                                                     \
          bool doSave = wxPyRestoreThread();                              \
          int rval = 0;                                                   \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            rval = m_myInst.callCallback(Py_BuildValue("()"));          \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME))                             \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));          \
          wxPySaveThread(doSave);                                         \
          return rval;                                                    \
      }
          wxPySaveThread(doSave);                                         \
          return rval;                                                    \
      }
@@ -182,8 +168,8 @@ static char* wxStringErrorMsg = "string type is required for parameter";
      bool CBNAME(int a, int b) {                                         \
          bool doSave = wxPyRestoreThread();                              \
          bool rval = 0;                                                  \
      bool CBNAME(int a, int b) {                                         \
          bool doSave = wxPyRestoreThread();                              \
          bool rval = 0;                                                  \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            rval = m_myInst.callCallback(Py_BuildValue("(ii)",a,b));    \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME))                             \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b));    \
          wxPySaveThread(doSave);                                         \
          return rval;                                                    \
      }
          wxPySaveThread(doSave);                                         \
          return rval;                                                    \
      }
@@ -194,12 +180,13 @@ static char* wxStringErrorMsg = "string type is required for parameter";
      wxString CBNAME(int a, int b) {                                     \
          bool doSave = wxPyRestoreThread();                              \
          wxString rval;                                                  \
      wxString CBNAME(int a, int b) {                                     \
          bool doSave = wxPyRestoreThread();                              \
          wxString rval;                                                  \
-        if (m_myInst.findCallback(#CBNAME)) {                           \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                           \
              PyObject* ro;                                               \
              PyObject* ro;                                               \
-            ro = m_myInst.callCallbackObj(Py_BuildValue("(ii)",a,b));   \
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ii)",a,b));   \
              if (ro) {                                                   \
              if (ro) {                                                   \
-                rval = PyString_AsString(PyObject_Str(ro));             \
-                Py_DECREF(ro);                                          \
+                PyObject* str = PyObject_Str(ro);                       \
+                rval = PyString_AsString(str);                          \
+                Py_DECREF(ro);  Py_DECREF(str);                         \
              }                                                           \
          }                                                               \
          wxPySaveThread(doSave);                                         \
              }                                                           \
          }                                                               \
          wxPySaveThread(doSave);                                         \
@@ -211,8 +198,8 @@ static char* wxStringErrorMsg = "string type is required for parameter";
  #define PYCALLBACK__INTINTSTRING_pure(CBNAME)                           \
      void CBNAME(int a, int b, const wxString& c) {                      \
          bool doSave = wxPyRestoreThread();                              \
  #define PYCALLBACK__INTINTSTRING_pure(CBNAME)                           \
      void CBNAME(int a, int b, const wxString& c) {                      \
          bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            m_myInst.callCallback(Py_BuildValue("(iis)",a,b,c.c_str()));    \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME))                             \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iis)",a,b,c.c_str()));    \
          wxPySaveThread(doSave);                                         \
      }
  
          wxPySaveThread(doSave);                                         \
      }
  
@@ -221,12 +208,13 @@ static char* wxStringErrorMsg = "string type is required for parameter";
      wxString CBNAME(int a, int b) {                                     \
          bool doSave = wxPyRestoreThread();                              \
          wxString rval;                                                  \
      wxString CBNAME(int a, int b) {                                     \
          bool doSave = wxPyRestoreThread();                              \
          wxString rval;                                                  \
-        if (m_myInst.findCallback(#CBNAME)) {                           \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                           \
              PyObject* ro;                                               \
              PyObject* ro;                                               \
-            ro = m_myInst.callCallbackObj(Py_BuildValue("(ii)",a,b));   \
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ii)",a,b));   \
              if (ro) {                                                   \
              if (ro) {                                                   \
-                rval = PyString_AsString(PyObject_Str(ro));             \
-                Py_DECREF(ro);                                          \
+                PyObject* str = PyObject_Str(ro);                       \
+                rval = PyString_AsString(str);                          \
+                Py_DECREF(ro);  Py_DECREF(str);                         \
              }                                                           \
          } else                                                          \
              rval = PCLASS::CBNAME(a, b);                                \
              }                                                           \
          } else                                                          \
              rval = PCLASS::CBNAME(a, b);                                \
@@ -243,8 +231,8 @@ static char* wxStringErrorMsg = "string type is required for parameter";
      bool CBNAME(int a, int b, const wxString& c)  {                     \
          bool rval;                                                      \
          bool doSave = wxPyRestoreThread();                              \
      bool CBNAME(int a, int b, const wxString& c)  {                     \
          bool rval;                                                      \
          bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            rval = m_myInst.callCallback(Py_BuildValue("(iis)", a,b,c.c_str()));   \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME))                             \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iis)", a,b,c.c_str()));   \
          else                                                            \
              rval = PCLASS::CBNAME(a,b,c);                               \
          wxPySaveThread(doSave);                                         \
          else                                                            \
              rval = PCLASS::CBNAME(a,b,c);                               \
          wxPySaveThread(doSave);                                         \
@@ -261,8 +249,8 @@ static char* wxStringErrorMsg = "string type is required for parameter";
      long CBNAME(int a, int b)  {                                        \
          long rval;                                                      \
          bool doSave = wxPyRestoreThread();                              \
      long CBNAME(int a, int b)  {                                        \
          long rval;                                                      \
          bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            rval = m_myInst.callCallback(Py_BuildValue("(ii)", a,b));   \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME))                             \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));   \
          else                                                            \
              rval = PCLASS::CBNAME(a,b);                                 \
          wxPySaveThread(doSave);                                         \
          else                                                            \
              rval = PCLASS::CBNAME(a,b);                                 \
          wxPySaveThread(doSave);                                         \
@@ -278,8 +266,8 @@ static char* wxStringErrorMsg = "string type is required for parameter";
      bool CBNAME(int a, int b)  {                                        \
          bool rval;                                                      \
          bool doSave = wxPyRestoreThread();                              \
      bool CBNAME(int a, int b)  {                                        \
          bool rval;                                                      \
          bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            rval = m_myInst.callCallback(Py_BuildValue("(ii)", a,b));   \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME))                             \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));   \
          else                                                            \
              rval = PCLASS::CBNAME(a,b);                                 \
          wxPySaveThread(doSave);                                         \
          else                                                            \
              rval = PCLASS::CBNAME(a,b);                                 \
          wxPySaveThread(doSave);                                         \
@@ -295,12 +283,13 @@ static char* wxStringErrorMsg = "string type is required for parameter";
      double CBNAME(int a, int b) {                                       \
          bool doSave = wxPyRestoreThread();                              \
          double rval;                                                    \
      double CBNAME(int a, int b) {                                       \
          bool doSave = wxPyRestoreThread();                              \
          double rval;                                                    \
-        if (m_myInst.findCallback(#CBNAME)) {                           \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                           \
              PyObject* ro;                                               \
              PyObject* ro;                                               \
-            ro = m_myInst.callCallbackObj(Py_BuildValue("(ii)",a,b));   \
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ii)",a,b));   \
              if (ro) {                                                   \
              if (ro) {                                                   \
-                rval = PyFloat_AsDouble(PyObject_Str(ro));              \
-                Py_DECREF(ro);                                          \
+                PyObject* str = PyObject_Str(ro);                       \
+                rval = PyFloat_AsDouble(str);                           \
+                Py_DECREF(ro);   Py_DECREF(str);                        \
              }                                                           \
          } else                                                          \
              rval = PCLASS::CBNAME(a, b);                                \
              }                                                           \
          } else                                                          \
              rval = PCLASS::CBNAME(a, b);                                \
@@ -316,8 +305,8 @@ static char* wxStringErrorMsg = "string type is required for parameter";
  #define PYCALLBACK__(PCLASS, CBNAME)                                    \
      void CBNAME()  {                                                    \
          bool doSave = wxPyRestoreThread();                              \
  #define PYCALLBACK__(PCLASS, CBNAME)                                    \
      void CBNAME()  {                                                    \
          bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            m_myInst.callCallback(Py_BuildValue("()"));                 \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME))                             \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));                 \
          else                                                            \
              PCLASS::CBNAME();                                           \
          wxPySaveThread(doSave);                                         \
          else                                                            \
              PCLASS::CBNAME();                                           \
          wxPySaveThread(doSave);                                         \
@@ -333,8 +322,8 @@ static char* wxStringErrorMsg = "string type is required for parameter";
      bool CBNAME(size_t a, size_t b)  {                                  \
          bool rval;                                                      \
          bool doSave = wxPyRestoreThread();                              \
      bool CBNAME(size_t a, size_t b)  {                                  \
          bool rval;                                                      \
          bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            rval = m_myInst.callCallback(Py_BuildValue("(ii)", a,b));   \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME))                             \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));   \
          else                                                            \
              rval = PCLASS::CBNAME(a,b);                                 \
          wxPySaveThread(doSave);                                         \
          else                                                            \
              rval = PCLASS::CBNAME(a,b);                                 \
          wxPySaveThread(doSave);                                         \
@@ -350,8 +339,8 @@ static char* wxStringErrorMsg = "string type is required for parameter";
      bool CBNAME(size_t a)  {                                            \
          bool rval;                                                      \
          bool doSave = wxPyRestoreThread();                              \
      bool CBNAME(size_t a)  {                                            \
          bool rval;                                                      \
          bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            rval = m_myInst.callCallback(Py_BuildValue("(i)", a));      \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME))                             \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a));      \
          else                                                            \
              rval = PCLASS::CBNAME(a);                                   \
          wxPySaveThread(doSave);                                         \
          else                                                            \
              rval = PCLASS::CBNAME(a);                                   \
          wxPySaveThread(doSave);                                         \
@@ -367,12 +356,13 @@ static char* wxStringErrorMsg = "string type is required for parameter";
      wxString CBNAME(int a) {                                            \
          bool doSave = wxPyRestoreThread();                              \
          wxString rval;                                                  \
      wxString CBNAME(int a) {                                            \
          bool doSave = wxPyRestoreThread();                              \
          wxString rval;                                                  \
-        if (m_myInst.findCallback(#CBNAME)) {                           \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                           \
              PyObject* ro;                                               \
              PyObject* ro;                                               \
-            ro = m_myInst.callCallbackObj(Py_BuildValue("(i)",a));      \
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(i)",a));      \
              if (ro) {                                                   \
              if (ro) {                                                   \
-                rval = PyString_AsString(PyObject_Str(ro));             \
-                Py_DECREF(ro);                                          \
+                PyObject* str = PyObject_Str(ro);                       \
+                rval = PyString_AsString(str);                          \
+                Py_DECREF(ro);   Py_DECREF(str);                        \
              }                                                           \
          } else                                                          \
              rval = PCLASS::CBNAME(a);                                   \
              }                                                           \
          } else                                                          \
              rval = PCLASS::CBNAME(a);                                   \
@@ -388,8 +378,8 @@ static char* wxStringErrorMsg = "string type is required for parameter";
  #define PYCALLBACK__INTSTRING(PCLASS, CBNAME)                           \
      void CBNAME(int a, const wxString& c)  {                            \
          bool doSave = wxPyRestoreThread();                              \
  #define PYCALLBACK__INTSTRING(PCLASS, CBNAME)                           \
      void CBNAME(int a, const wxString& c)  {                            \
          bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            m_myInst.callCallback(Py_BuildValue("(is)", a,c.c_str()));  \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME))                             \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(is)", a,c.c_str()));  \
          else                                                            \
              PCLASS::CBNAME(a,c);                                        \
          wxPySaveThread(doSave);                                         \
          else                                                            \
              PCLASS::CBNAME(a,c);                                        \
          wxPySaveThread(doSave);                                         \
@@ -405,8 +395,8 @@ static char* wxStringErrorMsg = "string type is required for parameter";
      bool CBNAME()  {                                                    \
          bool rval;                                                      \
          bool doSave = wxPyRestoreThread();                              \
      bool CBNAME()  {                                                    \
          bool rval;                                                      \
          bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            rval = m_myInst.callCallback(Py_BuildValue("()"));          \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME))                             \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));          \
          else                                                            \
              rval = PCLASS::CBNAME();                                    \
          wxPySaveThread(doSave);                                         \
          else                                                            \
              rval = PCLASS::CBNAME();                                    \
          wxPySaveThread(doSave);                                         \
@@ -421,8 +411,8 @@ static char* wxStringErrorMsg = "string type is required for parameter";
  #define PYCALLBACK__SIZETINT(PCLASS, CBNAME)                            \
      void CBNAME(size_t a, int b)  {                                     \
          bool doSave = wxPyRestoreThread();                              \
  #define PYCALLBACK__SIZETINT(PCLASS, CBNAME)                            \
      void CBNAME(size_t a, int b)  {                                     \
          bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            m_myInst.callCallback(Py_BuildValue("(ii)", a,b));          \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME))                             \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));          \
          else                                                            \
              PCLASS::CBNAME(a,b);                                        \
          wxPySaveThread(doSave);                                         \
          else                                                            \
              PCLASS::CBNAME(a,b);                                        \
          wxPySaveThread(doSave);                                         \
@@ -437,8 +427,8 @@ static char* wxStringErrorMsg = "string type is required for parameter";
  #define PYCALLBACK__INTINTLONG(PCLASS, CBNAME)                          \
      void CBNAME(int a, int b, long c)  {                                \
          bool doSave = wxPyRestoreThread();                              \
  #define PYCALLBACK__INTINTLONG(PCLASS, CBNAME)                          \
      void CBNAME(int a, int b, long c)  {                                \
          bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            m_myInst.callCallback(Py_BuildValue("(iii)", a,b,c));       \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME))                             \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));       \
          else                                                            \
              PCLASS::CBNAME(a,b,c);                                      \
          wxPySaveThread(doSave);                                         \
          else                                                            \
              PCLASS::CBNAME(a,b,c);                                      \
          wxPySaveThread(doSave);                                         \
@@ -453,8 +443,8 @@ static char* wxStringErrorMsg = "string type is required for parameter";
  #define PYCALLBACK__INTINTDOUBLE(PCLASS, CBNAME)                        \
      void CBNAME(int a, int b, double c)  {                              \
          bool doSave = wxPyRestoreThread();                              \
  #define PYCALLBACK__INTINTDOUBLE(PCLASS, CBNAME)                        \
      void CBNAME(int a, int b, double c)  {                              \
          bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            m_myInst.callCallback(Py_BuildValue("(iif)", a,b,c));       \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME))                             \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iif)", a,b,c));       \
          else                                                            \
              PCLASS::CBNAME(a,b,c);                                      \
          wxPySaveThread(doSave);                                         \
          else                                                            \
              PCLASS::CBNAME(a,b,c);                                      \
          wxPySaveThread(doSave);                                         \
@@ -468,8 +458,8 @@ static char* wxStringErrorMsg = "string type is required for parameter";
  #define PYCALLBACK__INTINTBOOL(PCLASS, CBNAME)                          \
      void CBNAME(int a, int b, bool c)  {                                \
          bool doSave = wxPyRestoreThread();                              \
  #define PYCALLBACK__INTINTBOOL(PCLASS, CBNAME)                          \
      void CBNAME(int a, int b, bool c)  {                                \
          bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            m_myInst.callCallback(Py_BuildValue("(iii)", a,b,c));       \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME))                             \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));       \
          else                                                            \
              PCLASS::CBNAME(a,b,c);                                      \
          wxPySaveThread(doSave);                                         \
          else                                                            \
              PCLASS::CBNAME(a,b,c);                                      \
          wxPySaveThread(doSave);                                         \
@@ -492,13 +482,13 @@ public:
                wxDC& dc, const wxRect& rect,
                int row, int col, bool isSelected) {
          bool doSave = wxPyRestoreThread();
                wxDC& dc, const wxRect& rect,
                int row, int col, bool isSelected) {
          bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("Draw")) {
-            m_myInst.callCallback(
+        if (wxPyCBH_findCallback(m_myInst, "Draw")) {
+            wxPyCBH_callCallback(m_myInst,
                  Py_BuildValue("(OOOOiii)",
                  Py_BuildValue("(OOOOiii)",
-                              wxPyConstructObject((void*)&grid, "wxGrid"),
-                              wxPyConstructObject((void*)&attr, "wxGridCellAttr"),
-                              wxPyConstructObject((void*)&dc,   "wxDC"),
-                              wxPyConstructObject((void*)&rect, "wxRect"),
+                              wxPyConstructObject((void*)&grid, "wxGrid", 0),
+                              wxPyConstructObject((void*)&attr, "wxGridCellAttr", 0),
+                              wxPyConstructObject((void*)&dc,   "wxDC", 0),
+                              wxPyConstructObject((void*)&rect, "wxRect", 0),
                                row, col, isSelected));
          }
          wxPySaveThread(doSave);
                                row, col, isSelected));
          }
          wxPySaveThread(doSave);
@@ -508,14 +498,14 @@ public:
                         int row, int col) {
          wxSize rval;
          bool doSave = wxPyRestoreThread();
                         int row, int col) {
          wxSize rval;
          bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("GetBestSize")) {
+        if (wxPyCBH_findCallback(m_myInst, "GetBestSize")) {
              PyObject* ro;
              wxSize*   ptr;
              PyObject* ro;
              wxSize*   ptr;
-            ro = m_myInst.callCallbackObj(
+            ro = wxPyCBH_callCallbackObj(m_myInst,
                  Py_BuildValue("(OOOii)",
                  Py_BuildValue("(OOOii)",
-                              wxPyConstructObject((void*)&grid, "wxGrid"),
-                              wxPyConstructObject((void*)&attr, "wxGridCellAttr"),
-                              wxPyConstructObject((void*)&dc,   "wxDC"),
+                              wxPyConstructObject((void*)&grid, "wxGrid", 0),
+                              wxPyConstructObject((void*)&attr, "wxGridCellAttr", 0),
+                              wxPyConstructObject((void*)&dc,   "wxDC", 0),
                                row, col));
              if (ro) {
                  if (!SWIG_GetPtrObj(ro, (void **)&ptr, "_wxSize_p"))
                                row, col));
              if (ro) {
                  if (!SWIG_GetPtrObj(ro, (void **)&ptr, "_wxSize_p"))
@@ -531,10 +521,10 @@ public:
      wxGridCellRenderer *Clone() const {
          wxGridCellRenderer* rval = NULL;
          bool doSave = wxPyRestoreThread();
      wxGridCellRenderer *Clone() const {
          wxGridCellRenderer* rval = NULL;
          bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("Clone")) {
+        if (wxPyCBH_findCallback(m_myInst, "Clone")) {
              PyObject* ro;
              wxGridCellRenderer* ptr;
              PyObject* ro;
              wxGridCellRenderer* ptr;
-            ro = m_myInst.callCallbackObj(Py_BuildValue("()"));
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));
              if (ro) {
                  if (!SWIG_GetPtrObj(ro, (void **)&ptr, "_wxGridCellRenderer_p"))
                      rval = ptr;
              if (ro) {
                  if (!SWIG_GetPtrObj(ro, (void **)&ptr, "_wxGridCellRenderer_p"))
                      rval = ptr;
@@ -560,12 +550,12 @@ public:
  
      void Create(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler) {
          bool doSave = wxPyRestoreThread();
  
      void Create(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler) {
          bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("Create")) {
-            m_myInst.callCallback(
+        if (wxPyCBH_findCallback(m_myInst, "Create")) {
+            wxPyCBH_callCallback(m_myInst,
                  Py_BuildValue("(OiO)",
                  Py_BuildValue("(OiO)",
-                              wxPyConstructObject((void*)parent, "wxWindow"),
+                              wxPyConstructObject((void*)parent, "wxWindow", 0),
                                id,
                                id,
-                              wxPyConstructObject((void*)evtHandler, "wxEvtHandler")));
+                              wxPyConstructObject((void*)evtHandler, "wxEvtHandler", 0)));
          }
          wxPySaveThread(doSave);
      }
          }
          wxPySaveThread(doSave);
      }
@@ -573,10 +563,10 @@ public:
  
      void BeginEdit(int row, int col, wxGrid* grid) {
          bool doSave = wxPyRestoreThread();
  
      void BeginEdit(int row, int col, wxGrid* grid) {
          bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("BeginEdit")) {
-            m_myInst.callCallback(
+        if (wxPyCBH_findCallback(m_myInst, "BeginEdit")) {
+            wxPyCBH_callCallback(m_myInst,
                  Py_BuildValue("(iiO)", row, col,
                  Py_BuildValue("(iiO)", row, col,
-                              wxPyConstructObject((void*)grid, "wxGrid")));
+                              wxPyConstructObject((void*)grid, "wxGrid", 0)));
          }
          wxPySaveThread(doSave);
      }
          }
          wxPySaveThread(doSave);
      }
@@ -585,10 +575,10 @@ public:
      bool EndEdit(int row, int col, wxGrid* grid) {
          bool rv = FALSE;
          bool doSave = wxPyRestoreThread();
      bool EndEdit(int row, int col, wxGrid* grid) {
          bool rv = FALSE;
          bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("EndEdit")) {
-            rv = m_myInst.callCallback(
+        if (wxPyCBH_findCallback(m_myInst, "EndEdit")) {
+            rv = wxPyCBH_callCallback(m_myInst,
                  Py_BuildValue("(iiO)", row, col,
                  Py_BuildValue("(iiO)", row, col,
-                              wxPyConstructObject((void*)grid, "wxGrid")));
+                              wxPyConstructObject((void*)grid, "wxGrid", 0)));
          }
          wxPySaveThread(doSave);
          return rv;
          }
          wxPySaveThread(doSave);
          return rv;
@@ -598,10 +588,10 @@ public:
      wxGridCellEditor*Clone() const {
          wxGridCellEditor* rval = NULL;
          bool doSave = wxPyRestoreThread();
      wxGridCellEditor*Clone() const {
          wxGridCellEditor* rval = NULL;
          bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("Clone")) {
+        if (wxPyCBH_findCallback(m_myInst, "Clone")) {
              PyObject* ro;
              wxGridCellEditor* ptr;
              PyObject* ro;
              wxGridCellEditor* ptr;
-            ro = m_myInst.callCallbackObj(Py_BuildValue("()"));
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));
              if (ro) {
                  if (!SWIG_GetPtrObj(ro, (void **)&ptr, "_wxGridCellEditor_p"))
                      rval = ptr;
              if (ro) {
                  if (!SWIG_GetPtrObj(ro, (void **)&ptr, "_wxGridCellEditor_p"))
                      rval = ptr;
@@ -615,10 +605,10 @@ public:
  
      void Show(bool show, wxGridCellAttr *attr) {
          bool doSave = wxPyRestoreThread();
  
      void Show(bool show, wxGridCellAttr *attr) {
          bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("Show"))
-            m_myInst.callCallback(
+        if (wxPyCBH_findCallback(m_myInst, "Show"))
+            wxPyCBH_callCallback(m_myInst,
                  Py_BuildValue("(iO)", show,
                  Py_BuildValue("(iO)", show,
-                              wxPyConstructObject((void*)attr, "wxGridCellAttr")));
+                              wxPyConstructObject((void*)attr, "wxGridCellAttr", 0)));
          else
              wxGridCellEditor::Show(show, attr);
          wxPySaveThread(doSave);
          else
              wxGridCellEditor::Show(show, attr);
          wxPySaveThread(doSave);
@@ -630,11 +620,11 @@ public:
  
      void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) {
          bool doSave = wxPyRestoreThread();
  
      void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) {
          bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("PaintBackground"))
-            m_myInst.callCallback(
+        if (wxPyCBH_findCallback(m_myInst, "PaintBackground"))
+            wxPyCBH_callCallback(m_myInst,
                  Py_BuildValue("(OO)",
                  Py_BuildValue("(OO)",
-                              wxPyConstructObject((void*)&rectCell, "wxRect"),
-                              wxPyConstructObject((void*)attr, "wxGridCellAttr")));
+                              wxPyConstructObject((void*)&rectCell, "wxRect", 0),
+                              wxPyConstructObject((void*)attr, "wxGridCellAttr", 0)));
          else
              wxGridCellEditor::PaintBackground(rectCell, attr);
          wxPySaveThread(doSave);
          else
              wxGridCellEditor::PaintBackground(rectCell, attr);
          wxPySaveThread(doSave);
@@ -672,7 +662,7 @@ class wxPyGridCellAttrProvider : public wxGridCellAttrProvider
  public:
      wxPyGridCellAttrProvider() : wxGridCellAttrProvider() {};
  
  public:
      wxPyGridCellAttrProvider() : wxGridCellAttrProvider() {};
  
-    PYCALLBACK_GCA_INTINT(wxGridCellAttrProvider, GetAttr);
+    PYCALLBACK_GCA_INTINTKIND(wxGridCellAttrProvider, GetAttr);
      PYCALLBACK__GCAINTINT(wxGridCellAttrProvider, SetAttr);
      PYCALLBACK__GCAINT(wxGridCellAttrProvider, SetRowAttr);
      PYCALLBACK__GCAINT(wxGridCellAttrProvider, SetColAttr);
      PYCALLBACK__GCAINTINT(wxGridCellAttrProvider, SetAttr);
      PYCALLBACK__GCAINT(wxGridCellAttrProvider, SetRowAttr);
      PYCALLBACK__GCAINT(wxGridCellAttrProvider, SetColAttr);
@@ -703,22 +693,23 @@ public:
      PYCALLBACK__INTSTRING(wxGridTableBase, SetRowLabelValue);
      PYCALLBACK__INTSTRING(wxGridTableBase, SetColLabelValue);
      PYCALLBACK_BOOL_(wxGridTableBase, CanHaveAttributes);
      PYCALLBACK__INTSTRING(wxGridTableBase, SetRowLabelValue);
      PYCALLBACK__INTSTRING(wxGridTableBase, SetColLabelValue);
      PYCALLBACK_BOOL_(wxGridTableBase, CanHaveAttributes);
-    PYCALLBACK_GCA_INTINT(wxGridTableBase, GetAttr);
+    PYCALLBACK_GCA_INTINTKIND(wxGridTableBase, GetAttr);
      PYCALLBACK__GCAINTINT(wxGridTableBase, SetAttr);
      PYCALLBACK__GCAINT(wxGridTableBase, SetRowAttr);
      PYCALLBACK__GCAINT(wxGridTableBase, SetColAttr);
  
  
      PYCALLBACK__GCAINTINT(wxGridTableBase, SetAttr);
      PYCALLBACK__GCAINT(wxGridTableBase, SetRowAttr);
      PYCALLBACK__GCAINT(wxGridTableBase, SetColAttr);
  
  
-
      wxString GetValue(int row, int col) {
          bool doSave = wxPyRestoreThread();
          wxString rval;
      wxString GetValue(int row, int col) {
          bool doSave = wxPyRestoreThread();
          wxString rval;
-        if (m_myInst.findCallback("GetValue")) {
+        if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
              PyObject* ro;
              PyObject* ro;
-            ro = m_myInst.callCallbackObj(Py_BuildValue("(ii)",row,col));
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ii)",row,col));
              if (ro) {
              if (ro) {
-                rval = PyString_AsString(PyObject_Str(ro));
+                PyObject* str = PyObject_Str(ro);
+                rval = PyString_AsString(str);
                  Py_DECREF(ro);
                  Py_DECREF(ro);
+                Py_DECREF(str);
              }
          }
          wxPySaveThread(doSave);
              }
          }
          wxPySaveThread(doSave);
@@ -727,8 +718,8 @@ public:
  
      void SetValue(int row, int col, const wxString& val) {
          bool doSave = wxPyRestoreThread();
  
      void SetValue(int row, int col, const wxString& val) {
          bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("SetValue"))
-            m_myInst.callCallback(Py_BuildValue("(iis)",row,col,val.c_str()));
+        if (wxPyCBH_findCallback(m_myInst, "SetValue"))
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iis)",row,col,val.c_str()));
          wxPySaveThread(doSave);
      }
  
          wxPySaveThread(doSave);
      }
  
@@ -738,10 +729,10 @@ public:
      long GetValueAsLong( int row, int col ) {
          long rval = 0;
          bool doSave = wxPyRestoreThread();
      long GetValueAsLong( int row, int col ) {
          long rval = 0;
          bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("GetValue")) {
+        if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
              PyObject* ro;
              PyObject* num;
              PyObject* ro;
              PyObject* num;
-            ro = m_myInst.callCallbackObj(Py_BuildValue("(ii)", row, col));
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ii)", row, col));
              if (ro && PyNumber_Check(ro)) {
                  num = PyNumber_Int(ro);
                  if (num) {
              if (ro && PyNumber_Check(ro)) {
                  num = PyNumber_Int(ro);
                  if (num) {
@@ -758,10 +749,10 @@ public:
      double GetValueAsDouble( int row, int col ) {
          double rval = 0.0;
          bool doSave = wxPyRestoreThread();
      double GetValueAsDouble( int row, int col ) {
          double rval = 0.0;
          bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("GetValue")) {
+        if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
              PyObject* ro;
              PyObject* num;
              PyObject* ro;
              PyObject* num;
-            ro = m_myInst.callCallbackObj(Py_BuildValue("(ii)", row, col));
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ii)", row, col));
              if (ro && PyNumber_Check(ro)) {
                  num = PyNumber_Float(ro);
                  if (num) {
              if (ro && PyNumber_Check(ro)) {
                  num = PyNumber_Float(ro);
                  if (num) {
@@ -781,16 +772,16 @@ public:
  
      void SetValueAsLong( int row, int col, long value ) {
          bool doSave = wxPyRestoreThread();
  
      void SetValueAsLong( int row, int col, long value ) {
          bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("SetValue")) {
-            m_myInst.callCallback(Py_BuildValue("(iii)", row, col, value));
+        if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", row, col, value));
          }
          wxPySaveThread(doSave);
      }
  
      void SetValueAsDouble( int row, int col, double value ) {
          bool doSave = wxPyRestoreThread();
          }
          wxPySaveThread(doSave);
      }
  
      void SetValueAsDouble( int row, int col, double value ) {
          bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("SetValue")) {
-            m_myInst.callCallback(Py_BuildValue("(iid)", row, col, value));
+        if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iid)", row, col, value));
          }
          wxPySaveThread(doSave);
      }
          }
          wxPySaveThread(doSave);
      }
@@ -880,17 +871,29 @@ static PyObject *_wrap_wxGridCellRenderer_SetParameters(PyObject *self, PyObject
          }
      }
  {
          }
      }
  {
+#if PYTHON_API_VERSION >= 1009
+    char* tmpPtr; int tmpSize;
+    if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1)
+        return NULL;
+    _arg1 = new wxString(tmpPtr, tmpSize);
+#else
      if (!PyString_Check(_obj1)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (!PyString_Check(_obj1)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
-    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
+    _arg1 = new wxString(PyString_AS_STRING(_obj1), PyString_GET_SIZE(_obj1));
+#endif
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          wxGridCellRenderer_SetParameters(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          wxGridCellRenderer_SetParameters(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
@@ -922,6 +925,7 @@ static PyObject *_wrap_wxGridCellRenderer_IncRef(PyObject *self, PyObject *args,
          wxGridCellRenderer_IncRef(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellRenderer_IncRef(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -949,6 +953,7 @@ static PyObject *_wrap_wxGridCellRenderer_DecRef(PyObject *self, PyObject *args,
          wxGridCellRenderer_DecRef(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellRenderer_DecRef(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -1016,6 +1021,7 @@ static PyObject *_wrap_wxGridCellRenderer_Draw(PyObject *self, PyObject *args, P
          wxGridCellRenderer_Draw(_arg0,*_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6,_arg7);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellRenderer_Draw(_arg0,*_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6,_arg7);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -1074,6 +1080,7 @@ static PyObject *_wrap_wxGridCellRenderer_GetBestSize(PyObject *self, PyObject *
          _result = new wxSize (wxGridCellRenderer_GetBestSize(_arg0,*_arg1,*_arg2,*_arg3,_arg4,_arg5));
  
      wxPy_END_ALLOW_THREADS;
          _result = new wxSize (wxGridCellRenderer_GetBestSize(_arg0,*_arg1,*_arg2,*_arg3,_arg4,_arg5));
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
@@ -1103,6 +1110,7 @@ static PyObject *_wrap_wxGridCellRenderer_Clone(PyObject *self, PyObject *args,
          _result = (wxGridCellRenderer *)wxGridCellRenderer_Clone(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxGridCellRenderer *)wxGridCellRenderer_Clone(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellRenderer_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellRenderer_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -1136,6 +1144,7 @@ static PyObject *_wrap_new_wxPyGridCellRenderer(PyObject *self, PyObject *args,
          _result = (wxPyGridCellRenderer *)new_wxPyGridCellRenderer();
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxPyGridCellRenderer *)new_wxPyGridCellRenderer();
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyGridCellRenderer_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyGridCellRenderer_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -1178,6 +1187,7 @@ static PyObject *_wrap_wxPyGridCellRenderer__setSelf(PyObject *self, PyObject *a
          wxPyGridCellRenderer__setSelf(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxPyGridCellRenderer__setSelf(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -1203,17 +1213,29 @@ static PyObject *_wrap_wxPyGridCellRenderer_base_SetParameters(PyObject *self, P
          }
      }
  {
          }
      }
  {
+#if PYTHON_API_VERSION >= 1009
+    char* tmpPtr; int tmpSize;
+    if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1)
+        return NULL;
+    _arg1 = new wxString(tmpPtr, tmpSize);
+#else
      if (!PyString_Check(_obj1)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (!PyString_Check(_obj1)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
-    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
+    _arg1 = new wxString(PyString_AS_STRING(_obj1), PyString_GET_SIZE(_obj1));
+#endif
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          wxPyGridCellRenderer_base_SetParameters(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          wxPyGridCellRenderer_base_SetParameters(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
@@ -1246,6 +1268,7 @@ static PyObject *_wrap_new_wxGridCellStringRenderer(PyObject *self, PyObject *ar
          _result = (wxGridCellStringRenderer *)new_wxGridCellStringRenderer();
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxGridCellStringRenderer *)new_wxGridCellStringRenderer();
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellStringRenderer_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellStringRenderer_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -1287,6 +1310,7 @@ static PyObject *_wrap_new_wxGridCellNumberRenderer(PyObject *self, PyObject *ar
          _result = (wxGridCellNumberRenderer *)new_wxGridCellNumberRenderer();
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxGridCellNumberRenderer *)new_wxGridCellNumberRenderer();
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellNumberRenderer_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellNumberRenderer_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -1330,6 +1354,7 @@ static PyObject *_wrap_new_wxGridCellFloatRenderer(PyObject *self, PyObject *arg
          _result = (wxGridCellFloatRenderer *)new_wxGridCellFloatRenderer(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxGridCellFloatRenderer *)new_wxGridCellFloatRenderer(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellFloatRenderer_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellFloatRenderer_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -1363,6 +1388,7 @@ static PyObject *_wrap_wxGridCellFloatRenderer_GetWidth(PyObject *self, PyObject
          _result = (int )wxGridCellFloatRenderer_GetWidth(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (int )wxGridCellFloatRenderer_GetWidth(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -1390,6 +1416,7 @@ static PyObject *_wrap_wxGridCellFloatRenderer_SetWidth(PyObject *self, PyObject
          wxGridCellFloatRenderer_SetWidth(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellFloatRenderer_SetWidth(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -1418,6 +1445,7 @@ static PyObject *_wrap_wxGridCellFloatRenderer_GetPrecision(PyObject *self, PyOb
          _result = (int )wxGridCellFloatRenderer_GetPrecision(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (int )wxGridCellFloatRenderer_GetPrecision(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -1445,6 +1473,7 @@ static PyObject *_wrap_wxGridCellFloatRenderer_SetPrecision(PyObject *self, PyOb
          wxGridCellFloatRenderer_SetPrecision(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellFloatRenderer_SetPrecision(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -1473,6 +1502,7 @@ static PyObject *_wrap_new_wxGridCellBoolRenderer(PyObject *self, PyObject *args
          _result = (wxGridCellBoolRenderer *)new_wxGridCellBoolRenderer();
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxGridCellBoolRenderer *)new_wxGridCellBoolRenderer();
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellBoolRenderer_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellBoolRenderer_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -1506,6 +1536,7 @@ static PyObject *_wrap_wxGridCellEditor_IsCreated(PyObject *self, PyObject *args
          _result = (bool )wxGridCellEditor_IsCreated(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGridCellEditor_IsCreated(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -1517,7 +1548,6 @@ static PyObject *_wrap_wxGridCellEditor_GetControl(PyObject *self, PyObject *arg
      wxGridCellEditor * _arg0;
      PyObject * _argo0 = 0;
      char *_kwnames[] = { "self", NULL };
      wxGridCellEditor * _arg0;
      PyObject * _argo0 = 0;
      char *_kwnames[] = { "self", NULL };
-    char _ptemp[128];
  
      self = self;
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridCellEditor_GetControl",_kwnames,&_argo0)) 
  
      self = self;
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridCellEditor_GetControl",_kwnames,&_argo0)) 
@@ -1534,13 +1564,8 @@ static PyObject *_wrap_wxGridCellEditor_GetControl(PyObject *self, PyObject *arg
          _result = (wxControl *)wxGridCellEditor_GetControl(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxControl *)wxGridCellEditor_GetControl(_arg0);
  
      wxPy_END_ALLOW_THREADS;
-}    if (_result) {
-        SWIG_MakePtr(_ptemp, (char *) _result,"_wxControl_p");
-        _resultobj = Py_BuildValue("s",_ptemp);
-    } else {
-        Py_INCREF(Py_None);
-        _resultobj = Py_None;
-    }
+    if (PyErr_Occurred()) return NULL;
+}{ _resultobj = wxPyMake_wxObject(_result); }
      return _resultobj;
  }
  
      return _resultobj;
  }
  
@@ -1575,6 +1600,7 @@ static PyObject *_wrap_wxGridCellEditor_SetControl(PyObject *self, PyObject *arg
          wxGridCellEditor_SetControl(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellEditor_SetControl(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -1600,17 +1626,29 @@ static PyObject *_wrap_wxGridCellEditor_SetParameters(PyObject *self, PyObject *
          }
      }
  {
          }
      }
  {
+#if PYTHON_API_VERSION >= 1009
+    char* tmpPtr; int tmpSize;
+    if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1)
+        return NULL;
+    _arg1 = new wxString(tmpPtr, tmpSize);
+#else
      if (!PyString_Check(_obj1)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (!PyString_Check(_obj1)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
-    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
+    _arg1 = new wxString(PyString_AS_STRING(_obj1), PyString_GET_SIZE(_obj1));
+#endif
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          wxGridCellEditor_SetParameters(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          wxGridCellEditor_SetParameters(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
@@ -1642,6 +1680,7 @@ static PyObject *_wrap_wxGridCellEditor_IncRef(PyObject *self, PyObject *args, P
          wxGridCellEditor_IncRef(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellEditor_IncRef(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -1669,6 +1708,7 @@ static PyObject *_wrap_wxGridCellEditor_DecRef(PyObject *self, PyObject *args, P
          wxGridCellEditor_DecRef(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellEditor_DecRef(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -1715,6 +1755,7 @@ static PyObject *_wrap_wxGridCellEditor_Create(PyObject *self, PyObject *args, P
          wxGridCellEditor_Create(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellEditor_Create(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -1753,6 +1794,7 @@ static PyObject *_wrap_wxGridCellEditor_BeginEdit(PyObject *self, PyObject *args
          wxGridCellEditor_BeginEdit(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellEditor_BeginEdit(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -1792,6 +1834,7 @@ static PyObject *_wrap_wxGridCellEditor_EndEdit(PyObject *self, PyObject *args,
          _result = (bool )wxGridCellEditor_EndEdit(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGridCellEditor_EndEdit(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -1818,6 +1861,7 @@ static PyObject *_wrap_wxGridCellEditor_Reset(PyObject *self, PyObject *args, Py
          wxGridCellEditor_Reset(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellEditor_Reset(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -1847,6 +1891,7 @@ static PyObject *_wrap_wxGridCellEditor_Clone(PyObject *self, PyObject *args, Py
          _result = (wxGridCellEditor *)wxGridCellEditor_Clone(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxGridCellEditor *)wxGridCellEditor_Clone(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellEditor_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellEditor_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -1887,6 +1932,7 @@ static PyObject *_wrap_wxGridCellEditor_SetSize(PyObject *self, PyObject *args,
          wxGridCellEditor_SetSize(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellEditor_SetSize(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -1926,6 +1972,7 @@ static PyObject *_wrap_wxGridCellEditor_Show(PyObject *self, PyObject *args, PyO
          wxGridCellEditor_Show(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellEditor_Show(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -1970,6 +2017,7 @@ static PyObject *_wrap_wxGridCellEditor_PaintBackground(PyObject *self, PyObject
          wxGridCellEditor_PaintBackground(_arg0,*_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellEditor_PaintBackground(_arg0,*_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -2007,6 +2055,7 @@ static PyObject *_wrap_wxGridCellEditor_IsAcceptedKey(PyObject *self, PyObject *
          _result = (bool )wxGridCellEditor_IsAcceptedKey(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGridCellEditor_IsAcceptedKey(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -2042,6 +2091,7 @@ static PyObject *_wrap_wxGridCellEditor_StartingKey(PyObject *self, PyObject *ar
          wxGridCellEditor_StartingKey(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellEditor_StartingKey(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -2069,6 +2119,7 @@ static PyObject *_wrap_wxGridCellEditor_StartingClick(PyObject *self, PyObject *
          wxGridCellEditor_StartingClick(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellEditor_StartingClick(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -2105,6 +2156,7 @@ static PyObject *_wrap_wxGridCellEditor_HandleReturn(PyObject *self, PyObject *a
          wxGridCellEditor_HandleReturn(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellEditor_HandleReturn(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -2132,6 +2184,7 @@ static PyObject *_wrap_wxGridCellEditor_Destroy(PyObject *self, PyObject *args,
          wxGridCellEditor_Destroy(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellEditor_Destroy(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -2160,6 +2213,7 @@ static PyObject *_wrap_new_wxPyGridCellEditor(PyObject *self, PyObject *args, Py
          _result = (wxPyGridCellEditor *)new_wxPyGridCellEditor();
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxPyGridCellEditor *)new_wxPyGridCellEditor();
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyGridCellEditor_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyGridCellEditor_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -2202,6 +2256,7 @@ static PyObject *_wrap_wxPyGridCellEditor__setSelf(PyObject *self, PyObject *arg
          wxPyGridCellEditor__setSelf(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxPyGridCellEditor__setSelf(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -2237,6 +2292,7 @@ static PyObject *_wrap_wxPyGridCellEditor_base_SetSize(PyObject *self, PyObject
          wxPyGridCellEditor_base_SetSize(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxPyGridCellEditor_base_SetSize(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -2276,6 +2332,7 @@ static PyObject *_wrap_wxPyGridCellEditor_base_Show(PyObject *self, PyObject *ar
          wxPyGridCellEditor_base_Show(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxPyGridCellEditor_base_Show(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -2320,6 +2377,44 @@ static PyObject *_wrap_wxPyGridCellEditor_base_PaintBackground(PyObject *self, P
          wxPyGridCellEditor_base_PaintBackground(_arg0,*_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxPyGridCellEditor_base_PaintBackground(_arg0,*_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxPyGridCellEditor_base_IsAcceptedKey(_swigobj,_swigarg0)  (_swigobj->base_IsAcceptedKey(_swigarg0))
+static PyObject *_wrap_wxPyGridCellEditor_base_IsAcceptedKey(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxPyGridCellEditor * _arg0;
+    wxKeyEvent * _arg1;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","event", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyGridCellEditor_base_IsAcceptedKey",_kwnames,&_argo0,&_argo1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyGridCellEditor_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyGridCellEditor_base_IsAcceptedKey. Expected _wxPyGridCellEditor_p.");
+        return NULL;
+        }
+    }
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxKeyEvent_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyGridCellEditor_base_IsAcceptedKey. Expected _wxKeyEvent_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxPyGridCellEditor_base_IsAcceptedKey(_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -2356,6 +2451,7 @@ static PyObject *_wrap_wxPyGridCellEditor_base_StartingKey(PyObject *self, PyObj
          wxPyGridCellEditor_base_StartingKey(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxPyGridCellEditor_base_StartingKey(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -2383,6 +2479,7 @@ static PyObject *_wrap_wxPyGridCellEditor_base_StartingClick(PyObject *self, PyO
          wxPyGridCellEditor_base_StartingClick(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          wxPyGridCellEditor_base_StartingClick(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -2419,6 +2516,7 @@ static PyObject *_wrap_wxPyGridCellEditor_base_HandleReturn(PyObject *self, PyOb
          wxPyGridCellEditor_base_HandleReturn(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxPyGridCellEditor_base_HandleReturn(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -2446,6 +2544,7 @@ static PyObject *_wrap_wxPyGridCellEditor_base_Destroy(PyObject *self, PyObject
          wxPyGridCellEditor_base_Destroy(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          wxPyGridCellEditor_base_Destroy(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -2471,17 +2570,29 @@ static PyObject *_wrap_wxPyGridCellEditor_base_SetParameters(PyObject *self, PyO
          }
      }
  {
          }
      }
  {
+#if PYTHON_API_VERSION >= 1009
+    char* tmpPtr; int tmpSize;
+    if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1)
+        return NULL;
+    _arg1 = new wxString(tmpPtr, tmpSize);
+#else
      if (!PyString_Check(_obj1)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (!PyString_Check(_obj1)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
-    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
+    _arg1 = new wxString(PyString_AS_STRING(_obj1), PyString_GET_SIZE(_obj1));
+#endif
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          wxPyGridCellEditor_base_SetParameters(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          wxPyGridCellEditor_base_SetParameters(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
@@ -2514,6 +2625,7 @@ static PyObject *_wrap_new_wxGridCellTextEditor(PyObject *self, PyObject *args,
          _result = (wxGridCellTextEditor *)new_wxGridCellTextEditor();
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxGridCellTextEditor *)new_wxGridCellTextEditor();
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellTextEditor_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellTextEditor_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -2557,6 +2669,7 @@ static PyObject *_wrap_new_wxGridCellNumberEditor(PyObject *self, PyObject *args
          _result = (wxGridCellNumberEditor *)new_wxGridCellNumberEditor(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxGridCellNumberEditor *)new_wxGridCellNumberEditor(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellNumberEditor_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellNumberEditor_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -2598,6 +2711,7 @@ static PyObject *_wrap_new_wxGridCellFloatEditor(PyObject *self, PyObject *args,
          _result = (wxGridCellFloatEditor *)new_wxGridCellFloatEditor();
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxGridCellFloatEditor *)new_wxGridCellFloatEditor();
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellFloatEditor_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellFloatEditor_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -2631,6 +2745,7 @@ static PyObject *_wrap_new_wxGridCellBoolEditor(PyObject *self, PyObject *args,
          _result = (wxGridCellBoolEditor *)new_wxGridCellBoolEditor();
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxGridCellBoolEditor *)new_wxGridCellBoolEditor();
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellBoolEditor_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellBoolEditor_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -2685,6 +2800,7 @@ static PyObject *_wrap_new_wxGridCellChoiceEditor(PyObject *self, PyObject *args
          _result = (wxGridCellChoiceEditor *)new_wxGridCellChoiceEditor(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxGridCellChoiceEditor *)new_wxGridCellChoiceEditor(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellChoiceEditor_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellChoiceEditor_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -2713,6 +2829,7 @@ static PyObject *_wrap_new_wxGridCellAttr(PyObject *self, PyObject *args, PyObje
          _result = (wxGridCellAttr *)new_wxGridCellAttr();
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxGridCellAttr *)new_wxGridCellAttr();
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAttr_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAttr_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -2747,6 +2864,7 @@ static PyObject *_wrap_wxGridCellAttr_Clone(PyObject *self, PyObject *args, PyOb
          _result = (wxGridCellAttr *)wxGridCellAttr_Clone(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxGridCellAttr *)wxGridCellAttr_Clone(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAttr_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAttr_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -2757,6 +2875,43 @@ static PyObject *_wrap_wxGridCellAttr_Clone(PyObject *self, PyObject *args, PyOb
      return _resultobj;
  }
  
      return _resultobj;
  }
  
+#define wxGridCellAttr_MergeWith(_swigobj,_swigarg0)  (_swigobj->MergeWith(_swigarg0))
+static PyObject *_wrap_wxGridCellAttr_MergeWith(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxGridCellAttr * _arg0;
+    wxGridCellAttr * _arg1;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","mergefrom", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxGridCellAttr_MergeWith",_kwnames,&_argo0,&_argo1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridCellAttr_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCellAttr_MergeWith. Expected _wxGridCellAttr_p.");
+        return NULL;
+        }
+    }
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxGridCellAttr_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGridCellAttr_MergeWith. Expected _wxGridCellAttr_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxGridCellAttr_MergeWith(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
  #define wxGridCellAttr_IncRef(_swigobj)  (_swigobj->IncRef())
  static PyObject *_wrap_wxGridCellAttr_IncRef(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
  #define wxGridCellAttr_IncRef(_swigobj)  (_swigobj->IncRef())
  static PyObject *_wrap_wxGridCellAttr_IncRef(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
@@ -2779,6 +2934,7 @@ static PyObject *_wrap_wxGridCellAttr_IncRef(PyObject *self, PyObject *args, PyO
          wxGridCellAttr_IncRef(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellAttr_IncRef(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -2806,6 +2962,7 @@ static PyObject *_wrap_wxGridCellAttr_DecRef(PyObject *self, PyObject *args, PyO
          wxGridCellAttr_DecRef(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellAttr_DecRef(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -2841,6 +2998,7 @@ static PyObject *_wrap_wxGridCellAttr_SetTextColour(PyObject *self, PyObject *ar
          wxGridCellAttr_SetTextColour(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellAttr_SetTextColour(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -2876,6 +3034,7 @@ static PyObject *_wrap_wxGridCellAttr_SetBackgroundColour(PyObject *self, PyObje
          wxGridCellAttr_SetBackgroundColour(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellAttr_SetBackgroundColour(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -2912,6 +3071,7 @@ static PyObject *_wrap_wxGridCellAttr_SetFont(PyObject *self, PyObject *args, Py
          wxGridCellAttr_SetFont(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellAttr_SetFont(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -2941,6 +3101,7 @@ static PyObject *_wrap_wxGridCellAttr_SetAlignment(PyObject *self, PyObject *arg
          wxGridCellAttr_SetAlignment(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellAttr_SetAlignment(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -2971,6 +3132,7 @@ static PyObject *_wrap_wxGridCellAttr_SetReadOnly(PyObject *self, PyObject *args
          wxGridCellAttr_SetReadOnly(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellAttr_SetReadOnly(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -3007,6 +3169,7 @@ static PyObject *_wrap_wxGridCellAttr_SetRenderer(PyObject *self, PyObject *args
          wxGridCellAttr_SetRenderer(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellAttr_SetRenderer(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -3043,6 +3206,36 @@ static PyObject *_wrap_wxGridCellAttr_SetEditor(PyObject *self, PyObject *args,
          wxGridCellAttr_SetEditor(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellAttr_SetEditor(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxGridCellAttr_SetKind(_swigobj,_swigarg0)  (_swigobj->SetKind(_swigarg0))
+static PyObject *_wrap_wxGridCellAttr_SetKind(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxGridCellAttr * _arg0;
+    wxGridCellAttr::wxAttrKind  _arg1;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","kind", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGridCellAttr_SetKind",_kwnames,&_argo0,&_arg1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridCellAttr_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCellAttr_SetKind. Expected _wxGridCellAttr_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxGridCellAttr_SetKind(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -3071,6 +3264,7 @@ static PyObject *_wrap_wxGridCellAttr_HasTextColour(PyObject *self, PyObject *ar
          _result = (bool )wxGridCellAttr_HasTextColour(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGridCellAttr_HasTextColour(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -3098,6 +3292,7 @@ static PyObject *_wrap_wxGridCellAttr_HasBackgroundColour(PyObject *self, PyObje
          _result = (bool )wxGridCellAttr_HasBackgroundColour(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGridCellAttr_HasBackgroundColour(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -3125,6 +3320,7 @@ static PyObject *_wrap_wxGridCellAttr_HasFont(PyObject *self, PyObject *args, Py
          _result = (bool )wxGridCellAttr_HasFont(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGridCellAttr_HasFont(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -3152,6 +3348,7 @@ static PyObject *_wrap_wxGridCellAttr_HasAlignment(PyObject *self, PyObject *arg
          _result = (bool )wxGridCellAttr_HasAlignment(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGridCellAttr_HasAlignment(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -3179,6 +3376,7 @@ static PyObject *_wrap_wxGridCellAttr_HasRenderer(PyObject *self, PyObject *args
          _result = (bool )wxGridCellAttr_HasRenderer(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGridCellAttr_HasRenderer(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -3206,6 +3404,35 @@ static PyObject *_wrap_wxGridCellAttr_HasEditor(PyObject *self, PyObject *args,
          _result = (bool )wxGridCellAttr_HasEditor(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGridCellAttr_HasEditor(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxGridCellAttr_HasReadWriteMode(_swigobj)  (_swigobj->HasReadWriteMode())
+static PyObject *_wrap_wxGridCellAttr_HasReadWriteMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxGridCellAttr * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridCellAttr_HasReadWriteMode",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridCellAttr_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCellAttr_HasReadWriteMode. Expected _wxGridCellAttr_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxGridCellAttr_HasReadWriteMode(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -3235,6 +3462,7 @@ static PyObject *_wrap_wxGridCellAttr_GetTextColour(PyObject *self, PyObject *ar
      _result = (wxColour *) &_result_ref;
  
      wxPy_END_ALLOW_THREADS;
      _result = (wxColour *) &_result_ref;
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          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);
@@ -3270,6 +3498,7 @@ static PyObject *_wrap_wxGridCellAttr_GetBackgroundColour(PyObject *self, PyObje
      _result = (wxColour *) &_result_ref;
  
      wxPy_END_ALLOW_THREADS;
      _result = (wxColour *) &_result_ref;
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          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);
@@ -3305,6 +3534,7 @@ static PyObject *_wrap_wxGridCellAttr_GetFont(PyObject *self, PyObject *args, Py
      _result = (wxFont *) &_result_ref;
  
      wxPy_END_ALLOW_THREADS;
      _result = (wxFont *) &_result_ref;
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          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);
@@ -3347,6 +3577,7 @@ static PyObject *_wrap_wxGridCellAttr_GetAlignment(PyObject *self, PyObject *arg
          wxGridCellAttr_GetAlignment(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellAttr_GetAlignment(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
@@ -3397,6 +3628,7 @@ static PyObject *_wrap_wxGridCellAttr_GetRenderer(PyObject *self, PyObject *args
          _result = (wxGridCellRenderer *)wxGridCellAttr_GetRenderer(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxGridCellRenderer *)wxGridCellAttr_GetRenderer(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellRenderer_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellRenderer_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -3442,6 +3674,7 @@ static PyObject *_wrap_wxGridCellAttr_GetEditor(PyObject *self, PyObject *args,
          _result = (wxGridCellEditor *)wxGridCellAttr_GetEditor(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxGridCellEditor *)wxGridCellAttr_GetEditor(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellEditor_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellEditor_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -3475,6 +3708,7 @@ static PyObject *_wrap_wxGridCellAttr_IsReadOnly(PyObject *self, PyObject *args,
          _result = (bool )wxGridCellAttr_IsReadOnly(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGridCellAttr_IsReadOnly(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -3510,6 +3744,7 @@ static PyObject *_wrap_wxGridCellAttr_SetDefAttr(PyObject *self, PyObject *args,
          wxGridCellAttr_SetDefAttr(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellAttr_SetDefAttr(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -3530,6 +3765,7 @@ static PyObject *_wrap_new_wxGridCellAttrProvider(PyObject *self, PyObject *args
          _result = (wxGridCellAttrProvider *)new_wxGridCellAttrProvider();
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxGridCellAttrProvider *)new_wxGridCellAttrProvider();
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAttrProvider_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAttrProvider_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -3540,19 +3776,20 @@ static PyObject *_wrap_new_wxGridCellAttrProvider(PyObject *self, PyObject *args
      return _resultobj;
  }
  
      return _resultobj;
  }
  
-#define wxGridCellAttrProvider_GetAttr(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetAttr(_swigarg0,_swigarg1))
+#define wxGridCellAttrProvider_GetAttr(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->GetAttr(_swigarg0,_swigarg1,_swigarg2))
  static PyObject *_wrap_wxGridCellAttrProvider_GetAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
      wxGridCellAttr * _result;
      wxGridCellAttrProvider * _arg0;
      int  _arg1;
      int  _arg2;
  static PyObject *_wrap_wxGridCellAttrProvider_GetAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
      wxGridCellAttr * _result;
      wxGridCellAttrProvider * _arg0;
      int  _arg1;
      int  _arg2;
+    wxGridCellAttr::wxAttrKind  _arg3;
      PyObject * _argo0 = 0;
      PyObject * _argo0 = 0;
-    char *_kwnames[] = { "self","row","col", NULL };
+    char *_kwnames[] = { "self","row","col","kind", NULL };
      char _ptemp[128];
  
      self = self;
      char _ptemp[128];
  
      self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxGridCellAttrProvider_GetAttr",_kwnames,&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiii:wxGridCellAttrProvider_GetAttr",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3)) 
          return NULL;
      if (_argo0) {
          if (_argo0 == Py_None) { _arg0 = NULL; }
          return NULL;
      if (_argo0) {
          if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3563,9 +3800,10 @@ static PyObject *_wrap_wxGridCellAttrProvider_GetAttr(PyObject *self, PyObject *
      }
  {
      wxPy_BEGIN_ALLOW_THREADS;
      }
  {
      wxPy_BEGIN_ALLOW_THREADS;
-        _result = (wxGridCellAttr *)wxGridCellAttrProvider_GetAttr(_arg0,_arg1,_arg2);
+        _result = (wxGridCellAttr *)wxGridCellAttrProvider_GetAttr(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAttr_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAttr_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -3609,6 +3847,7 @@ static PyObject *_wrap_wxGridCellAttrProvider_SetAttr(PyObject *self, PyObject *
          wxGridCellAttrProvider_SetAttr(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellAttrProvider_SetAttr(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -3646,6 +3885,7 @@ static PyObject *_wrap_wxGridCellAttrProvider_SetRowAttr(PyObject *self, PyObjec
          wxGridCellAttrProvider_SetRowAttr(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellAttrProvider_SetRowAttr(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -3683,6 +3923,7 @@ static PyObject *_wrap_wxGridCellAttrProvider_SetColAttr(PyObject *self, PyObjec
          wxGridCellAttrProvider_SetColAttr(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellAttrProvider_SetColAttr(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -3712,6 +3953,7 @@ static PyObject *_wrap_wxGridCellAttrProvider_UpdateAttrRows(PyObject *self, PyO
          wxGridCellAttrProvider_UpdateAttrRows(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellAttrProvider_UpdateAttrRows(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -3741,6 +3983,7 @@ static PyObject *_wrap_wxGridCellAttrProvider_UpdateAttrCols(PyObject *self, PyO
          wxGridCellAttrProvider_UpdateAttrCols(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellAttrProvider_UpdateAttrCols(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -3769,6 +4012,7 @@ static PyObject *_wrap_new_wxPyGridCellAttrProvider(PyObject *self, PyObject *ar
          _result = (wxPyGridCellAttrProvider *)new_wxPyGridCellAttrProvider();
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxPyGridCellAttrProvider *)new_wxPyGridCellAttrProvider();
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyGridCellAttrProvider_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyGridCellAttrProvider_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -3811,24 +4055,26 @@ static PyObject *_wrap_wxPyGridCellAttrProvider__setSelf(PyObject *self, PyObjec
          wxPyGridCellAttrProvider__setSelf(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxPyGridCellAttrProvider__setSelf(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }
  
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }
  
-#define wxPyGridCellAttrProvider_base_GetAttr(_swigobj,_swigarg0,_swigarg1)  (_swigobj->base_GetAttr(_swigarg0,_swigarg1))
+#define wxPyGridCellAttrProvider_base_GetAttr(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->base_GetAttr(_swigarg0,_swigarg1,_swigarg2))
  static PyObject *_wrap_wxPyGridCellAttrProvider_base_GetAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
      wxGridCellAttr * _result;
      wxPyGridCellAttrProvider * _arg0;
      int  _arg1;
      int  _arg2;
  static PyObject *_wrap_wxPyGridCellAttrProvider_base_GetAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
      wxGridCellAttr * _result;
      wxPyGridCellAttrProvider * _arg0;
      int  _arg1;
      int  _arg2;
+    wxGridCellAttr::wxAttrKind  _arg3;
      PyObject * _argo0 = 0;
      PyObject * _argo0 = 0;
-    char *_kwnames[] = { "self","row","col", NULL };
+    char *_kwnames[] = { "self","row","col","kind", NULL };
      char _ptemp[128];
  
      self = self;
      char _ptemp[128];
  
      self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxPyGridCellAttrProvider_base_GetAttr",_kwnames,&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiii:wxPyGridCellAttrProvider_base_GetAttr",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3)) 
          return NULL;
      if (_argo0) {
          if (_argo0 == Py_None) { _arg0 = NULL; }
          return NULL;
      if (_argo0) {
          if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3839,9 +4085,10 @@ static PyObject *_wrap_wxPyGridCellAttrProvider_base_GetAttr(PyObject *self, PyO
      }
  {
      wxPy_BEGIN_ALLOW_THREADS;
      }
  {
      wxPy_BEGIN_ALLOW_THREADS;
-        _result = (wxGridCellAttr *)wxPyGridCellAttrProvider_base_GetAttr(_arg0,_arg1,_arg2);
+        _result = (wxGridCellAttr *)wxPyGridCellAttrProvider_base_GetAttr(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAttr_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAttr_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -3885,6 +4132,7 @@ static PyObject *_wrap_wxPyGridCellAttrProvider_base_SetAttr(PyObject *self, PyO
          wxPyGridCellAttrProvider_base_SetAttr(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
          wxPyGridCellAttrProvider_base_SetAttr(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -3922,6 +4170,7 @@ static PyObject *_wrap_wxPyGridCellAttrProvider_base_SetRowAttr(PyObject *self,
          wxPyGridCellAttrProvider_base_SetRowAttr(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxPyGridCellAttrProvider_base_SetRowAttr(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -3959,11 +4208,20 @@ static PyObject *_wrap_wxPyGridCellAttrProvider_base_SetColAttr(PyObject *self,
          wxPyGridCellAttrProvider_base_SetColAttr(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxPyGridCellAttrProvider_base_SetColAttr(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }
  
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }
  
+static void *SwigwxGridTableBaseTowxObject(void *ptr) {
+    wxGridTableBase *src;
+    wxObject *dest;
+    src = (wxGridTableBase *) ptr;
+    dest = (wxObject *) src;
+    return (void *) dest;
+}
+
  #define wxGridTableBase_SetAttrProvider(_swigobj,_swigarg0)  (_swigobj->SetAttrProvider(_swigarg0))
  static PyObject *_wrap_wxGridTableBase_SetAttrProvider(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
  #define wxGridTableBase_SetAttrProvider(_swigobj,_swigarg0)  (_swigobj->SetAttrProvider(_swigarg0))
  static PyObject *_wrap_wxGridTableBase_SetAttrProvider(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
@@ -3995,6 +4253,7 @@ static PyObject *_wrap_wxGridTableBase_SetAttrProvider(PyObject *self, PyObject
          wxGridTableBase_SetAttrProvider(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGridTableBase_SetAttrProvider(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -4024,6 +4283,7 @@ static PyObject *_wrap_wxGridTableBase_GetAttrProvider(PyObject *self, PyObject
          _result = (wxGridCellAttrProvider *)wxGridTableBase_GetAttrProvider(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxGridCellAttrProvider *)wxGridTableBase_GetAttrProvider(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAttrProvider_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAttrProvider_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -4065,6 +4325,7 @@ static PyObject *_wrap_wxGridTableBase_SetView(PyObject *self, PyObject *args, P
          wxGridTableBase_SetView(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGridTableBase_SetView(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -4077,7 +4338,6 @@ static PyObject *_wrap_wxGridTableBase_GetView(PyObject *self, PyObject *args, P
      wxGridTableBase * _arg0;
      PyObject * _argo0 = 0;
      char *_kwnames[] = { "self", NULL };
      wxGridTableBase * _arg0;
      PyObject * _argo0 = 0;
      char *_kwnames[] = { "self", NULL };
-    char _ptemp[128];
  
      self = self;
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridTableBase_GetView",_kwnames,&_argo0)) 
  
      self = self;
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridTableBase_GetView",_kwnames,&_argo0)) 
@@ -4094,13 +4354,8 @@ static PyObject *_wrap_wxGridTableBase_GetView(PyObject *self, PyObject *args, P
          _result = (wxGrid *)wxGridTableBase_GetView(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxGrid *)wxGridTableBase_GetView(_arg0);
  
      wxPy_END_ALLOW_THREADS;
-}    if (_result) {
-        SWIG_MakePtr(_ptemp, (char *) _result,"_wxGrid_p");
-        _resultobj = Py_BuildValue("s",_ptemp);
-    } else {
-        Py_INCREF(Py_None);
-        _resultobj = Py_None;
-    }
+    if (PyErr_Occurred()) return NULL;
+}{ _resultobj = wxPyMake_wxObject(_result); }
      return _resultobj;
  }
  
      return _resultobj;
  }
  
@@ -4127,6 +4382,7 @@ static PyObject *_wrap_wxGridTableBase_GetNumberRows(PyObject *self, PyObject *a
          _result = (int )wxGridTableBase_GetNumberRows(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (int )wxGridTableBase_GetNumberRows(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -4154,6 +4410,7 @@ static PyObject *_wrap_wxGridTableBase_GetNumberCols(PyObject *self, PyObject *a
          _result = (int )wxGridTableBase_GetNumberCols(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (int )wxGridTableBase_GetNumberCols(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -4183,6 +4440,7 @@ static PyObject *_wrap_wxGridTableBase_IsEmptyCell(PyObject *self, PyObject *arg
          _result = (bool )wxGridTableBase_IsEmptyCell(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGridTableBase_IsEmptyCell(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -4212,6 +4470,7 @@ static PyObject *_wrap_wxGridTableBase_GetValue(PyObject *self, PyObject *args,
          _result = new wxString (wxGridTableBase_GetValue(_arg0,_arg1,_arg2));
  
      wxPy_END_ALLOW_THREADS;
          _result = new wxString (wxGridTableBase_GetValue(_arg0,_arg1,_arg2));
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
  }
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
  }
@@ -4243,17 +4502,29 @@ static PyObject *_wrap_wxGridTableBase_SetValue(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
+#if PYTHON_API_VERSION >= 1009
+    char* tmpPtr; int tmpSize;
+    if (!PyString_Check(_obj3) && !PyUnicode_Check(_obj3)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    if (PyString_AsStringAndSize(_obj3, &tmpPtr, &tmpSize) == -1)
+        return NULL;
+    _arg3 = new wxString(tmpPtr, tmpSize);
+#else
      if (!PyString_Check(_obj3)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (!PyString_Check(_obj3)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
-    _arg3 = new wxString(PyString_AsString(_obj3), PyString_Size(_obj3));
+    _arg3 = new wxString(PyString_AS_STRING(_obj3), PyString_GET_SIZE(_obj3));
+#endif
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          wxGridTableBase_SetValue(_arg0,_arg1,_arg2,*_arg3);
  
      wxPy_END_ALLOW_THREADS;
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          wxGridTableBase_SetValue(_arg0,_arg1,_arg2,*_arg3);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
@@ -4288,6 +4559,7 @@ static PyObject *_wrap_wxGridTableBase_GetTypeName(PyObject *self, PyObject *arg
          _result = new wxString (wxGridTableBase_GetTypeName(_arg0,_arg1,_arg2));
  
      wxPy_END_ALLOW_THREADS;
          _result = new wxString (wxGridTableBase_GetTypeName(_arg0,_arg1,_arg2));
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
  }
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
  }
@@ -4320,17 +4592,29 @@ static PyObject *_wrap_wxGridTableBase_CanGetValueAs(PyObject *self, PyObject *a
          }
      }
  {
          }
      }
  {
+#if PYTHON_API_VERSION >= 1009
+    char* tmpPtr; int tmpSize;
+    if (!PyString_Check(_obj3) && !PyUnicode_Check(_obj3)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    if (PyString_AsStringAndSize(_obj3, &tmpPtr, &tmpSize) == -1)
+        return NULL;
+    _arg3 = new wxString(tmpPtr, tmpSize);
+#else
      if (!PyString_Check(_obj3)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (!PyString_Check(_obj3)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
-    _arg3 = new wxString(PyString_AsString(_obj3), PyString_Size(_obj3));
+    _arg3 = new wxString(PyString_AS_STRING(_obj3), PyString_GET_SIZE(_obj3));
+#endif
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          _result = (bool )wxGridTableBase_CanGetValueAs(_arg0,_arg1,_arg2,*_arg3);
  
      wxPy_END_ALLOW_THREADS;
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          _result = (bool )wxGridTableBase_CanGetValueAs(_arg0,_arg1,_arg2,*_arg3);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
  {
      if (_obj3)
  }    _resultobj = Py_BuildValue("i",_result);
  {
      if (_obj3)
@@ -4362,17 +4646,29 @@ static PyObject *_wrap_wxGridTableBase_CanSetValueAs(PyObject *self, PyObject *a
          }
      }
  {
          }
      }
  {
+#if PYTHON_API_VERSION >= 1009
+    char* tmpPtr; int tmpSize;
+    if (!PyString_Check(_obj3) && !PyUnicode_Check(_obj3)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    if (PyString_AsStringAndSize(_obj3, &tmpPtr, &tmpSize) == -1)
+        return NULL;
+    _arg3 = new wxString(tmpPtr, tmpSize);
+#else
      if (!PyString_Check(_obj3)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (!PyString_Check(_obj3)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
-    _arg3 = new wxString(PyString_AsString(_obj3), PyString_Size(_obj3));
+    _arg3 = new wxString(PyString_AS_STRING(_obj3), PyString_GET_SIZE(_obj3));
+#endif
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          _result = (bool )wxGridTableBase_CanSetValueAs(_arg0,_arg1,_arg2,*_arg3);
  
      wxPy_END_ALLOW_THREADS;
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          _result = (bool )wxGridTableBase_CanSetValueAs(_arg0,_arg1,_arg2,*_arg3);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
  {
      if (_obj3)
  }    _resultobj = Py_BuildValue("i",_result);
  {
      if (_obj3)
@@ -4406,6 +4702,7 @@ static PyObject *_wrap_wxGridTableBase_GetValueAsLong(PyObject *self, PyObject *
          _result = (long )wxGridTableBase_GetValueAsLong(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          _result = (long )wxGridTableBase_GetValueAsLong(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("l",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("l",_result);
      return _resultobj;
  }
@@ -4435,6 +4732,7 @@ static PyObject *_wrap_wxGridTableBase_GetValueAsDouble(PyObject *self, PyObject
          _result = (double )wxGridTableBase_GetValueAsDouble(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          _result = (double )wxGridTableBase_GetValueAsDouble(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("d",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("d",_result);
      return _resultobj;
  }
@@ -4464,6 +4762,7 @@ static PyObject *_wrap_wxGridTableBase_GetValueAsBool(PyObject *self, PyObject *
          _result = (bool )wxGridTableBase_GetValueAsBool(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGridTableBase_GetValueAsBool(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -4493,6 +4792,7 @@ static PyObject *_wrap_wxGridTableBase_SetValueAsLong(PyObject *self, PyObject *
          wxGridTableBase_SetValueAsLong(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
          wxGridTableBase_SetValueAsLong(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -4523,6 +4823,7 @@ static PyObject *_wrap_wxGridTableBase_SetValueAsDouble(PyObject *self, PyObject
          wxGridTableBase_SetValueAsDouble(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
          wxGridTableBase_SetValueAsDouble(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -4555,6 +4856,7 @@ static PyObject *_wrap_wxGridTableBase_SetValueAsBool(PyObject *self, PyObject *
          wxGridTableBase_SetValueAsBool(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
          wxGridTableBase_SetValueAsBool(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -4582,6 +4884,7 @@ static PyObject *_wrap_wxGridTableBase_Clear(PyObject *self, PyObject *args, PyO
          wxGridTableBase_Clear(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          wxGridTableBase_Clear(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -4612,6 +4915,7 @@ static PyObject *_wrap_wxGridTableBase_InsertRows(PyObject *self, PyObject *args
          _result = (bool )wxGridTableBase_InsertRows(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGridTableBase_InsertRows(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -4640,6 +4944,7 @@ static PyObject *_wrap_wxGridTableBase_AppendRows(PyObject *self, PyObject *args
          _result = (bool )wxGridTableBase_AppendRows(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGridTableBase_AppendRows(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -4669,6 +4974,7 @@ static PyObject *_wrap_wxGridTableBase_DeleteRows(PyObject *self, PyObject *args
          _result = (bool )wxGridTableBase_DeleteRows(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGridTableBase_DeleteRows(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -4698,6 +5004,7 @@ static PyObject *_wrap_wxGridTableBase_InsertCols(PyObject *self, PyObject *args
          _result = (bool )wxGridTableBase_InsertCols(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGridTableBase_InsertCols(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -4726,6 +5033,7 @@ static PyObject *_wrap_wxGridTableBase_AppendCols(PyObject *self, PyObject *args
          _result = (bool )wxGridTableBase_AppendCols(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGridTableBase_AppendCols(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -4755,6 +5063,7 @@ static PyObject *_wrap_wxGridTableBase_DeleteCols(PyObject *self, PyObject *args
          _result = (bool )wxGridTableBase_DeleteCols(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGridTableBase_DeleteCols(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -4783,6 +5092,7 @@ static PyObject *_wrap_wxGridTableBase_GetRowLabelValue(PyObject *self, PyObject
          _result = new wxString (wxGridTableBase_GetRowLabelValue(_arg0,_arg1));
  
      wxPy_END_ALLOW_THREADS;
          _result = new wxString (wxGridTableBase_GetRowLabelValue(_arg0,_arg1));
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
  }
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
  }
@@ -4816,6 +5126,7 @@ static PyObject *_wrap_wxGridTableBase_GetColLabelValue(PyObject *self, PyObject
          _result = new wxString (wxGridTableBase_GetColLabelValue(_arg0,_arg1));
  
      wxPy_END_ALLOW_THREADS;
          _result = new wxString (wxGridTableBase_GetColLabelValue(_arg0,_arg1));
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
  }
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
  }
@@ -4846,17 +5157,29 @@ static PyObject *_wrap_wxGridTableBase_SetRowLabelValue(PyObject *self, PyObject
          }
      }
  {
          }
      }
  {
+#if PYTHON_API_VERSION >= 1009
+    char* tmpPtr; int tmpSize;
+    if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
+        return NULL;
+    _arg2 = new wxString(tmpPtr, tmpSize);
+#else
      if (!PyString_Check(_obj2)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (!PyString_Check(_obj2)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
-    _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
+    _arg2 = new wxString(PyString_AS_STRING(_obj2), PyString_GET_SIZE(_obj2));
+#endif
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          wxGridTableBase_SetRowLabelValue(_arg0,_arg1,*_arg2);
  
      wxPy_END_ALLOW_THREADS;
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          wxGridTableBase_SetRowLabelValue(_arg0,_arg1,*_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
@@ -4887,17 +5210,29 @@ static PyObject *_wrap_wxGridTableBase_SetColLabelValue(PyObject *self, PyObject
          }
      }
  {
          }
      }
  {
+#if PYTHON_API_VERSION >= 1009
+    char* tmpPtr; int tmpSize;
+    if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
+        return NULL;
+    _arg2 = new wxString(tmpPtr, tmpSize);
+#else
      if (!PyString_Check(_obj2)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (!PyString_Check(_obj2)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
-    _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
+    _arg2 = new wxString(PyString_AS_STRING(_obj2), PyString_GET_SIZE(_obj2));
+#endif
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          wxGridTableBase_SetColLabelValue(_arg0,_arg1,*_arg2);
  
      wxPy_END_ALLOW_THREADS;
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          wxGridTableBase_SetColLabelValue(_arg0,_arg1,*_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
@@ -4930,23 +5265,25 @@ static PyObject *_wrap_wxGridTableBase_CanHaveAttributes(PyObject *self, PyObjec
          _result = (bool )wxGridTableBase_CanHaveAttributes(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGridTableBase_CanHaveAttributes(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  
-#define wxGridTableBase_GetAttr(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetAttr(_swigarg0,_swigarg1))
+#define wxGridTableBase_GetAttr(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->GetAttr(_swigarg0,_swigarg1,_swigarg2))
  static PyObject *_wrap_wxGridTableBase_GetAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
      wxGridCellAttr * _result;
      wxGridTableBase * _arg0;
      int  _arg1;
      int  _arg2;
  static PyObject *_wrap_wxGridTableBase_GetAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
      wxGridCellAttr * _result;
      wxGridTableBase * _arg0;
      int  _arg1;
      int  _arg2;
+    wxGridCellAttr::wxAttrKind  _arg3;
      PyObject * _argo0 = 0;
      PyObject * _argo0 = 0;
-    char *_kwnames[] = { "self","row","col", NULL };
+    char *_kwnames[] = { "self","row","col","kind", NULL };
      char _ptemp[128];
  
      self = self;
      char _ptemp[128];
  
      self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxGridTableBase_GetAttr",_kwnames,&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiii:wxGridTableBase_GetAttr",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3)) 
          return NULL;
      if (_argo0) {
          if (_argo0 == Py_None) { _arg0 = NULL; }
          return NULL;
      if (_argo0) {
          if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4957,9 +5294,10 @@ static PyObject *_wrap_wxGridTableBase_GetAttr(PyObject *self, PyObject *args, P
      }
  {
      wxPy_BEGIN_ALLOW_THREADS;
      }
  {
      wxPy_BEGIN_ALLOW_THREADS;
-        _result = (wxGridCellAttr *)wxGridTableBase_GetAttr(_arg0,_arg1,_arg2);
+        _result = (wxGridCellAttr *)wxGridTableBase_GetAttr(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAttr_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAttr_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -5003,6 +5341,7 @@ static PyObject *_wrap_wxGridTableBase_SetAttr(PyObject *self, PyObject *args, P
          wxGridTableBase_SetAttr(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
          wxGridTableBase_SetAttr(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -5040,6 +5379,7 @@ static PyObject *_wrap_wxGridTableBase_SetRowAttr(PyObject *self, PyObject *args
          wxGridTableBase_SetRowAttr(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxGridTableBase_SetRowAttr(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -5077,6 +5417,7 @@ static PyObject *_wrap_wxGridTableBase_SetColAttr(PyObject *self, PyObject *args
          wxGridTableBase_SetColAttr(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxGridTableBase_SetColAttr(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -5090,6 +5431,14 @@ static void *SwigwxPyGridTableBaseTowxGridTableBase(void *ptr) {
      return (void *) dest;
  }
  
      return (void *) dest;
  }
  
+static void *SwigwxPyGridTableBaseTowxObject(void *ptr) {
+    wxPyGridTableBase *src;
+    wxObject *dest;
+    src = (wxPyGridTableBase *) ptr;
+    dest = (wxObject *) src;
+    return (void *) dest;
+}
+
  #define new_wxPyGridTableBase() (new wxPyGridTableBase())
  static PyObject *_wrap_new_wxPyGridTableBase(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
  #define new_wxPyGridTableBase() (new wxPyGridTableBase())
  static PyObject *_wrap_new_wxPyGridTableBase(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
@@ -5105,6 +5454,7 @@ static PyObject *_wrap_new_wxPyGridTableBase(PyObject *self, PyObject *args, PyO
          _result = (wxPyGridTableBase *)new_wxPyGridTableBase();
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxPyGridTableBase *)new_wxPyGridTableBase();
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyGridTableBase_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyGridTableBase_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -5147,6 +5497,7 @@ static PyObject *_wrap_wxPyGridTableBase__setSelf(PyObject *self, PyObject *args
          wxPyGridTableBase__setSelf(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxPyGridTableBase__setSelf(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -5174,6 +5525,7 @@ static PyObject *_wrap_wxPyGridTableBase_Destroy(PyObject *self, PyObject *args,
          wxPyGridTableBase_Destroy(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          wxPyGridTableBase_Destroy(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -5204,6 +5556,7 @@ static PyObject *_wrap_wxPyGridTableBase_base_GetTypeName(PyObject *self, PyObje
          _result = new wxString (wxPyGridTableBase_base_GetTypeName(_arg0,_arg1,_arg2));
  
      wxPy_END_ALLOW_THREADS;
          _result = new wxString (wxPyGridTableBase_base_GetTypeName(_arg0,_arg1,_arg2));
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
  }
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
  }
@@ -5236,17 +5589,29 @@ static PyObject *_wrap_wxPyGridTableBase_base_CanGetValueAs(PyObject *self, PyOb
          }
      }
  {
          }
      }
  {
+#if PYTHON_API_VERSION >= 1009
+    char* tmpPtr; int tmpSize;
+    if (!PyString_Check(_obj3) && !PyUnicode_Check(_obj3)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    if (PyString_AsStringAndSize(_obj3, &tmpPtr, &tmpSize) == -1)
+        return NULL;
+    _arg3 = new wxString(tmpPtr, tmpSize);
+#else
      if (!PyString_Check(_obj3)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (!PyString_Check(_obj3)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
-    _arg3 = new wxString(PyString_AsString(_obj3), PyString_Size(_obj3));
+    _arg3 = new wxString(PyString_AS_STRING(_obj3), PyString_GET_SIZE(_obj3));
+#endif
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          _result = (bool )wxPyGridTableBase_base_CanGetValueAs(_arg0,_arg1,_arg2,*_arg3);
  
      wxPy_END_ALLOW_THREADS;
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          _result = (bool )wxPyGridTableBase_base_CanGetValueAs(_arg0,_arg1,_arg2,*_arg3);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
  {
      if (_obj3)
  }    _resultobj = Py_BuildValue("i",_result);
  {
      if (_obj3)
@@ -5278,17 +5643,29 @@ static PyObject *_wrap_wxPyGridTableBase_base_CanSetValueAs(PyObject *self, PyOb
          }
      }
  {
          }
      }
  {
+#if PYTHON_API_VERSION >= 1009
+    char* tmpPtr; int tmpSize;
+    if (!PyString_Check(_obj3) && !PyUnicode_Check(_obj3)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    if (PyString_AsStringAndSize(_obj3, &tmpPtr, &tmpSize) == -1)
+        return NULL;
+    _arg3 = new wxString(tmpPtr, tmpSize);
+#else
      if (!PyString_Check(_obj3)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (!PyString_Check(_obj3)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
-    _arg3 = new wxString(PyString_AsString(_obj3), PyString_Size(_obj3));
+    _arg3 = new wxString(PyString_AS_STRING(_obj3), PyString_GET_SIZE(_obj3));
+#endif
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          _result = (bool )wxPyGridTableBase_base_CanSetValueAs(_arg0,_arg1,_arg2,*_arg3);
  
      wxPy_END_ALLOW_THREADS;
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          _result = (bool )wxPyGridTableBase_base_CanSetValueAs(_arg0,_arg1,_arg2,*_arg3);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
  {
      if (_obj3)
  }    _resultobj = Py_BuildValue("i",_result);
  {
      if (_obj3)
@@ -5319,6 +5696,7 @@ static PyObject *_wrap_wxPyGridTableBase_base_Clear(PyObject *self, PyObject *ar
          wxPyGridTableBase_base_Clear(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          wxPyGridTableBase_base_Clear(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -5349,6 +5727,7 @@ static PyObject *_wrap_wxPyGridTableBase_base_InsertRows(PyObject *self, PyObjec
          _result = (bool )wxPyGridTableBase_base_InsertRows(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxPyGridTableBase_base_InsertRows(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -5377,6 +5756,7 @@ static PyObject *_wrap_wxPyGridTableBase_base_AppendRows(PyObject *self, PyObjec
          _result = (bool )wxPyGridTableBase_base_AppendRows(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxPyGridTableBase_base_AppendRows(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -5406,6 +5786,7 @@ static PyObject *_wrap_wxPyGridTableBase_base_DeleteRows(PyObject *self, PyObjec
          _result = (bool )wxPyGridTableBase_base_DeleteRows(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxPyGridTableBase_base_DeleteRows(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -5435,6 +5816,7 @@ static PyObject *_wrap_wxPyGridTableBase_base_InsertCols(PyObject *self, PyObjec
          _result = (bool )wxPyGridTableBase_base_InsertCols(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxPyGridTableBase_base_InsertCols(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -5463,6 +5845,7 @@ static PyObject *_wrap_wxPyGridTableBase_base_AppendCols(PyObject *self, PyObjec
          _result = (bool )wxPyGridTableBase_base_AppendCols(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxPyGridTableBase_base_AppendCols(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -5492,6 +5875,7 @@ static PyObject *_wrap_wxPyGridTableBase_base_DeleteCols(PyObject *self, PyObjec
          _result = (bool )wxPyGridTableBase_base_DeleteCols(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxPyGridTableBase_base_DeleteCols(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -5520,6 +5904,7 @@ static PyObject *_wrap_wxPyGridTableBase_base_GetRowLabelValue(PyObject *self, P
          _result = new wxString (wxPyGridTableBase_base_GetRowLabelValue(_arg0,_arg1));
  
      wxPy_END_ALLOW_THREADS;
          _result = new wxString (wxPyGridTableBase_base_GetRowLabelValue(_arg0,_arg1));
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
  }
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
  }
@@ -5553,6 +5938,7 @@ static PyObject *_wrap_wxPyGridTableBase_base_GetColLabelValue(PyObject *self, P
          _result = new wxString (wxPyGridTableBase_base_GetColLabelValue(_arg0,_arg1));
  
      wxPy_END_ALLOW_THREADS;
          _result = new wxString (wxPyGridTableBase_base_GetColLabelValue(_arg0,_arg1));
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
  }
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
  }
@@ -5583,17 +5969,29 @@ static PyObject *_wrap_wxPyGridTableBase_base_SetRowLabelValue(PyObject *self, P
          }
      }
  {
          }
      }
  {
+#if PYTHON_API_VERSION >= 1009
+    char* tmpPtr; int tmpSize;
+    if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
+        return NULL;
+    _arg2 = new wxString(tmpPtr, tmpSize);
+#else
      if (!PyString_Check(_obj2)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (!PyString_Check(_obj2)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
-    _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
+    _arg2 = new wxString(PyString_AS_STRING(_obj2), PyString_GET_SIZE(_obj2));
+#endif
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          wxPyGridTableBase_base_SetRowLabelValue(_arg0,_arg1,*_arg2);
  
      wxPy_END_ALLOW_THREADS;
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          wxPyGridTableBase_base_SetRowLabelValue(_arg0,_arg1,*_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
@@ -5624,17 +6022,29 @@ static PyObject *_wrap_wxPyGridTableBase_base_SetColLabelValue(PyObject *self, P
          }
      }
  {
          }
      }
  {
+#if PYTHON_API_VERSION >= 1009
+    char* tmpPtr; int tmpSize;
+    if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
+        return NULL;
+    _arg2 = new wxString(tmpPtr, tmpSize);
+#else
      if (!PyString_Check(_obj2)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (!PyString_Check(_obj2)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
-    _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
+    _arg2 = new wxString(PyString_AS_STRING(_obj2), PyString_GET_SIZE(_obj2));
+#endif
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          wxPyGridTableBase_base_SetColLabelValue(_arg0,_arg1,*_arg2);
  
      wxPy_END_ALLOW_THREADS;
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          wxPyGridTableBase_base_SetColLabelValue(_arg0,_arg1,*_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
@@ -5667,23 +6077,25 @@ static PyObject *_wrap_wxPyGridTableBase_base_CanHaveAttributes(PyObject *self,
          _result = (bool )wxPyGridTableBase_base_CanHaveAttributes(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxPyGridTableBase_base_CanHaveAttributes(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  
-#define wxPyGridTableBase_base_GetAttr(_swigobj,_swigarg0,_swigarg1)  (_swigobj->base_GetAttr(_swigarg0,_swigarg1))
+#define wxPyGridTableBase_base_GetAttr(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->base_GetAttr(_swigarg0,_swigarg1,_swigarg2))
  static PyObject *_wrap_wxPyGridTableBase_base_GetAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
      wxGridCellAttr * _result;
      wxPyGridTableBase * _arg0;
      int  _arg1;
      int  _arg2;
  static PyObject *_wrap_wxPyGridTableBase_base_GetAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
      wxGridCellAttr * _result;
      wxPyGridTableBase * _arg0;
      int  _arg1;
      int  _arg2;
+    wxGridCellAttr::wxAttrKind  _arg3;
      PyObject * _argo0 = 0;
      PyObject * _argo0 = 0;
-    char *_kwnames[] = { "self","row","col", NULL };
+    char *_kwnames[] = { "self","row","col","kind", NULL };
      char _ptemp[128];
  
      self = self;
      char _ptemp[128];
  
      self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxPyGridTableBase_base_GetAttr",_kwnames,&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiii:wxPyGridTableBase_base_GetAttr",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3)) 
          return NULL;
      if (_argo0) {
          if (_argo0 == Py_None) { _arg0 = NULL; }
          return NULL;
      if (_argo0) {
          if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5694,9 +6106,10 @@ static PyObject *_wrap_wxPyGridTableBase_base_GetAttr(PyObject *self, PyObject *
      }
  {
      wxPy_BEGIN_ALLOW_THREADS;
      }
  {
      wxPy_BEGIN_ALLOW_THREADS;
-        _result = (wxGridCellAttr *)wxPyGridTableBase_base_GetAttr(_arg0,_arg1,_arg2);
+        _result = (wxGridCellAttr *)wxPyGridTableBase_base_GetAttr(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAttr_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAttr_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -5740,6 +6153,7 @@ static PyObject *_wrap_wxPyGridTableBase_base_SetAttr(PyObject *self, PyObject *
          wxPyGridTableBase_base_SetAttr(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
          wxPyGridTableBase_base_SetAttr(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -5777,6 +6191,7 @@ static PyObject *_wrap_wxPyGridTableBase_base_SetRowAttr(PyObject *self, PyObjec
          wxPyGridTableBase_base_SetRowAttr(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxPyGridTableBase_base_SetRowAttr(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -5814,6 +6229,7 @@ static PyObject *_wrap_wxPyGridTableBase_base_SetColAttr(PyObject *self, PyObjec
          wxPyGridTableBase_base_SetColAttr(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxPyGridTableBase_base_SetColAttr(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -5827,6 +6243,14 @@ static void *SwigwxGridStringTableTowxGridTableBase(void *ptr) {
      return (void *) dest;
  }
  
      return (void *) dest;
  }
  
+static void *SwigwxGridStringTableTowxObject(void *ptr) {
+    wxGridStringTable *src;
+    wxObject *dest;
+    src = (wxGridStringTable *) ptr;
+    dest = (wxObject *) src;
+    return (void *) dest;
+}
+
  #define new_wxGridStringTable(_swigarg0,_swigarg1) (new wxGridStringTable(_swigarg0,_swigarg1))
  static PyObject *_wrap_new_wxGridStringTable(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
  #define new_wxGridStringTable(_swigarg0,_swigarg1) (new wxGridStringTable(_swigarg0,_swigarg1))
  static PyObject *_wrap_new_wxGridStringTable(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
@@ -5844,6 +6268,7 @@ static PyObject *_wrap_new_wxGridStringTable(PyObject *self, PyObject *args, PyO
          _result = (wxGridStringTable *)new_wxGridStringTable(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxGridStringTable *)new_wxGridStringTable(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridStringTable_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridStringTable_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -5881,6 +6306,7 @@ static PyObject *_wrap_new_wxGridTableMessage(PyObject *self, PyObject *args, Py
          _result = (wxGridTableMessage *)new_wxGridTableMessage(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxGridTableMessage *)new_wxGridTableMessage(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridTableMessage_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridTableMessage_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -5913,6 +6339,7 @@ static PyObject *_wrap_delete_wxGridTableMessage(PyObject *self, PyObject *args,
          delete_wxGridTableMessage(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          delete_wxGridTableMessage(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -5949,6 +6376,7 @@ static PyObject *_wrap_wxGridTableMessage_SetTableObject(PyObject *self, PyObjec
          wxGridTableMessage_SetTableObject(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGridTableMessage_SetTableObject(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -5961,7 +6389,6 @@ static PyObject *_wrap_wxGridTableMessage_GetTableObject(PyObject *self, PyObjec
      wxGridTableMessage * _arg0;
      PyObject * _argo0 = 0;
      char *_kwnames[] = { "self", NULL };
      wxGridTableMessage * _arg0;
      PyObject * _argo0 = 0;
      char *_kwnames[] = { "self", NULL };
-    char _ptemp[128];
  
      self = self;
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridTableMessage_GetTableObject",_kwnames,&_argo0)) 
  
      self = self;
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridTableMessage_GetTableObject",_kwnames,&_argo0)) 
@@ -5978,13 +6405,8 @@ static PyObject *_wrap_wxGridTableMessage_GetTableObject(PyObject *self, PyObjec
          _result = (wxGridTableBase *)wxGridTableMessage_GetTableObject(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxGridTableBase *)wxGridTableMessage_GetTableObject(_arg0);
  
      wxPy_END_ALLOW_THREADS;
-}    if (_result) {
-        SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridTableBase_p");
-        _resultobj = Py_BuildValue("s",_ptemp);
-    } else {
-        Py_INCREF(Py_None);
-        _resultobj = Py_None;
-    }
+    if (PyErr_Occurred()) return NULL;
+}{ _resultobj = wxPyMake_wxObject(_result); }
      return _resultobj;
  }
  
      return _resultobj;
  }
  
@@ -6011,6 +6433,7 @@ static PyObject *_wrap_wxGridTableMessage_SetId(PyObject *self, PyObject *args,
          wxGridTableMessage_SetId(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGridTableMessage_SetId(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -6039,6 +6462,7 @@ static PyObject *_wrap_wxGridTableMessage_GetId(PyObject *self, PyObject *args,
          _result = (int )wxGridTableMessage_GetId(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (int )wxGridTableMessage_GetId(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -6066,6 +6490,7 @@ static PyObject *_wrap_wxGridTableMessage_SetCommandInt(PyObject *self, PyObject
          wxGridTableMessage_SetCommandInt(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGridTableMessage_SetCommandInt(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -6094,6 +6519,7 @@ static PyObject *_wrap_wxGridTableMessage_GetCommandInt(PyObject *self, PyObject
          _result = (int )wxGridTableMessage_GetCommandInt(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (int )wxGridTableMessage_GetCommandInt(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -6121,6 +6547,7 @@ static PyObject *_wrap_wxGridTableMessage_SetCommandInt2(PyObject *self, PyObjec
          wxGridTableMessage_SetCommandInt2(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGridTableMessage_SetCommandInt2(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -6149,6 +6576,7 @@ static PyObject *_wrap_wxGridTableMessage_GetCommandInt2(PyObject *self, PyObjec
          _result = (int )wxGridTableMessage_GetCommandInt2(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (int )wxGridTableMessage_GetCommandInt2(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -6170,6 +6598,7 @@ static PyObject *_wrap_new_wxGridCellCoords(PyObject *self, PyObject *args, PyOb
          _result = (wxGridCellCoords *)new_wxGridCellCoords(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxGridCellCoords *)new_wxGridCellCoords(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellCoords_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellCoords_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -6202,6 +6631,7 @@ static PyObject *_wrap_delete_wxGridCellCoords(PyObject *self, PyObject *args, P
          delete_wxGridCellCoords(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          delete_wxGridCellCoords(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -6230,6 +6660,7 @@ static PyObject *_wrap_wxGridCellCoords_GetRow(PyObject *self, PyObject *args, P
          _result = (int )wxGridCellCoords_GetRow(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (int )wxGridCellCoords_GetRow(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -6257,6 +6688,7 @@ static PyObject *_wrap_wxGridCellCoords_SetRow(PyObject *self, PyObject *args, P
          wxGridCellCoords_SetRow(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellCoords_SetRow(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -6285,6 +6717,7 @@ static PyObject *_wrap_wxGridCellCoords_GetCol(PyObject *self, PyObject *args, P
          _result = (int )wxGridCellCoords_GetCol(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (int )wxGridCellCoords_GetCol(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -6312,6 +6745,7 @@ static PyObject *_wrap_wxGridCellCoords_SetCol(PyObject *self, PyObject *args, P
          wxGridCellCoords_SetCol(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellCoords_SetCol(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -6341,6 +6775,7 @@ static PyObject *_wrap_wxGridCellCoords_Set(PyObject *self, PyObject *args, PyOb
          wxGridCellCoords_Set(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxGridCellCoords_Set(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -6374,6 +6809,7 @@ static PyObject *_wrap_wxGridCellCoords_asTuple(PyObject *self, PyObject *args,
          _result = (PyObject *)wxGridCellCoords_asTuple(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (PyObject *)wxGridCellCoords_asTuple(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }{
    _resultobj = _result;
  }
  }{
    _resultobj = _result;
  }
@@ -6414,6 +6850,7 @@ static PyObject *_wrap_wxGridCellCoords___cmp__(PyObject *self, PyObject *args,
          _result = (int )wxGridCellCoords___cmp__(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
          _result = (int )wxGridCellCoords___cmp__(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -6450,6 +6887,14 @@ static void *SwigwxGridTowxEvtHandler(void *ptr) {
      return (void *) dest;
  }
  
      return (void *) dest;
  }
  
+static void *SwigwxGridTowxObject(void *ptr) {
+    wxGrid *src;
+    wxObject *dest;
+    src = (wxGrid *) ptr;
+    dest = (wxObject *) src;
+    return (void *) dest;
+}
+
  #define new_wxGrid(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxGrid(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
  static PyObject *_wrap_new_wxGrid(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
  #define new_wxGrid(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxGrid(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
  static PyObject *_wrap_new_wxGrid(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
@@ -6495,6 +6940,7 @@ static PyObject *_wrap_new_wxGrid(PyObject *self, PyObject *args, PyObject *kwar
          _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;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          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);
@@ -6531,6 +6977,7 @@ static PyObject *_wrap_wxGrid_CreateGrid(PyObject *self, PyObject *args, PyObjec
          _result = (bool )wxGrid_CreateGrid(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGrid_CreateGrid(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -6558,6 +7005,7 @@ static PyObject *_wrap_wxGrid_SetSelectionMode(PyObject *self, PyObject *args, P
          wxGrid_SetSelectionMode(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetSelectionMode(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -6586,6 +7034,7 @@ static PyObject *_wrap_wxGrid_GetNumberRows(PyObject *self, PyObject *args, PyOb
          _result = (int )wxGrid_GetNumberRows(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (int )wxGrid_GetNumberRows(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -6613,6 +7062,7 @@ static PyObject *_wrap_wxGrid_GetNumberCols(PyObject *self, PyObject *args, PyOb
          _result = (int )wxGrid_GetNumberCols(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (int )wxGrid_GetNumberCols(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -6649,6 +7099,7 @@ static PyObject *_wrap_wxGrid_ProcessTableMessage(PyObject *self, PyObject *args
          _result = (bool )wxGrid_ProcessTableMessage(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGrid_ProcessTableMessage(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -6660,7 +7111,6 @@ static PyObject *_wrap_wxGrid_GetTable(PyObject *self, PyObject *args, PyObject
      wxGrid * _arg0;
      PyObject * _argo0 = 0;
      char *_kwnames[] = { "self", NULL };
      wxGrid * _arg0;
      PyObject * _argo0 = 0;
      char *_kwnames[] = { "self", NULL };
-    char _ptemp[128];
  
      self = self;
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetTable",_kwnames,&_argo0)) 
  
      self = self;
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetTable",_kwnames,&_argo0)) 
@@ -6677,13 +7127,8 @@ static PyObject *_wrap_wxGrid_GetTable(PyObject *self, PyObject *args, PyObject
          _result = (wxGridTableBase *)wxGrid_GetTable(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxGridTableBase *)wxGrid_GetTable(_arg0);
  
      wxPy_END_ALLOW_THREADS;
-}    if (_result) {
-        SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridTableBase_p");
-        _resultobj = Py_BuildValue("s",_ptemp);
-    } else {
-        Py_INCREF(Py_None);
-        _resultobj = Py_None;
-    }
+    if (PyErr_Occurred()) return NULL;
+}{ _resultobj = wxPyMake_wxObject(_result); }
      return _resultobj;
  }
  
      return _resultobj;
  }
  
@@ -6723,6 +7168,7 @@ static PyObject *_wrap_wxGrid_SetTable(PyObject *self, PyObject *args, PyObject
          _result = (bool )wxGrid_SetTable(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGrid_SetTable(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -6749,6 +7195,7 @@ static PyObject *_wrap_wxGrid_ClearGrid(PyObject *self, PyObject *args, PyObject
          wxGrid_ClearGrid(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_ClearGrid(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -6782,6 +7229,7 @@ static PyObject *_wrap_wxGrid_InsertRows(PyObject *self, PyObject *args, PyObjec
          _result = (bool )wxGrid_InsertRows(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGrid_InsertRows(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -6813,6 +7261,7 @@ static PyObject *_wrap_wxGrid_AppendRows(PyObject *self, PyObject *args, PyObjec
          _result = (bool )wxGrid_AppendRows(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGrid_AppendRows(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -6845,6 +7294,7 @@ static PyObject *_wrap_wxGrid_DeleteRows(PyObject *self, PyObject *args, PyObjec
          _result = (bool )wxGrid_DeleteRows(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGrid_DeleteRows(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -6877,6 +7327,7 @@ static PyObject *_wrap_wxGrid_InsertCols(PyObject *self, PyObject *args, PyObjec
          _result = (bool )wxGrid_InsertCols(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGrid_InsertCols(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -6908,6 +7359,7 @@ static PyObject *_wrap_wxGrid_AppendCols(PyObject *self, PyObject *args, PyObjec
          _result = (bool )wxGrid_AppendCols(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGrid_AppendCols(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -6940,6 +7392,7 @@ static PyObject *_wrap_wxGrid_DeleteCols(PyObject *self, PyObject *args, PyObjec
          _result = (bool )wxGrid_DeleteCols(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGrid_DeleteCols(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -6984,6 +7437,7 @@ static PyObject *_wrap_wxGrid_DrawCellHighlight(PyObject *self, PyObject *args,
          wxGrid_DrawCellHighlight(_arg0,*_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_DrawCellHighlight(_arg0,*_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -7023,11 +7477,22 @@ static PyObject *_wrap_wxGrid_DrawTextRectangle(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
+#if PYTHON_API_VERSION >= 1009
+    char* tmpPtr; int tmpSize;
+    if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
+        return NULL;
+    _arg2 = new wxString(tmpPtr, tmpSize);
+#else
      if (!PyString_Check(_obj2)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (!PyString_Check(_obj2)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
-    _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
+    _arg2 = new wxString(PyString_AS_STRING(_obj2), PyString_GET_SIZE(_obj2));
+#endif
  }
  {
      _arg3 = &temp;
  }
  {
      _arg3 = &temp;
@@ -7039,6 +7504,7 @@ static PyObject *_wrap_wxGrid_DrawTextRectangle(PyObject *self, PyObject *args,
          wxGrid_DrawTextRectangle(_arg0,*_arg1,*_arg2,*_arg3,_arg4,_arg5);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_DrawTextRectangle(_arg0,*_arg1,*_arg2,*_arg3,_arg4,_arg5);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
@@ -7070,11 +7536,22 @@ static PyObject *_wrap_wxGrid_StringToLines(PyObject *self, PyObject *args, PyOb
          }
      }
  {
          }
      }
  {
+#if PYTHON_API_VERSION >= 1009
+    char* tmpPtr; int tmpSize;
+    if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1)
+        return NULL;
+    _arg1 = new wxString(tmpPtr, tmpSize);
+#else
      if (!PyString_Check(_obj1)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (!PyString_Check(_obj1)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
-    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
+    _arg1 = new wxString(PyString_AS_STRING(_obj1), PyString_GET_SIZE(_obj1));
+#endif
  }
      if (_argo2) {
          if (_argo2 == Py_None) { _arg2 = NULL; }
  }
      if (_argo2) {
          if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -7088,6 +7565,7 @@ static PyObject *_wrap_wxGrid_StringToLines(PyObject *self, PyObject *args, PyOb
          wxGrid_StringToLines(_arg0,*_arg1,*_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_StringToLines(_arg0,*_arg1,*_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
@@ -7147,6 +7625,7 @@ static PyObject *_wrap_wxGrid_GetTextBoxSize(PyObject *self, PyObject *args, PyO
          wxGrid_GetTextBoxSize(_arg0,*_arg1,*_arg2,_arg3,_arg4);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_GetTextBoxSize(_arg0,*_arg1,*_arg2,_arg3,_arg4);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
@@ -7184,6 +7663,7 @@ static PyObject *_wrap_wxGrid_BeginBatch(PyObject *self, PyObject *args, PyObjec
          wxGrid_BeginBatch(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_BeginBatch(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -7211,6 +7691,7 @@ static PyObject *_wrap_wxGrid_EndBatch(PyObject *self, PyObject *args, PyObject
          wxGrid_EndBatch(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_EndBatch(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -7239,10 +7720,39 @@ static PyObject *_wrap_wxGrid_GetBatchCount(PyObject *self, PyObject *args, PyOb
          _result = (int )wxGrid_GetBatchCount(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (int )wxGrid_GetBatchCount(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  
+#define wxGrid_ForceRefresh(_swigobj)  (_swigobj->ForceRefresh())
+static PyObject *_wrap_wxGrid_ForceRefresh(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxGrid * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_ForceRefresh",_kwnames,&_argo0)) 
+        return NULL;
+    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_ForceRefresh. Expected _wxGrid_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxGrid_ForceRefresh(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
  #define wxGrid_IsEditable(_swigobj)  (_swigobj->IsEditable())
  static PyObject *_wrap_wxGrid_IsEditable(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
  #define wxGrid_IsEditable(_swigobj)  (_swigobj->IsEditable())
  static PyObject *_wrap_wxGrid_IsEditable(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
@@ -7266,6 +7776,7 @@ static PyObject *_wrap_wxGrid_IsEditable(PyObject *self, PyObject *args, PyObjec
          _result = (bool )wxGrid_IsEditable(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGrid_IsEditable(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -7295,6 +7806,7 @@ static PyObject *_wrap_wxGrid_EnableEditing(PyObject *self, PyObject *args, PyOb
          wxGrid_EnableEditing(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_EnableEditing(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -7325,6 +7837,7 @@ static PyObject *_wrap_wxGrid_EnableCellEditControl(PyObject *self, PyObject *ar
          wxGrid_EnableCellEditControl(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_EnableCellEditControl(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -7352,6 +7865,7 @@ static PyObject *_wrap_wxGrid_DisableCellEditControl(PyObject *self, PyObject *a
          wxGrid_DisableCellEditControl(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_DisableCellEditControl(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -7380,6 +7894,7 @@ static PyObject *_wrap_wxGrid_CanEnableCellControl(PyObject *self, PyObject *arg
          _result = (bool )wxGrid_CanEnableCellControl(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGrid_CanEnableCellControl(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -7407,6 +7922,7 @@ static PyObject *_wrap_wxGrid_IsCellEditControlEnabled(PyObject *self, PyObject
          _result = (bool )wxGrid_IsCellEditControlEnabled(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGrid_IsCellEditControlEnabled(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -7434,6 +7950,7 @@ static PyObject *_wrap_wxGrid_IsCellEditControlShown(PyObject *self, PyObject *a
          _result = (bool )wxGrid_IsCellEditControlShown(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGrid_IsCellEditControlShown(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -7461,6 +7978,7 @@ static PyObject *_wrap_wxGrid_IsCurrentCellReadOnly(PyObject *self, PyObject *ar
          _result = (bool )wxGrid_IsCurrentCellReadOnly(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGrid_IsCurrentCellReadOnly(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -7487,6 +8005,7 @@ static PyObject *_wrap_wxGrid_ShowCellEditControl(PyObject *self, PyObject *args
          wxGrid_ShowCellEditControl(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_ShowCellEditControl(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -7514,6 +8033,7 @@ static PyObject *_wrap_wxGrid_HideCellEditControl(PyObject *self, PyObject *args
          wxGrid_HideCellEditControl(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_HideCellEditControl(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -7541,6 +8061,7 @@ static PyObject *_wrap_wxGrid_SaveEditControlValue(PyObject *self, PyObject *arg
          wxGrid_SaveEditControlValue(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SaveEditControlValue(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -7576,6 +8097,7 @@ static PyObject *_wrap_wxGrid_XYToCell(PyObject *self, PyObject *args, PyObject
          _result = (wxGridCellCoords *)wxGrid_XYToCell(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxGridCellCoords *)wxGrid_XYToCell(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellCoords_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellCoords_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -7610,6 +8132,7 @@ static PyObject *_wrap_wxGrid_YToRow(PyObject *self, PyObject *args, PyObject *k
          _result = (int )wxGrid_YToRow(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          _result = (int )wxGrid_YToRow(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -7638,6 +8161,7 @@ static PyObject *_wrap_wxGrid_XToCol(PyObject *self, PyObject *args, PyObject *k
          _result = (int )wxGrid_XToCol(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          _result = (int )wxGrid_XToCol(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -7666,6 +8190,7 @@ static PyObject *_wrap_wxGrid_YToEdgeOfRow(PyObject *self, PyObject *args, PyObj
          _result = (int )wxGrid_YToEdgeOfRow(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          _result = (int )wxGrid_YToEdgeOfRow(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -7694,6 +8219,7 @@ static PyObject *_wrap_wxGrid_XToEdgeOfCol(PyObject *self, PyObject *args, PyObj
          _result = (int )wxGrid_XToEdgeOfCol(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          _result = (int )wxGrid_XToEdgeOfCol(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -7724,6 +8250,7 @@ static PyObject *_wrap_wxGrid_CellToRect(PyObject *self, PyObject *args, PyObjec
          _result = new wxRect (wxGrid_CellToRect(_arg0,_arg1,_arg2));
  
      wxPy_END_ALLOW_THREADS;
          _result = new wxRect (wxGrid_CellToRect(_arg0,_arg1,_arg2));
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxRect_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxRect_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
@@ -7752,6 +8279,7 @@ static PyObject *_wrap_wxGrid_GetGridCursorRow(PyObject *self, PyObject *args, P
          _result = (int )wxGrid_GetGridCursorRow(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (int )wxGrid_GetGridCursorRow(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -7779,6 +8307,7 @@ static PyObject *_wrap_wxGrid_GetGridCursorCol(PyObject *self, PyObject *args, P
          _result = (int )wxGrid_GetGridCursorCol(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (int )wxGrid_GetGridCursorCol(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -7811,6 +8340,7 @@ static PyObject *_wrap_wxGrid_IsVisible(PyObject *self, PyObject *args, PyObject
          _result = (bool )wxGrid_IsVisible(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGrid_IsVisible(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -7839,6 +8369,7 @@ static PyObject *_wrap_wxGrid_MakeCellVisible(PyObject *self, PyObject *args, Py
          wxGrid_MakeCellVisible(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_MakeCellVisible(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -7868,6 +8399,7 @@ static PyObject *_wrap_wxGrid_SetGridCursor(PyObject *self, PyObject *args, PyOb
          wxGrid_SetGridCursor(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetGridCursor(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -7899,6 +8431,7 @@ static PyObject *_wrap_wxGrid_MoveCursorUp(PyObject *self, PyObject *args, PyObj
          _result = (bool )wxGrid_MoveCursorUp(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGrid_MoveCursorUp(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -7929,6 +8462,7 @@ static PyObject *_wrap_wxGrid_MoveCursorDown(PyObject *self, PyObject *args, PyO
          _result = (bool )wxGrid_MoveCursorDown(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGrid_MoveCursorDown(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -7959,6 +8493,7 @@ static PyObject *_wrap_wxGrid_MoveCursorLeft(PyObject *self, PyObject *args, PyO
          _result = (bool )wxGrid_MoveCursorLeft(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGrid_MoveCursorLeft(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -7989,6 +8524,7 @@ static PyObject *_wrap_wxGrid_MoveCursorRight(PyObject *self, PyObject *args, Py
          _result = (bool )wxGrid_MoveCursorRight(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGrid_MoveCursorRight(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -8016,6 +8552,7 @@ static PyObject *_wrap_wxGrid_MovePageDown(PyObject *self, PyObject *args, PyObj
          _result = (bool )wxGrid_MovePageDown(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGrid_MovePageDown(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -8043,6 +8580,7 @@ static PyObject *_wrap_wxGrid_MovePageUp(PyObject *self, PyObject *args, PyObjec
          _result = (bool )wxGrid_MovePageUp(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGrid_MovePageUp(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -8073,6 +8611,7 @@ static PyObject *_wrap_wxGrid_MoveCursorUpBlock(PyObject *self, PyObject *args,
          _result = (bool )wxGrid_MoveCursorUpBlock(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGrid_MoveCursorUpBlock(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -8103,6 +8642,7 @@ static PyObject *_wrap_wxGrid_MoveCursorDownBlock(PyObject *self, PyObject *args
          _result = (bool )wxGrid_MoveCursorDownBlock(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGrid_MoveCursorDownBlock(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -8133,6 +8673,7 @@ static PyObject *_wrap_wxGrid_MoveCursorLeftBlock(PyObject *self, PyObject *args
          _result = (bool )wxGrid_MoveCursorLeftBlock(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGrid_MoveCursorLeftBlock(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -8163,6 +8704,7 @@ static PyObject *_wrap_wxGrid_MoveCursorRightBlock(PyObject *self, PyObject *arg
          _result = (bool )wxGrid_MoveCursorRightBlock(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGrid_MoveCursorRightBlock(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -8190,6 +8732,7 @@ static PyObject *_wrap_wxGrid_GetDefaultRowLabelSize(PyObject *self, PyObject *a
          _result = (int )wxGrid_GetDefaultRowLabelSize(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (int )wxGrid_GetDefaultRowLabelSize(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -8217,6 +8760,7 @@ static PyObject *_wrap_wxGrid_GetRowLabelSize(PyObject *self, PyObject *args, Py
          _result = (int )wxGrid_GetRowLabelSize(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (int )wxGrid_GetRowLabelSize(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -8244,6 +8788,7 @@ static PyObject *_wrap_wxGrid_GetDefaultColLabelSize(PyObject *self, PyObject *a
          _result = (int )wxGrid_GetDefaultColLabelSize(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (int )wxGrid_GetDefaultColLabelSize(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -8271,6 +8816,7 @@ static PyObject *_wrap_wxGrid_GetColLabelSize(PyObject *self, PyObject *args, Py
          _result = (int )wxGrid_GetColLabelSize(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (int )wxGrid_GetColLabelSize(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -8299,6 +8845,7 @@ static PyObject *_wrap_wxGrid_GetLabelBackgroundColour(PyObject *self, PyObject
          _result = new wxColour (wxGrid_GetLabelBackgroundColour(_arg0));
  
      wxPy_END_ALLOW_THREADS;
          _result = new wxColour (wxGrid_GetLabelBackgroundColour(_arg0));
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
@@ -8328,6 +8875,7 @@ static PyObject *_wrap_wxGrid_GetLabelTextColour(PyObject *self, PyObject *args,
          _result = new wxColour (wxGrid_GetLabelTextColour(_arg0));
  
      wxPy_END_ALLOW_THREADS;
          _result = new wxColour (wxGrid_GetLabelTextColour(_arg0));
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
@@ -8357,6 +8905,7 @@ static PyObject *_wrap_wxGrid_GetLabelFont(PyObject *self, PyObject *args, PyObj
          _result = new wxFont (wxGrid_GetLabelFont(_arg0));
  
      wxPy_END_ALLOW_THREADS;
          _result = new wxFont (wxGrid_GetLabelFont(_arg0));
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxFont_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxFont_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
@@ -8394,6 +8943,7 @@ static PyObject *_wrap_wxGrid_GetRowLabelAlignment(PyObject *self, PyObject *arg
          wxGrid_GetRowLabelAlignment(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_GetRowLabelAlignment(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
@@ -8441,6 +8991,7 @@ static PyObject *_wrap_wxGrid_GetColLabelAlignment(PyObject *self, PyObject *arg
          wxGrid_GetColLabelAlignment(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_GetColLabelAlignment(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
@@ -8480,6 +9031,7 @@ static PyObject *_wrap_wxGrid_GetRowLabelValue(PyObject *self, PyObject *args, P
          _result = new wxString (wxGrid_GetRowLabelValue(_arg0,_arg1));
  
      wxPy_END_ALLOW_THREADS;
          _result = new wxString (wxGrid_GetRowLabelValue(_arg0,_arg1));
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
  }
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
  }
@@ -8513,6 +9065,7 @@ static PyObject *_wrap_wxGrid_GetColLabelValue(PyObject *self, PyObject *args, P
          _result = new wxString (wxGrid_GetColLabelValue(_arg0,_arg1));
  
      wxPy_END_ALLOW_THREADS;
          _result = new wxString (wxGrid_GetColLabelValue(_arg0,_arg1));
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
  }
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
  }
@@ -8546,6 +9099,7 @@ static PyObject *_wrap_wxGrid_GetGridLineColour(PyObject *self, PyObject *args,
          _result = new wxColour (wxGrid_GetGridLineColour(_arg0));
  
      wxPy_END_ALLOW_THREADS;
          _result = new wxColour (wxGrid_GetGridLineColour(_arg0));
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
@@ -8575,11 +9129,68 @@ static PyObject *_wrap_wxGrid_GetCellHighlightColour(PyObject *self, PyObject *a
          _result = new wxColour (wxGrid_GetCellHighlightColour(_arg0));
  
      wxPy_END_ALLOW_THREADS;
          _result = new wxColour (wxGrid_GetCellHighlightColour(_arg0));
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
  }
  
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
  }
  
+#define wxGrid_GetCellHighlightPenWidth(_swigobj)  (_swigobj->GetCellHighlightPenWidth())
+static PyObject *_wrap_wxGrid_GetCellHighlightPenWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    int  _result;
+    wxGrid * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetCellHighlightPenWidth",_kwnames,&_argo0)) 
+        return NULL;
+    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_GetCellHighlightPenWidth. Expected _wxGrid_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (int )wxGrid_GetCellHighlightPenWidth(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxGrid_GetCellHighlightROPenWidth(_swigobj)  (_swigobj->GetCellHighlightROPenWidth())
+static PyObject *_wrap_wxGrid_GetCellHighlightROPenWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    int  _result;
+    wxGrid * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetCellHighlightROPenWidth",_kwnames,&_argo0)) 
+        return NULL;
+    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_GetCellHighlightROPenWidth. Expected _wxGrid_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (int )wxGrid_GetCellHighlightROPenWidth(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
  #define wxGrid_SetRowLabelSize(_swigobj,_swigarg0)  (_swigobj->SetRowLabelSize(_swigarg0))
  static PyObject *_wrap_wxGrid_SetRowLabelSize(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
  #define wxGrid_SetRowLabelSize(_swigobj,_swigarg0)  (_swigobj->SetRowLabelSize(_swigarg0))
  static PyObject *_wrap_wxGrid_SetRowLabelSize(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
@@ -8603,6 +9214,7 @@ static PyObject *_wrap_wxGrid_SetRowLabelSize(PyObject *self, PyObject *args, Py
          wxGrid_SetRowLabelSize(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetRowLabelSize(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -8631,6 +9243,7 @@ static PyObject *_wrap_wxGrid_SetColLabelSize(PyObject *self, PyObject *args, Py
          wxGrid_SetColLabelSize(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetColLabelSize(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -8666,6 +9279,7 @@ static PyObject *_wrap_wxGrid_SetLabelBackgroundColour(PyObject *self, PyObject
          wxGrid_SetLabelBackgroundColour(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetLabelBackgroundColour(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -8701,6 +9315,7 @@ static PyObject *_wrap_wxGrid_SetLabelTextColour(PyObject *self, PyObject *args,
          wxGrid_SetLabelTextColour(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetLabelTextColour(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -8737,6 +9352,7 @@ static PyObject *_wrap_wxGrid_SetLabelFont(PyObject *self, PyObject *args, PyObj
          wxGrid_SetLabelFont(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetLabelFont(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -8766,6 +9382,7 @@ static PyObject *_wrap_wxGrid_SetRowLabelAlignment(PyObject *self, PyObject *arg
          wxGrid_SetRowLabelAlignment(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetRowLabelAlignment(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -8795,6 +9412,7 @@ static PyObject *_wrap_wxGrid_SetColLabelAlignment(PyObject *self, PyObject *arg
          wxGrid_SetColLabelAlignment(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetColLabelAlignment(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -8821,17 +9439,29 @@ static PyObject *_wrap_wxGrid_SetRowLabelValue(PyObject *self, PyObject *args, P
          }
      }
  {
          }
      }
  {
+#if PYTHON_API_VERSION >= 1009
+    char* tmpPtr; int tmpSize;
+    if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
+        return NULL;
+    _arg2 = new wxString(tmpPtr, tmpSize);
+#else
      if (!PyString_Check(_obj2)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (!PyString_Check(_obj2)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
-    _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
+    _arg2 = new wxString(PyString_AS_STRING(_obj2), PyString_GET_SIZE(_obj2));
+#endif
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          wxGrid_SetRowLabelValue(_arg0,_arg1,*_arg2);
  
      wxPy_END_ALLOW_THREADS;
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          wxGrid_SetRowLabelValue(_arg0,_arg1,*_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
@@ -8862,17 +9492,29 @@ static PyObject *_wrap_wxGrid_SetColLabelValue(PyObject *self, PyObject *args, P
          }
      }
  {
          }
      }
  {
+#if PYTHON_API_VERSION >= 1009
+    char* tmpPtr; int tmpSize;
+    if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
+        return NULL;
+    _arg2 = new wxString(tmpPtr, tmpSize);
+#else
      if (!PyString_Check(_obj2)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (!PyString_Check(_obj2)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
-    _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
+    _arg2 = new wxString(PyString_AS_STRING(_obj2), PyString_GET_SIZE(_obj2));
+#endif
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          wxGrid_SetColLabelValue(_arg0,_arg1,*_arg2);
  
      wxPy_END_ALLOW_THREADS;
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          wxGrid_SetColLabelValue(_arg0,_arg1,*_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
@@ -8912,6 +9554,7 @@ static PyObject *_wrap_wxGrid_SetGridLineColour(PyObject *self, PyObject *args,
          wxGrid_SetGridLineColour(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetGridLineColour(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -8947,6 +9590,65 @@ static PyObject *_wrap_wxGrid_SetCellHighlightColour(PyObject *self, PyObject *a
          wxGrid_SetCellHighlightColour(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetCellHighlightColour(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxGrid_SetCellHighlightPenWidth(_swigobj,_swigarg0)  (_swigobj->SetCellHighlightPenWidth(_swigarg0))
+static PyObject *_wrap_wxGrid_SetCellHighlightPenWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxGrid * _arg0;
+    int  _arg1;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","width", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGrid_SetCellHighlightPenWidth",_kwnames,&_argo0,&_arg1)) 
+        return NULL;
+    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_SetCellHighlightPenWidth. Expected _wxGrid_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxGrid_SetCellHighlightPenWidth(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxGrid_SetCellHighlightROPenWidth(_swigobj,_swigarg0)  (_swigobj->SetCellHighlightROPenWidth(_swigarg0))
+static PyObject *_wrap_wxGrid_SetCellHighlightROPenWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxGrid * _arg0;
+    int  _arg1;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","width", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGrid_SetCellHighlightROPenWidth",_kwnames,&_argo0,&_arg1)) 
+        return NULL;
+    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_SetCellHighlightROPenWidth. Expected _wxGrid_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxGrid_SetCellHighlightROPenWidth(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -8977,6 +9679,7 @@ static PyObject *_wrap_wxGrid_EnableDragRowSize(PyObject *self, PyObject *args,
          wxGrid_EnableDragRowSize(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_EnableDragRowSize(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -9004,6 +9707,7 @@ static PyObject *_wrap_wxGrid_DisableDragRowSize(PyObject *self, PyObject *args,
          wxGrid_DisableDragRowSize(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_DisableDragRowSize(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -9032,6 +9736,7 @@ static PyObject *_wrap_wxGrid_CanDragRowSize(PyObject *self, PyObject *args, PyO
          _result = (bool )wxGrid_CanDragRowSize(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGrid_CanDragRowSize(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -9061,6 +9766,7 @@ static PyObject *_wrap_wxGrid_EnableDragColSize(PyObject *self, PyObject *args,
          wxGrid_EnableDragColSize(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_EnableDragColSize(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -9088,6 +9794,7 @@ static PyObject *_wrap_wxGrid_DisableDragColSize(PyObject *self, PyObject *args,
          wxGrid_DisableDragColSize(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_DisableDragColSize(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -9116,6 +9823,7 @@ static PyObject *_wrap_wxGrid_CanDragColSize(PyObject *self, PyObject *args, PyO
          _result = (bool )wxGrid_CanDragColSize(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGrid_CanDragColSize(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -9145,6 +9853,7 @@ static PyObject *_wrap_wxGrid_EnableDragGridSize(PyObject *self, PyObject *args,
          wxGrid_EnableDragGridSize(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_EnableDragGridSize(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -9172,6 +9881,7 @@ static PyObject *_wrap_wxGrid_DisableDragGridSize(PyObject *self, PyObject *args
          wxGrid_DisableDragGridSize(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_DisableDragGridSize(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -9200,6 +9910,7 @@ static PyObject *_wrap_wxGrid_CanDragGridSize(PyObject *self, PyObject *args, Py
          _result = (bool )wxGrid_CanDragGridSize(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGrid_CanDragGridSize(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -9236,6 +9947,7 @@ static PyObject *_wrap_wxGrid_SetRowAttr(PyObject *self, PyObject *args, PyObjec
          wxGrid_SetRowAttr(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetRowAttr(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -9273,6 +9985,7 @@ static PyObject *_wrap_wxGrid_SetColAttr(PyObject *self, PyObject *args, PyObjec
          wxGrid_SetColAttr(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetColAttr(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -9301,6 +10014,7 @@ static PyObject *_wrap_wxGrid_SetColFormatBool(PyObject *self, PyObject *args, P
          wxGrid_SetColFormatBool(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetColFormatBool(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -9329,6 +10043,7 @@ static PyObject *_wrap_wxGrid_SetColFormatNumber(PyObject *self, PyObject *args,
          wxGrid_SetColFormatNumber(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetColFormatNumber(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -9359,6 +10074,7 @@ static PyObject *_wrap_wxGrid_SetColFormatFloat(PyObject *self, PyObject *args,
          wxGrid_SetColFormatFloat(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetColFormatFloat(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -9385,17 +10101,29 @@ static PyObject *_wrap_wxGrid_SetColFormatCustom(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
+#if PYTHON_API_VERSION >= 1009
+    char* tmpPtr; int tmpSize;
+    if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
+        return NULL;
+    _arg2 = new wxString(tmpPtr, tmpSize);
+#else
      if (!PyString_Check(_obj2)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (!PyString_Check(_obj2)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
-    _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
+    _arg2 = new wxString(PyString_AS_STRING(_obj2), PyString_GET_SIZE(_obj2));
+#endif
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          wxGrid_SetColFormatCustom(_arg0,_arg1,*_arg2);
  
      wxPy_END_ALLOW_THREADS;
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          wxGrid_SetColFormatCustom(_arg0,_arg1,*_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
@@ -9430,6 +10158,7 @@ static PyObject *_wrap_wxGrid_EnableGridLines(PyObject *self, PyObject *args, Py
          wxGrid_EnableGridLines(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_EnableGridLines(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -9458,6 +10187,7 @@ static PyObject *_wrap_wxGrid_GridLinesEnabled(PyObject *self, PyObject *args, P
          _result = (bool )wxGrid_GridLinesEnabled(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGrid_GridLinesEnabled(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -9485,6 +10215,7 @@ static PyObject *_wrap_wxGrid_GetDefaultRowSize(PyObject *self, PyObject *args,
          _result = (int )wxGrid_GetDefaultRowSize(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (int )wxGrid_GetDefaultRowSize(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -9513,6 +10244,7 @@ static PyObject *_wrap_wxGrid_GetRowSize(PyObject *self, PyObject *args, PyObjec
          _result = (int )wxGrid_GetRowSize(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          _result = (int )wxGrid_GetRowSize(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -9540,6 +10272,7 @@ static PyObject *_wrap_wxGrid_GetDefaultColSize(PyObject *self, PyObject *args,
          _result = (int )wxGrid_GetDefaultColSize(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (int )wxGrid_GetDefaultColSize(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -9568,6 +10301,7 @@ static PyObject *_wrap_wxGrid_GetColSize(PyObject *self, PyObject *args, PyObjec
          _result = (int )wxGrid_GetColSize(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          _result = (int )wxGrid_GetColSize(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -9596,6 +10330,7 @@ static PyObject *_wrap_wxGrid_GetDefaultCellBackgroundColour(PyObject *self, PyO
          _result = new wxColour (wxGrid_GetDefaultCellBackgroundColour(_arg0));
  
      wxPy_END_ALLOW_THREADS;
          _result = new wxColour (wxGrid_GetDefaultCellBackgroundColour(_arg0));
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
@@ -9627,6 +10362,7 @@ static PyObject *_wrap_wxGrid_GetCellBackgroundColour(PyObject *self, PyObject *
          _result = new wxColour (wxGrid_GetCellBackgroundColour(_arg0,_arg1,_arg2));
  
      wxPy_END_ALLOW_THREADS;
          _result = new wxColour (wxGrid_GetCellBackgroundColour(_arg0,_arg1,_arg2));
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
@@ -9656,6 +10392,7 @@ static PyObject *_wrap_wxGrid_GetDefaultCellTextColour(PyObject *self, PyObject
          _result = new wxColour (wxGrid_GetDefaultCellTextColour(_arg0));
  
      wxPy_END_ALLOW_THREADS;
          _result = new wxColour (wxGrid_GetDefaultCellTextColour(_arg0));
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
@@ -9687,6 +10424,7 @@ static PyObject *_wrap_wxGrid_GetCellTextColour(PyObject *self, PyObject *args,
          _result = new wxColour (wxGrid_GetCellTextColour(_arg0,_arg1,_arg2));
  
      wxPy_END_ALLOW_THREADS;
          _result = new wxColour (wxGrid_GetCellTextColour(_arg0,_arg1,_arg2));
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
@@ -9716,6 +10454,7 @@ static PyObject *_wrap_wxGrid_GetDefaultCellFont(PyObject *self, PyObject *args,
          _result = new wxFont (wxGrid_GetDefaultCellFont(_arg0));
  
      wxPy_END_ALLOW_THREADS;
          _result = new wxFont (wxGrid_GetDefaultCellFont(_arg0));
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxFont_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxFont_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
@@ -9747,6 +10486,7 @@ static PyObject *_wrap_wxGrid_GetCellFont(PyObject *self, PyObject *args, PyObje
          _result = new wxFont (wxGrid_GetCellFont(_arg0,_arg1,_arg2));
  
      wxPy_END_ALLOW_THREADS;
          _result = new wxFont (wxGrid_GetCellFont(_arg0,_arg1,_arg2));
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxFont_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxFont_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
@@ -9792,6 +10532,7 @@ static PyObject *_wrap_wxGrid_GetDefaultCellAlignment(PyObject *self, PyObject *
          wxGrid_GetDefaultCellAlignment(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_GetDefaultCellAlignment(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -9839,6 +10580,7 @@ static PyObject *_wrap_wxGrid_GetCellAlignment(PyObject *self, PyObject *args, P
          wxGrid_GetCellAlignment(_arg0,_arg1,_arg2,_arg3,_arg4);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_GetCellAlignment(_arg0,_arg1,_arg2,_arg3,_arg4);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -9870,6 +10612,7 @@ static PyObject *_wrap_wxGrid_SetDefaultRowSize(PyObject *self, PyObject *args,
          wxGrid_SetDefaultRowSize(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetDefaultRowSize(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -9899,6 +10642,7 @@ static PyObject *_wrap_wxGrid_SetRowSize(PyObject *self, PyObject *args, PyObjec
          wxGrid_SetRowSize(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetRowSize(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -9930,6 +10674,7 @@ static PyObject *_wrap_wxGrid_SetDefaultColSize(PyObject *self, PyObject *args,
          wxGrid_SetDefaultColSize(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetDefaultColSize(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -9959,6 +10704,7 @@ static PyObject *_wrap_wxGrid_SetColSize(PyObject *self, PyObject *args, PyObjec
          wxGrid_SetColSize(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetColSize(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -9990,6 +10736,7 @@ static PyObject *_wrap_wxGrid_AutoSizeColumn(PyObject *self, PyObject *args, PyO
          wxGrid_AutoSizeColumn(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_AutoSizeColumn(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -10021,6 +10768,7 @@ static PyObject *_wrap_wxGrid_AutoSizeRow(PyObject *self, PyObject *args, PyObje
          wxGrid_AutoSizeRow(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_AutoSizeRow(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -10051,6 +10799,7 @@ static PyObject *_wrap_wxGrid_AutoSizeColumns(PyObject *self, PyObject *args, Py
          wxGrid_AutoSizeColumns(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_AutoSizeColumns(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -10081,6 +10830,7 @@ static PyObject *_wrap_wxGrid_AutoSizeRows(PyObject *self, PyObject *args, PyObj
          wxGrid_AutoSizeRows(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_AutoSizeRows(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -10108,6 +10858,7 @@ static PyObject *_wrap_wxGrid_AutoSize(PyObject *self, PyObject *args, PyObject
          wxGrid_AutoSize(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_AutoSize(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -10137,6 +10888,7 @@ static PyObject *_wrap_wxGrid_SetColMinimalWidth(PyObject *self, PyObject *args,
          wxGrid_SetColMinimalWidth(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetColMinimalWidth(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -10166,6 +10918,7 @@ static PyObject *_wrap_wxGrid_SetRowMinimalHeight(PyObject *self, PyObject *args
          wxGrid_SetRowMinimalHeight(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetRowMinimalHeight(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -10201,6 +10954,7 @@ static PyObject *_wrap_wxGrid_SetDefaultCellBackgroundColour(PyObject *self, PyO
          wxGrid_SetDefaultCellBackgroundColour(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetDefaultCellBackgroundColour(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -10238,6 +10992,7 @@ static PyObject *_wrap_wxGrid_SetCellBackgroundColour(PyObject *self, PyObject *
          wxGrid_SetCellBackgroundColour(_arg0,_arg1,_arg2,*_arg3);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetCellBackgroundColour(_arg0,_arg1,_arg2,*_arg3);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -10273,6 +11028,7 @@ static PyObject *_wrap_wxGrid_SetDefaultCellTextColour(PyObject *self, PyObject
          wxGrid_SetDefaultCellTextColour(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetDefaultCellTextColour(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -10310,6 +11066,7 @@ static PyObject *_wrap_wxGrid_SetCellTextColour(PyObject *self, PyObject *args,
          wxGrid_SetCellTextColour(_arg0,_arg1,_arg2,*_arg3);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetCellTextColour(_arg0,_arg1,_arg2,*_arg3);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -10346,6 +11103,7 @@ static PyObject *_wrap_wxGrid_SetDefaultCellFont(PyObject *self, PyObject *args,
          wxGrid_SetDefaultCellFont(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetDefaultCellFont(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -10384,6 +11142,7 @@ static PyObject *_wrap_wxGrid_SetCellFont(PyObject *self, PyObject *args, PyObje
          wxGrid_SetCellFont(_arg0,_arg1,_arg2,*_arg3);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetCellFont(_arg0,_arg1,_arg2,*_arg3);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -10413,6 +11172,7 @@ static PyObject *_wrap_wxGrid_SetDefaultCellAlignment(PyObject *self, PyObject *
          wxGrid_SetDefaultCellAlignment(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetDefaultCellAlignment(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -10444,6 +11204,7 @@ static PyObject *_wrap_wxGrid_SetCellAlignment(PyObject *self, PyObject *args, P
          wxGrid_SetCellAlignment(_arg0,_arg1,_arg2,_arg3,_arg4);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetCellAlignment(_arg0,_arg1,_arg2,_arg3,_arg4);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -10480,6 +11241,7 @@ static PyObject *_wrap_wxGrid_SetDefaultRenderer(PyObject *self, PyObject *args,
          wxGrid_SetDefaultRenderer(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetDefaultRenderer(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -10518,6 +11280,7 @@ static PyObject *_wrap_wxGrid_SetCellRenderer(PyObject *self, PyObject *args, Py
          wxGrid_SetCellRenderer(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetCellRenderer(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -10547,6 +11310,7 @@ static PyObject *_wrap_wxGrid_GetDefaultRenderer(PyObject *self, PyObject *args,
          _result = (wxGridCellRenderer *)wxGrid_GetDefaultRenderer(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxGridCellRenderer *)wxGrid_GetDefaultRenderer(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellRenderer_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellRenderer_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -10583,6 +11347,7 @@ static PyObject *_wrap_wxGrid_GetCellRenderer(PyObject *self, PyObject *args, Py
          _result = (wxGridCellRenderer *)wxGrid_GetCellRenderer(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxGridCellRenderer *)wxGrid_GetCellRenderer(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellRenderer_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellRenderer_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -10624,6 +11389,7 @@ static PyObject *_wrap_wxGrid_SetDefaultEditor(PyObject *self, PyObject *args, P
          wxGrid_SetDefaultEditor(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetDefaultEditor(_arg0,_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -10662,6 +11428,7 @@ static PyObject *_wrap_wxGrid_SetCellEditor(PyObject *self, PyObject *args, PyOb
          wxGrid_SetCellEditor(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetCellEditor(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -10691,6 +11458,7 @@ static PyObject *_wrap_wxGrid_GetDefaultEditor(PyObject *self, PyObject *args, P
          _result = (wxGridCellEditor *)wxGrid_GetDefaultEditor(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxGridCellEditor *)wxGrid_GetDefaultEditor(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellEditor_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellEditor_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -10727,6 +11495,7 @@ static PyObject *_wrap_wxGrid_GetCellEditor(PyObject *self, PyObject *args, PyOb
          _result = (wxGridCellEditor *)wxGrid_GetCellEditor(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxGridCellEditor *)wxGrid_GetCellEditor(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellEditor_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellEditor_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -10762,6 +11531,7 @@ static PyObject *_wrap_wxGrid_GetCellValue(PyObject *self, PyObject *args, PyObj
          _result = new wxString (wxGrid_GetCellValue(_arg0,_arg1,_arg2));
  
      wxPy_END_ALLOW_THREADS;
          _result = new wxString (wxGrid_GetCellValue(_arg0,_arg1,_arg2));
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
  }
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
  }
@@ -10793,17 +11563,29 @@ static PyObject *_wrap_wxGrid_SetCellValue(PyObject *self, PyObject *args, PyObj
          }
      }
  {
          }
      }
  {
+#if PYTHON_API_VERSION >= 1009
+    char* tmpPtr; int tmpSize;
+    if (!PyString_Check(_obj3) && !PyUnicode_Check(_obj3)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    if (PyString_AsStringAndSize(_obj3, &tmpPtr, &tmpSize) == -1)
+        return NULL;
+    _arg3 = new wxString(tmpPtr, tmpSize);
+#else
      if (!PyString_Check(_obj3)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (!PyString_Check(_obj3)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
-    _arg3 = new wxString(PyString_AsString(_obj3), PyString_Size(_obj3));
+    _arg3 = new wxString(PyString_AS_STRING(_obj3), PyString_GET_SIZE(_obj3));
+#endif
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          wxGrid_SetCellValue(_arg0,_arg1,_arg2,*_arg3);
  
      wxPy_END_ALLOW_THREADS;
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          wxGrid_SetCellValue(_arg0,_arg1,_arg2,*_arg3);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
@@ -10838,6 +11620,7 @@ static PyObject *_wrap_wxGrid_IsReadOnly(PyObject *self, PyObject *args, PyObjec
          _result = (bool )wxGrid_IsReadOnly(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGrid_IsReadOnly(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -10869,6 +11652,7 @@ static PyObject *_wrap_wxGrid_SetReadOnly(PyObject *self, PyObject *args, PyObje
          wxGrid_SetReadOnly(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetReadOnly(_arg0,_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -10900,6 +11684,7 @@ static PyObject *_wrap_wxGrid_SelectRow(PyObject *self, PyObject *args, PyObject
          wxGrid_SelectRow(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SelectRow(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -10931,6 +11716,7 @@ static PyObject *_wrap_wxGrid_SelectCol(PyObject *self, PyObject *args, PyObject
          wxGrid_SelectCol(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SelectCol(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -10965,6 +11751,7 @@ static PyObject *_wrap_wxGrid_SelectBlock(PyObject *self, PyObject *args, PyObje
          wxGrid_SelectBlock(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SelectBlock(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -10992,6 +11779,7 @@ static PyObject *_wrap_wxGrid_SelectAll(PyObject *self, PyObject *args, PyObject
          wxGrid_SelectAll(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SelectAll(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -11020,6 +11808,7 @@ static PyObject *_wrap_wxGrid_IsSelection(PyObject *self, PyObject *args, PyObje
          _result = (bool )wxGrid_IsSelection(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGrid_IsSelection(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -11046,6 +11835,7 @@ static PyObject *_wrap_wxGrid_ClearSelection(PyObject *self, PyObject *args, PyO
          wxGrid_ClearSelection(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_ClearSelection(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -11076,6 +11866,7 @@ static PyObject *_wrap_wxGrid_IsInSelection(PyObject *self, PyObject *args, PyOb
          _result = (bool )wxGrid_IsInSelection(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGrid_IsInSelection(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -11120,6 +11911,7 @@ static PyObject *_wrap_wxGrid_BlockToDeviceRect(PyObject *self, PyObject *args,
          _result = new wxRect (wxGrid_BlockToDeviceRect(_arg0,*_arg1,*_arg2));
  
      wxPy_END_ALLOW_THREADS;
          _result = new wxRect (wxGrid_BlockToDeviceRect(_arg0,*_arg1,*_arg2));
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxRect_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxRect_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
@@ -11149,6 +11941,7 @@ static PyObject *_wrap_wxGrid_GetSelectionBackground(PyObject *self, PyObject *a
          _result = new wxColour (wxGrid_GetSelectionBackground(_arg0));
  
      wxPy_END_ALLOW_THREADS;
          _result = new wxColour (wxGrid_GetSelectionBackground(_arg0));
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
@@ -11178,6 +11971,7 @@ static PyObject *_wrap_wxGrid_GetSelectionForeground(PyObject *self, PyObject *a
          _result = new wxColour (wxGrid_GetSelectionForeground(_arg0));
  
      wxPy_END_ALLOW_THREADS;
          _result = new wxColour (wxGrid_GetSelectionForeground(_arg0));
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
@@ -11213,6 +12007,7 @@ static PyObject *_wrap_wxGrid_SetSelectionBackground(PyObject *self, PyObject *a
          wxGrid_SetSelectionBackground(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetSelectionBackground(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -11248,6 +12043,7 @@ static PyObject *_wrap_wxGrid_SetSelectionForeground(PyObject *self, PyObject *a
          wxGrid_SetSelectionForeground(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetSelectionForeground(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -11277,11 +12073,22 @@ static PyObject *_wrap_wxGrid_RegisterDataType(PyObject *self, PyObject *args, P
          }
      }
  {
          }
      }
  {
+#if PYTHON_API_VERSION >= 1009
+    char* tmpPtr; int tmpSize;
+    if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1)
+        return NULL;
+    _arg1 = new wxString(tmpPtr, tmpSize);
+#else
      if (!PyString_Check(_obj1)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (!PyString_Check(_obj1)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
-    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
+    _arg1 = new wxString(PyString_AS_STRING(_obj1), PyString_GET_SIZE(_obj1));
+#endif
  }
      if (_argo2) {
          if (_argo2 == Py_None) { _arg2 = NULL; }
  }
      if (_argo2) {
          if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -11302,6 +12109,7 @@ static PyObject *_wrap_wxGrid_RegisterDataType(PyObject *self, PyObject *args, P
          wxGrid_RegisterDataType(_arg0,*_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_RegisterDataType(_arg0,*_arg1,_arg2,_arg3);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
  {
@@ -11337,6 +12145,7 @@ static PyObject *_wrap_wxGrid_GetDefaultEditorForCell(PyObject *self, PyObject *
          _result = (wxGridCellEditor *)wxGrid_GetDefaultEditorForCell(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxGridCellEditor *)wxGrid_GetDefaultEditorForCell(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellEditor_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellEditor_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -11373,6 +12182,7 @@ static PyObject *_wrap_wxGrid_GetDefaultRendererForCell(PyObject *self, PyObject
          _result = (wxGridCellRenderer *)wxGrid_GetDefaultRendererForCell(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxGridCellRenderer *)wxGrid_GetDefaultRendererForCell(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellRenderer_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellRenderer_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -11405,17 +12215,29 @@ static PyObject *_wrap_wxGrid_GetDefaultEditorForType(PyObject *self, PyObject *
          }
      }
  {
          }
      }
  {
+#if PYTHON_API_VERSION >= 1009
+    char* tmpPtr; int tmpSize;
+    if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1)
+        return NULL;
+    _arg1 = new wxString(tmpPtr, tmpSize);
+#else
      if (!PyString_Check(_obj1)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (!PyString_Check(_obj1)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
-    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
+    _arg1 = new wxString(PyString_AS_STRING(_obj1), PyString_GET_SIZE(_obj1));
+#endif
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          _result = (wxGridCellEditor *)wxGrid_GetDefaultEditorForType(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          _result = (wxGridCellEditor *)wxGrid_GetDefaultEditorForType(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellEditor_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellEditor_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -11452,17 +12274,29 @@ static PyObject *_wrap_wxGrid_GetDefaultRendererForType(PyObject *self, PyObject
          }
      }
  {
          }
      }
  {
+#if PYTHON_API_VERSION >= 1009
+    char* tmpPtr; int tmpSize;
+    if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1)
+        return NULL;
+    _arg1 = new wxString(tmpPtr, tmpSize);
+#else
      if (!PyString_Check(_obj1)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (!PyString_Check(_obj1)) {
          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
-    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
+    _arg1 = new wxString(PyString_AS_STRING(_obj1), PyString_GET_SIZE(_obj1));
+#endif
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          _result = (wxGridCellRenderer *)wxGrid_GetDefaultRendererForType(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
  }
  {
      wxPy_BEGIN_ALLOW_THREADS;
          _result = (wxGridCellRenderer *)wxGrid_GetDefaultRendererForType(_arg0,*_arg1);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellRenderer_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellRenderer_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -11501,11 +12335,124 @@ static PyObject *_wrap_wxGrid_SetMargins(PyObject *self, PyObject *args, PyObjec
          wxGrid_SetMargins(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
          wxGrid_SetMargins(_arg0,_arg1,_arg2);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }
  
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }
  
+#define wxGrid_GetGridWindow(_swigobj)  (_swigobj->GetGridWindow())
+static PyObject *_wrap_wxGrid_GetGridWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxWindow * _result;
+    wxGrid * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetGridWindow",_kwnames,&_argo0)) 
+        return NULL;
+    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_GetGridWindow. Expected _wxGrid_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxWindow *)wxGrid_GetGridWindow(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
+}{ _resultobj = wxPyMake_wxObject(_result); }
+    return _resultobj;
+}
+
+#define wxGrid_GetGridRowLabelWindow(_swigobj)  (_swigobj->GetGridRowLabelWindow())
+static PyObject *_wrap_wxGrid_GetGridRowLabelWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxWindow * _result;
+    wxGrid * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetGridRowLabelWindow",_kwnames,&_argo0)) 
+        return NULL;
+    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_GetGridRowLabelWindow. Expected _wxGrid_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxWindow *)wxGrid_GetGridRowLabelWindow(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
+}{ _resultobj = wxPyMake_wxObject(_result); }
+    return _resultobj;
+}
+
+#define wxGrid_GetGridColLabelWindow(_swigobj)  (_swigobj->GetGridColLabelWindow())
+static PyObject *_wrap_wxGrid_GetGridColLabelWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxWindow * _result;
+    wxGrid * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetGridColLabelWindow",_kwnames,&_argo0)) 
+        return NULL;
+    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_GetGridColLabelWindow. Expected _wxGrid_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxWindow *)wxGrid_GetGridColLabelWindow(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
+}{ _resultobj = wxPyMake_wxObject(_result); }
+    return _resultobj;
+}
+
+#define wxGrid_GetGridCornerLabelWindow(_swigobj)  (_swigobj->GetGridCornerLabelWindow())
+static PyObject *_wrap_wxGrid_GetGridCornerLabelWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxWindow * _result;
+    wxGrid * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetGridCornerLabelWindow",_kwnames,&_argo0)) 
+        return NULL;
+    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_GetGridCornerLabelWindow. Expected _wxGrid_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxWindow *)wxGrid_GetGridCornerLabelWindow(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
+}{ _resultobj = wxPyMake_wxObject(_result); }
+    return _resultobj;
+}
+
  static void *SwigwxGridEventTowxNotifyEvent(void *ptr) {
      wxGridEvent *src;
      wxNotifyEvent *dest;
  static void *SwigwxGridEventTowxNotifyEvent(void *ptr) {
      wxGridEvent *src;
      wxNotifyEvent *dest;
@@ -11530,6 +12477,14 @@ static void *SwigwxGridEventTowxEvent(void *ptr) {
      return (void *) dest;
  }
  
      return (void *) dest;
  }
  
+static void *SwigwxGridEventTowxObject(void *ptr) {
+    wxGridEvent *src;
+    wxObject *dest;
+    src = (wxGridEvent *) ptr;
+    dest = (wxObject *) src;
+    return (void *) dest;
+}
+
  #define new_wxGridEvent(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8,_swigarg9,_swigarg10,_swigarg11) (new wxGridEvent(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8,_swigarg9,_swigarg10,_swigarg11))
  static PyObject *_wrap_new_wxGridEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
  #define new_wxGridEvent(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8,_swigarg9,_swigarg10,_swigarg11) (new wxGridEvent(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8,_swigarg9,_swigarg10,_swigarg11))
  static PyObject *_wrap_new_wxGridEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
@@ -11575,6 +12530,7 @@ static PyObject *_wrap_new_wxGridEvent(PyObject *self, PyObject *args, PyObject
          _result = (wxGridEvent *)new_wxGridEvent(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8,_arg9,_arg10,_arg11);
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxGridEvent *)new_wxGridEvent(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8,_arg9,_arg10,_arg11);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridEvent_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridEvent_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -11608,6 +12564,7 @@ static PyObject *_wrap_wxGridEvent_GetRow(PyObject *self, PyObject *args, PyObje
          _result = (int )wxGridEvent_GetRow(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (int )wxGridEvent_GetRow(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -11635,6 +12592,7 @@ static PyObject *_wrap_wxGridEvent_GetCol(PyObject *self, PyObject *args, PyObje
          _result = (int )wxGridEvent_GetCol(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (int )wxGridEvent_GetCol(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -11663,6 +12621,7 @@ static PyObject *_wrap_wxGridEvent_GetPosition(PyObject *self, PyObject *args, P
          _result = new wxPoint (wxGridEvent_GetPosition(_arg0));
  
      wxPy_END_ALLOW_THREADS;
          _result = new wxPoint (wxGridEvent_GetPosition(_arg0));
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxPoint_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxPoint_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
@@ -11691,6 +12650,7 @@ static PyObject *_wrap_wxGridEvent_Selecting(PyObject *self, PyObject *args, PyO
          _result = (bool )wxGridEvent_Selecting(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGridEvent_Selecting(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -11718,6 +12678,7 @@ static PyObject *_wrap_wxGridEvent_ControlDown(PyObject *self, PyObject *args, P
          _result = (bool )wxGridEvent_ControlDown(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGridEvent_ControlDown(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -11745,6 +12706,7 @@ static PyObject *_wrap_wxGridEvent_MetaDown(PyObject *self, PyObject *args, PyOb
          _result = (bool )wxGridEvent_MetaDown(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGridEvent_MetaDown(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -11772,6 +12734,7 @@ static PyObject *_wrap_wxGridEvent_ShiftDown(PyObject *self, PyObject *args, PyO
          _result = (bool )wxGridEvent_ShiftDown(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGridEvent_ShiftDown(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -11799,6 +12762,7 @@ static PyObject *_wrap_wxGridEvent_AltDown(PyObject *self, PyObject *args, PyObj
          _result = (bool )wxGridEvent_AltDown(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGridEvent_AltDown(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -11827,6 +12791,14 @@ static void *SwigwxGridSizeEventTowxEvent(void *ptr) {
      return (void *) dest;
  }
  
      return (void *) dest;
  }
  
+static void *SwigwxGridSizeEventTowxObject(void *ptr) {
+    wxGridSizeEvent *src;
+    wxObject *dest;
+    src = (wxGridSizeEvent *) ptr;
+    dest = (wxObject *) src;
+    return (void *) dest;
+}
+
  #define new_wxGridSizeEvent(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8,_swigarg9) (new wxGridSizeEvent(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8,_swigarg9))
  static PyObject *_wrap_new_wxGridSizeEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
  #define new_wxGridSizeEvent(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8,_swigarg9) (new wxGridSizeEvent(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8,_swigarg9))
  static PyObject *_wrap_new_wxGridSizeEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
@@ -11868,6 +12840,7 @@ static PyObject *_wrap_new_wxGridSizeEvent(PyObject *self, PyObject *args, PyObj
          _result = (wxGridSizeEvent *)new_wxGridSizeEvent(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8,_arg9);
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxGridSizeEvent *)new_wxGridSizeEvent(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8,_arg9);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridSizeEvent_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridSizeEvent_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -11901,6 +12874,7 @@ static PyObject *_wrap_wxGridSizeEvent_GetRowOrCol(PyObject *self, PyObject *arg
          _result = (int )wxGridSizeEvent_GetRowOrCol(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (int )wxGridSizeEvent_GetRowOrCol(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -11929,6 +12903,7 @@ static PyObject *_wrap_wxGridSizeEvent_GetPosition(PyObject *self, PyObject *arg
          _result = new wxPoint (wxGridSizeEvent_GetPosition(_arg0));
  
      wxPy_END_ALLOW_THREADS;
          _result = new wxPoint (wxGridSizeEvent_GetPosition(_arg0));
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxPoint_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxPoint_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
@@ -11957,6 +12932,7 @@ static PyObject *_wrap_wxGridSizeEvent_ControlDown(PyObject *self, PyObject *arg
          _result = (bool )wxGridSizeEvent_ControlDown(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGridSizeEvent_ControlDown(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -11984,6 +12960,7 @@ static PyObject *_wrap_wxGridSizeEvent_MetaDown(PyObject *self, PyObject *args,
          _result = (bool )wxGridSizeEvent_MetaDown(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGridSizeEvent_MetaDown(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -12011,6 +12988,7 @@ static PyObject *_wrap_wxGridSizeEvent_ShiftDown(PyObject *self, PyObject *args,
          _result = (bool )wxGridSizeEvent_ShiftDown(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGridSizeEvent_ShiftDown(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -12038,6 +13016,7 @@ static PyObject *_wrap_wxGridSizeEvent_AltDown(PyObject *self, PyObject *args, P
          _result = (bool )wxGridSizeEvent_AltDown(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGridSizeEvent_AltDown(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -12066,6 +13045,14 @@ static void *SwigwxGridRangeSelectEventTowxEvent(void *ptr) {
      return (void *) dest;
  }
  
      return (void *) dest;
  }
  
+static void *SwigwxGridRangeSelectEventTowxObject(void *ptr) {
+    wxGridRangeSelectEvent *src;
+    wxObject *dest;
+    src = (wxGridRangeSelectEvent *) ptr;
+    dest = (wxObject *) src;
+    return (void *) dest;
+}
+
  #define new_wxGridRangeSelectEvent(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8,_swigarg9) (new wxGridRangeSelectEvent(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8,_swigarg9))
  static PyObject *_wrap_new_wxGridRangeSelectEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
  #define new_wxGridRangeSelectEvent(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8,_swigarg9) (new wxGridRangeSelectEvent(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8,_swigarg9))
  static PyObject *_wrap_new_wxGridRangeSelectEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
@@ -12123,6 +13110,7 @@ static PyObject *_wrap_new_wxGridRangeSelectEvent(PyObject *self, PyObject *args
          _result = (wxGridRangeSelectEvent *)new_wxGridRangeSelectEvent(_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5,_arg6,_arg7,_arg8,_arg9);
  
      wxPy_END_ALLOW_THREADS;
          _result = (wxGridRangeSelectEvent *)new_wxGridRangeSelectEvent(_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5,_arg6,_arg7,_arg8,_arg9);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridRangeSelectEvent_p");
          _resultobj = Py_BuildValue("s",_ptemp);
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridRangeSelectEvent_p");
          _resultobj = Py_BuildValue("s",_ptemp);
@@ -12157,6 +13145,7 @@ static PyObject *_wrap_wxGridRangeSelectEvent_GetTopLeftCoords(PyObject *self, P
          _result = new wxGridCellCoords (wxGridRangeSelectEvent_GetTopLeftCoords(_arg0));
  
      wxPy_END_ALLOW_THREADS;
          _result = new wxGridCellCoords (wxGridRangeSelectEvent_GetTopLeftCoords(_arg0));
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxGridCellCoords_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxGridCellCoords_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
@@ -12186,6 +13175,7 @@ static PyObject *_wrap_wxGridRangeSelectEvent_GetBottomRightCoords(PyObject *sel
          _result = new wxGridCellCoords (wxGridRangeSelectEvent_GetBottomRightCoords(_arg0));
  
      wxPy_END_ALLOW_THREADS;
          _result = new wxGridCellCoords (wxGridRangeSelectEvent_GetBottomRightCoords(_arg0));
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxGridCellCoords_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxGridCellCoords_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
@@ -12214,6 +13204,7 @@ static PyObject *_wrap_wxGridRangeSelectEvent_GetTopRow(PyObject *self, PyObject
          _result = (int )wxGridRangeSelectEvent_GetTopRow(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (int )wxGridRangeSelectEvent_GetTopRow(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -12241,6 +13232,7 @@ static PyObject *_wrap_wxGridRangeSelectEvent_GetBottomRow(PyObject *self, PyObj
          _result = (int )wxGridRangeSelectEvent_GetBottomRow(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (int )wxGridRangeSelectEvent_GetBottomRow(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -12268,6 +13260,7 @@ static PyObject *_wrap_wxGridRangeSelectEvent_GetLeftCol(PyObject *self, PyObjec
          _result = (int )wxGridRangeSelectEvent_GetLeftCol(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (int )wxGridRangeSelectEvent_GetLeftCol(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -12295,6 +13288,7 @@ static PyObject *_wrap_wxGridRangeSelectEvent_GetRightCol(PyObject *self, PyObje
          _result = (int )wxGridRangeSelectEvent_GetRightCol(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (int )wxGridRangeSelectEvent_GetRightCol(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -12322,6 +13316,7 @@ static PyObject *_wrap_wxGridRangeSelectEvent_Selecting(PyObject *self, PyObject
          _result = (bool )wxGridRangeSelectEvent_Selecting(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGridRangeSelectEvent_Selecting(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -12349,6 +13344,7 @@ static PyObject *_wrap_wxGridRangeSelectEvent_ControlDown(PyObject *self, PyObje
          _result = (bool )wxGridRangeSelectEvent_ControlDown(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGridRangeSelectEvent_ControlDown(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -12376,6 +13372,7 @@ static PyObject *_wrap_wxGridRangeSelectEvent_MetaDown(PyObject *self, PyObject
          _result = (bool )wxGridRangeSelectEvent_MetaDown(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGridRangeSelectEvent_MetaDown(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -12403,6 +13400,7 @@ static PyObject *_wrap_wxGridRangeSelectEvent_ShiftDown(PyObject *self, PyObject
          _result = (bool )wxGridRangeSelectEvent_ShiftDown(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGridRangeSelectEvent_ShiftDown(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
@@ -12430,11 +13428,270 @@ static PyObject *_wrap_wxGridRangeSelectEvent_AltDown(PyObject *self, PyObject *
          _result = (bool )wxGridRangeSelectEvent_AltDown(_arg0);
  
      wxPy_END_ALLOW_THREADS;
          _result = (bool )wxGridRangeSelectEvent_AltDown(_arg0);
  
      wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+static void *SwigwxGridEditorCreatedEventTowxCommandEvent(void *ptr) {
+    wxGridEditorCreatedEvent *src;
+    wxCommandEvent *dest;
+    src = (wxGridEditorCreatedEvent *) ptr;
+    dest = (wxCommandEvent *) src;
+    return (void *) dest;
+}
+
+static void *SwigwxGridEditorCreatedEventTowxEvent(void *ptr) {
+    wxGridEditorCreatedEvent *src;
+    wxEvent *dest;
+    src = (wxGridEditorCreatedEvent *) ptr;
+    dest = (wxEvent *) src;
+    return (void *) dest;
+}
+
+static void *SwigwxGridEditorCreatedEventTowxObject(void *ptr) {
+    wxGridEditorCreatedEvent *src;
+    wxObject *dest;
+    src = (wxGridEditorCreatedEvent *) ptr;
+    dest = (wxObject *) src;
+    return (void *) dest;
+}
+
+#define new_wxGridEditorCreatedEvent(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxGridEditorCreatedEvent(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
+static PyObject *_wrap_new_wxGridEditorCreatedEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxGridEditorCreatedEvent * _result;
+    int  _arg0;
+    wxEventType  _arg1;
+    wxObject * _arg2;
+    int  _arg3;
+    int  _arg4;
+    wxControl * _arg5;
+    PyObject * _argo2 = 0;
+    PyObject * _argo5 = 0;
+    char *_kwnames[] = { "id","type","obj","row","col","ctrl", NULL };
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiOiiO:new_wxGridEditorCreatedEvent",_kwnames,&_arg0,&_arg1,&_argo2,&_arg3,&_arg4,&_argo5)) 
+        return NULL;
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxObject_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxGridEditorCreatedEvent. Expected _wxObject_p.");
+        return NULL;
+        }
+    }
+    if (_argo5) {
+        if (_argo5 == Py_None) { _arg5 = NULL; }
+        else if (SWIG_GetPtrObj(_argo5,(void **) &_arg5,"_wxControl_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of new_wxGridEditorCreatedEvent. Expected _wxControl_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxGridEditorCreatedEvent *)new_wxGridEditorCreatedEvent(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5);
+
+    wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridEditorCreatedEvent_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
+    return _resultobj;
+}
+
+#define wxGridEditorCreatedEvent_GetRow(_swigobj)  (_swigobj->GetRow())
+static PyObject *_wrap_wxGridEditorCreatedEvent_GetRow(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    int  _result;
+    wxGridEditorCreatedEvent * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridEditorCreatedEvent_GetRow",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridEditorCreatedEvent_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEditorCreatedEvent_GetRow. Expected _wxGridEditorCreatedEvent_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (int )wxGridEditorCreatedEvent_GetRow(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxGridEditorCreatedEvent_GetCol(_swigobj)  (_swigobj->GetCol())
+static PyObject *_wrap_wxGridEditorCreatedEvent_GetCol(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    int  _result;
+    wxGridEditorCreatedEvent * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridEditorCreatedEvent_GetCol",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridEditorCreatedEvent_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEditorCreatedEvent_GetCol. Expected _wxGridEditorCreatedEvent_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (int )wxGridEditorCreatedEvent_GetCol(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
  }
  
+#define wxGridEditorCreatedEvent_GetControl(_swigobj)  (_swigobj->GetControl())
+static PyObject *_wrap_wxGridEditorCreatedEvent_GetControl(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxControl * _result;
+    wxGridEditorCreatedEvent * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridEditorCreatedEvent_GetControl",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridEditorCreatedEvent_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEditorCreatedEvent_GetControl. Expected _wxGridEditorCreatedEvent_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxControl *)wxGridEditorCreatedEvent_GetControl(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
+}{ _resultobj = wxPyMake_wxObject(_result); }
+    return _resultobj;
+}
+
+#define wxGridEditorCreatedEvent_SetRow(_swigobj,_swigarg0)  (_swigobj->SetRow(_swigarg0))
+static PyObject *_wrap_wxGridEditorCreatedEvent_SetRow(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxGridEditorCreatedEvent * _arg0;
+    int  _arg1;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","row", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGridEditorCreatedEvent_SetRow",_kwnames,&_argo0,&_arg1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridEditorCreatedEvent_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEditorCreatedEvent_SetRow. Expected _wxGridEditorCreatedEvent_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxGridEditorCreatedEvent_SetRow(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxGridEditorCreatedEvent_SetCol(_swigobj,_swigarg0)  (_swigobj->SetCol(_swigarg0))
+static PyObject *_wrap_wxGridEditorCreatedEvent_SetCol(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxGridEditorCreatedEvent * _arg0;
+    int  _arg1;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","col", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGridEditorCreatedEvent_SetCol",_kwnames,&_argo0,&_arg1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridEditorCreatedEvent_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEditorCreatedEvent_SetCol. Expected _wxGridEditorCreatedEvent_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxGridEditorCreatedEvent_SetCol(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxGridEditorCreatedEvent_SetControl(_swigobj,_swigarg0)  (_swigobj->SetControl(_swigarg0))
+static PyObject *_wrap_wxGridEditorCreatedEvent_SetControl(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxGridEditorCreatedEvent * _arg0;
+    wxControl * _arg1;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","ctrl", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxGridEditorCreatedEvent_SetControl",_kwnames,&_argo0,&_argo1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridEditorCreatedEvent_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEditorCreatedEvent_SetControl. Expected _wxGridEditorCreatedEvent_p.");
+        return NULL;
+        }
+    }
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxControl_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGridEditorCreatedEvent_SetControl. Expected _wxControl_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxGridEditorCreatedEvent_SetControl(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
  static PyMethodDef gridcMethods[] = {
  static PyMethodDef gridcMethods[] = {
+        { "wxGridEditorCreatedEvent_SetControl", (PyCFunction) _wrap_wxGridEditorCreatedEvent_SetControl, METH_VARARGS | METH_KEYWORDS },
+        { "wxGridEditorCreatedEvent_SetCol", (PyCFunction) _wrap_wxGridEditorCreatedEvent_SetCol, METH_VARARGS | METH_KEYWORDS },
+        { "wxGridEditorCreatedEvent_SetRow", (PyCFunction) _wrap_wxGridEditorCreatedEvent_SetRow, METH_VARARGS | METH_KEYWORDS },
+        { "wxGridEditorCreatedEvent_GetControl", (PyCFunction) _wrap_wxGridEditorCreatedEvent_GetControl, METH_VARARGS | METH_KEYWORDS },
+        { "wxGridEditorCreatedEvent_GetCol", (PyCFunction) _wrap_wxGridEditorCreatedEvent_GetCol, METH_VARARGS | METH_KEYWORDS },
+        { "wxGridEditorCreatedEvent_GetRow", (PyCFunction) _wrap_wxGridEditorCreatedEvent_GetRow, METH_VARARGS | METH_KEYWORDS },
+        { "new_wxGridEditorCreatedEvent", (PyCFunction) _wrap_new_wxGridEditorCreatedEvent, METH_VARARGS | METH_KEYWORDS },
          { "wxGridRangeSelectEvent_AltDown", (PyCFunction) _wrap_wxGridRangeSelectEvent_AltDown, METH_VARARGS | METH_KEYWORDS },
          { "wxGridRangeSelectEvent_ShiftDown", (PyCFunction) _wrap_wxGridRangeSelectEvent_ShiftDown, METH_VARARGS | METH_KEYWORDS },
          { "wxGridRangeSelectEvent_MetaDown", (PyCFunction) _wrap_wxGridRangeSelectEvent_MetaDown, METH_VARARGS | METH_KEYWORDS },
          { "wxGridRangeSelectEvent_AltDown", (PyCFunction) _wrap_wxGridRangeSelectEvent_AltDown, METH_VARARGS | METH_KEYWORDS },
          { "wxGridRangeSelectEvent_ShiftDown", (PyCFunction) _wrap_wxGridRangeSelectEvent_ShiftDown, METH_VARARGS | METH_KEYWORDS },
          { "wxGridRangeSelectEvent_MetaDown", (PyCFunction) _wrap_wxGridRangeSelectEvent_MetaDown, METH_VARARGS | METH_KEYWORDS },
@@ -12463,6 +13720,10 @@ static PyMethodDef gridcMethods[] = {
          { "wxGridEvent_GetCol", (PyCFunction) _wrap_wxGridEvent_GetCol, METH_VARARGS | METH_KEYWORDS },
          { "wxGridEvent_GetRow", (PyCFunction) _wrap_wxGridEvent_GetRow, METH_VARARGS | METH_KEYWORDS },
          { "new_wxGridEvent", (PyCFunction) _wrap_new_wxGridEvent, METH_VARARGS | METH_KEYWORDS },
          { "wxGridEvent_GetCol", (PyCFunction) _wrap_wxGridEvent_GetCol, METH_VARARGS | METH_KEYWORDS },
          { "wxGridEvent_GetRow", (PyCFunction) _wrap_wxGridEvent_GetRow, METH_VARARGS | METH_KEYWORDS },
          { "new_wxGridEvent", (PyCFunction) _wrap_new_wxGridEvent, METH_VARARGS | METH_KEYWORDS },
+        { "wxGrid_GetGridCornerLabelWindow", (PyCFunction) _wrap_wxGrid_GetGridCornerLabelWindow, METH_VARARGS | METH_KEYWORDS },
+        { "wxGrid_GetGridColLabelWindow", (PyCFunction) _wrap_wxGrid_GetGridColLabelWindow, METH_VARARGS | METH_KEYWORDS },
+        { "wxGrid_GetGridRowLabelWindow", (PyCFunction) _wrap_wxGrid_GetGridRowLabelWindow, METH_VARARGS | METH_KEYWORDS },
+        { "wxGrid_GetGridWindow", (PyCFunction) _wrap_wxGrid_GetGridWindow, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_SetMargins", (PyCFunction) _wrap_wxGrid_SetMargins, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_GetDefaultRendererForType", (PyCFunction) _wrap_wxGrid_GetDefaultRendererForType, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_GetDefaultEditorForType", (PyCFunction) _wrap_wxGrid_GetDefaultEditorForType, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_SetMargins", (PyCFunction) _wrap_wxGrid_SetMargins, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_GetDefaultRendererForType", (PyCFunction) _wrap_wxGrid_GetDefaultRendererForType, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_GetDefaultEditorForType", (PyCFunction) _wrap_wxGrid_GetDefaultEditorForType, METH_VARARGS | METH_KEYWORDS },
@@ -12541,6 +13802,8 @@ static PyMethodDef gridcMethods[] = {
          { "wxGrid_CanDragRowSize", (PyCFunction) _wrap_wxGrid_CanDragRowSize, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_DisableDragRowSize", (PyCFunction) _wrap_wxGrid_DisableDragRowSize, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_EnableDragRowSize", (PyCFunction) _wrap_wxGrid_EnableDragRowSize, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_CanDragRowSize", (PyCFunction) _wrap_wxGrid_CanDragRowSize, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_DisableDragRowSize", (PyCFunction) _wrap_wxGrid_DisableDragRowSize, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_EnableDragRowSize", (PyCFunction) _wrap_wxGrid_EnableDragRowSize, METH_VARARGS | METH_KEYWORDS },
+        { "wxGrid_SetCellHighlightROPenWidth", (PyCFunction) _wrap_wxGrid_SetCellHighlightROPenWidth, METH_VARARGS | METH_KEYWORDS },
+        { "wxGrid_SetCellHighlightPenWidth", (PyCFunction) _wrap_wxGrid_SetCellHighlightPenWidth, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_SetCellHighlightColour", (PyCFunction) _wrap_wxGrid_SetCellHighlightColour, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_SetGridLineColour", (PyCFunction) _wrap_wxGrid_SetGridLineColour, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_SetColLabelValue", (PyCFunction) _wrap_wxGrid_SetColLabelValue, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_SetCellHighlightColour", (PyCFunction) _wrap_wxGrid_SetCellHighlightColour, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_SetGridLineColour", (PyCFunction) _wrap_wxGrid_SetGridLineColour, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_SetColLabelValue", (PyCFunction) _wrap_wxGrid_SetColLabelValue, METH_VARARGS | METH_KEYWORDS },
@@ -12552,6 +13815,8 @@ static PyMethodDef gridcMethods[] = {
          { "wxGrid_SetLabelBackgroundColour", (PyCFunction) _wrap_wxGrid_SetLabelBackgroundColour, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_SetColLabelSize", (PyCFunction) _wrap_wxGrid_SetColLabelSize, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_SetRowLabelSize", (PyCFunction) _wrap_wxGrid_SetRowLabelSize, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_SetLabelBackgroundColour", (PyCFunction) _wrap_wxGrid_SetLabelBackgroundColour, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_SetColLabelSize", (PyCFunction) _wrap_wxGrid_SetColLabelSize, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_SetRowLabelSize", (PyCFunction) _wrap_wxGrid_SetRowLabelSize, METH_VARARGS | METH_KEYWORDS },
+        { "wxGrid_GetCellHighlightROPenWidth", (PyCFunction) _wrap_wxGrid_GetCellHighlightROPenWidth, METH_VARARGS | METH_KEYWORDS },
+        { "wxGrid_GetCellHighlightPenWidth", (PyCFunction) _wrap_wxGrid_GetCellHighlightPenWidth, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_GetCellHighlightColour", (PyCFunction) _wrap_wxGrid_GetCellHighlightColour, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_GetGridLineColour", (PyCFunction) _wrap_wxGrid_GetGridLineColour, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_GetColLabelValue", (PyCFunction) _wrap_wxGrid_GetColLabelValue, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_GetCellHighlightColour", (PyCFunction) _wrap_wxGrid_GetCellHighlightColour, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_GetGridLineColour", (PyCFunction) _wrap_wxGrid_GetGridLineColour, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_GetColLabelValue", (PyCFunction) _wrap_wxGrid_GetColLabelValue, METH_VARARGS | METH_KEYWORDS },
@@ -12597,6 +13862,7 @@ static PyMethodDef gridcMethods[] = {
          { "wxGrid_EnableCellEditControl", (PyCFunction) _wrap_wxGrid_EnableCellEditControl, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_EnableEditing", (PyCFunction) _wrap_wxGrid_EnableEditing, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_IsEditable", (PyCFunction) _wrap_wxGrid_IsEditable, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_EnableCellEditControl", (PyCFunction) _wrap_wxGrid_EnableCellEditControl, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_EnableEditing", (PyCFunction) _wrap_wxGrid_EnableEditing, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_IsEditable", (PyCFunction) _wrap_wxGrid_IsEditable, METH_VARARGS | METH_KEYWORDS },
+        { "wxGrid_ForceRefresh", (PyCFunction) _wrap_wxGrid_ForceRefresh, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_GetBatchCount", (PyCFunction) _wrap_wxGrid_GetBatchCount, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_EndBatch", (PyCFunction) _wrap_wxGrid_EndBatch, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_BeginBatch", (PyCFunction) _wrap_wxGrid_BeginBatch, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_GetBatchCount", (PyCFunction) _wrap_wxGrid_GetBatchCount, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_EndBatch", (PyCFunction) _wrap_wxGrid_EndBatch, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_BeginBatch", (PyCFunction) _wrap_wxGrid_BeginBatch, METH_VARARGS | METH_KEYWORDS },
@@ -12716,12 +13982,14 @@ static PyMethodDef gridcMethods[] = {
          { "wxGridCellAttr_GetFont", (PyCFunction) _wrap_wxGridCellAttr_GetFont, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellAttr_GetBackgroundColour", (PyCFunction) _wrap_wxGridCellAttr_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellAttr_GetTextColour", (PyCFunction) _wrap_wxGridCellAttr_GetTextColour, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellAttr_GetFont", (PyCFunction) _wrap_wxGridCellAttr_GetFont, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellAttr_GetBackgroundColour", (PyCFunction) _wrap_wxGridCellAttr_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellAttr_GetTextColour", (PyCFunction) _wrap_wxGridCellAttr_GetTextColour, METH_VARARGS | METH_KEYWORDS },
+        { "wxGridCellAttr_HasReadWriteMode", (PyCFunction) _wrap_wxGridCellAttr_HasReadWriteMode, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellAttr_HasEditor", (PyCFunction) _wrap_wxGridCellAttr_HasEditor, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellAttr_HasRenderer", (PyCFunction) _wrap_wxGridCellAttr_HasRenderer, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellAttr_HasAlignment", (PyCFunction) _wrap_wxGridCellAttr_HasAlignment, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellAttr_HasFont", (PyCFunction) _wrap_wxGridCellAttr_HasFont, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellAttr_HasBackgroundColour", (PyCFunction) _wrap_wxGridCellAttr_HasBackgroundColour, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellAttr_HasTextColour", (PyCFunction) _wrap_wxGridCellAttr_HasTextColour, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellAttr_HasEditor", (PyCFunction) _wrap_wxGridCellAttr_HasEditor, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellAttr_HasRenderer", (PyCFunction) _wrap_wxGridCellAttr_HasRenderer, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellAttr_HasAlignment", (PyCFunction) _wrap_wxGridCellAttr_HasAlignment, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellAttr_HasFont", (PyCFunction) _wrap_wxGridCellAttr_HasFont, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellAttr_HasBackgroundColour", (PyCFunction) _wrap_wxGridCellAttr_HasBackgroundColour, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellAttr_HasTextColour", (PyCFunction) _wrap_wxGridCellAttr_HasTextColour, METH_VARARGS | METH_KEYWORDS },
+        { "wxGridCellAttr_SetKind", (PyCFunction) _wrap_wxGridCellAttr_SetKind, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellAttr_SetEditor", (PyCFunction) _wrap_wxGridCellAttr_SetEditor, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellAttr_SetRenderer", (PyCFunction) _wrap_wxGridCellAttr_SetRenderer, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellAttr_SetReadOnly", (PyCFunction) _wrap_wxGridCellAttr_SetReadOnly, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellAttr_SetEditor", (PyCFunction) _wrap_wxGridCellAttr_SetEditor, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellAttr_SetRenderer", (PyCFunction) _wrap_wxGridCellAttr_SetRenderer, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellAttr_SetReadOnly", (PyCFunction) _wrap_wxGridCellAttr_SetReadOnly, METH_VARARGS | METH_KEYWORDS },
@@ -12731,6 +13999,7 @@ static PyMethodDef gridcMethods[] = {
          { "wxGridCellAttr_SetTextColour", (PyCFunction) _wrap_wxGridCellAttr_SetTextColour, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellAttr_DecRef", (PyCFunction) _wrap_wxGridCellAttr_DecRef, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellAttr_IncRef", (PyCFunction) _wrap_wxGridCellAttr_IncRef, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellAttr_SetTextColour", (PyCFunction) _wrap_wxGridCellAttr_SetTextColour, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellAttr_DecRef", (PyCFunction) _wrap_wxGridCellAttr_DecRef, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellAttr_IncRef", (PyCFunction) _wrap_wxGridCellAttr_IncRef, METH_VARARGS | METH_KEYWORDS },
+        { "wxGridCellAttr_MergeWith", (PyCFunction) _wrap_wxGridCellAttr_MergeWith, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellAttr_Clone", (PyCFunction) _wrap_wxGridCellAttr_Clone, METH_VARARGS | METH_KEYWORDS },
          { "new_wxGridCellAttr", (PyCFunction) _wrap_new_wxGridCellAttr, METH_VARARGS | METH_KEYWORDS },
          { "new_wxGridCellChoiceEditor", (PyCFunction) _wrap_new_wxGridCellChoiceEditor, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellAttr_Clone", (PyCFunction) _wrap_wxGridCellAttr_Clone, METH_VARARGS | METH_KEYWORDS },
          { "new_wxGridCellAttr", (PyCFunction) _wrap_new_wxGridCellAttr, METH_VARARGS | METH_KEYWORDS },
          { "new_wxGridCellChoiceEditor", (PyCFunction) _wrap_new_wxGridCellChoiceEditor, METH_VARARGS | METH_KEYWORDS },
@@ -12743,6 +14012,7 @@ static PyMethodDef gridcMethods[] = {
          { "wxPyGridCellEditor_base_HandleReturn", (PyCFunction) _wrap_wxPyGridCellEditor_base_HandleReturn, METH_VARARGS | METH_KEYWORDS },
          { "wxPyGridCellEditor_base_StartingClick", (PyCFunction) _wrap_wxPyGridCellEditor_base_StartingClick, METH_VARARGS | METH_KEYWORDS },
          { "wxPyGridCellEditor_base_StartingKey", (PyCFunction) _wrap_wxPyGridCellEditor_base_StartingKey, METH_VARARGS | METH_KEYWORDS },
          { "wxPyGridCellEditor_base_HandleReturn", (PyCFunction) _wrap_wxPyGridCellEditor_base_HandleReturn, METH_VARARGS | METH_KEYWORDS },
          { "wxPyGridCellEditor_base_StartingClick", (PyCFunction) _wrap_wxPyGridCellEditor_base_StartingClick, METH_VARARGS | METH_KEYWORDS },
          { "wxPyGridCellEditor_base_StartingKey", (PyCFunction) _wrap_wxPyGridCellEditor_base_StartingKey, METH_VARARGS | METH_KEYWORDS },
+        { "wxPyGridCellEditor_base_IsAcceptedKey", (PyCFunction) _wrap_wxPyGridCellEditor_base_IsAcceptedKey, METH_VARARGS | METH_KEYWORDS },
          { "wxPyGridCellEditor_base_PaintBackground", (PyCFunction) _wrap_wxPyGridCellEditor_base_PaintBackground, METH_VARARGS | METH_KEYWORDS },
          { "wxPyGridCellEditor_base_Show", (PyCFunction) _wrap_wxPyGridCellEditor_base_Show, METH_VARARGS | METH_KEYWORDS },
          { "wxPyGridCellEditor_base_SetSize", (PyCFunction) _wrap_wxPyGridCellEditor_base_SetSize, METH_VARARGS | METH_KEYWORDS },
          { "wxPyGridCellEditor_base_PaintBackground", (PyCFunction) _wrap_wxPyGridCellEditor_base_PaintBackground, METH_VARARGS | METH_KEYWORDS },
          { "wxPyGridCellEditor_base_Show", (PyCFunction) _wrap_wxPyGridCellEditor_base_Show, METH_VARARGS | METH_KEYWORDS },
          { "wxPyGridCellEditor_base_SetSize", (PyCFunction) _wrap_wxPyGridCellEditor_base_SetSize, METH_VARARGS | METH_KEYWORDS },
@@ -12793,33 +14063,11 @@ static PyMethodDef gridcMethods[] = {
   * This table is used by the pointer type-checker
   */
  static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
   * 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_wxGridRangeSelectEvent",SwigwxGridRangeSelectEventTowxEvent},
+    { "_wxEvent","_wxGridEditorCreatedEvent",SwigwxGridEditorCreatedEventTowxEvent},
      { "_wxEvent","_wxGridRangeSelectEvent",SwigwxGridRangeSelectEventTowxEvent},
      { "_wxEvent","_wxGridRangeSelectEvent",SwigwxGridRangeSelectEventTowxEvent},
-    { "_wxEvent","_class_wxGridSizeEvent",SwigwxGridSizeEventTowxEvent},
      { "_wxEvent","_wxGridSizeEvent",SwigwxGridSizeEventTowxEvent},
      { "_wxEvent","_wxGridSizeEvent",SwigwxGridSizeEventTowxEvent},
-    { "_wxEvent","_class_wxGridEvent",SwigwxGridEventTowxEvent},
      { "_wxEvent","_wxGridEvent",SwigwxGridEventTowxEvent},
      { "_wxEvent","_wxGridEvent",SwigwxGridEventTowxEvent},
-    { "_wxEvent","_class_wxEvent",0},
-    { "_class_wxActivateEvent","_wxActivateEvent",0},
      { "_signed_long","_long",0},
      { "_signed_long","_long",0},
-    { "_wxMenuEvent","_class_wxMenuEvent",0},
-    { "_class_wxGridCellRenderer","_class_wxGridCellBoolRenderer",SwigwxGridCellBoolRendererTowxGridCellRenderer},
-    { "_class_wxGridCellRenderer","_wxGridCellBoolRenderer",SwigwxGridCellBoolRendererTowxGridCellRenderer},
-    { "_class_wxGridCellRenderer","_class_wxGridCellFloatRenderer",SwigwxGridCellFloatRendererTowxGridCellRenderer},
-    { "_class_wxGridCellRenderer","_wxGridCellFloatRenderer",SwigwxGridCellFloatRendererTowxGridCellRenderer},
-    { "_class_wxGridCellRenderer","_class_wxGridCellNumberRenderer",SwigwxGridCellNumberRendererTowxGridCellRenderer},
-    { "_class_wxGridCellRenderer","_wxGridCellNumberRenderer",SwigwxGridCellNumberRendererTowxGridCellRenderer},
-    { "_class_wxGridCellRenderer","_class_wxGridCellStringRenderer",SwigwxGridCellStringRendererTowxGridCellRenderer},
-    { "_class_wxGridCellRenderer","_wxGridCellStringRenderer",SwigwxGridCellStringRendererTowxGridCellRenderer},
-    { "_class_wxGridCellRenderer","_class_wxPyGridCellRenderer",SwigwxPyGridCellRendererTowxGridCellRenderer},
-    { "_class_wxGridCellRenderer","_wxPyGridCellRenderer",SwigwxPyGridCellRendererTowxGridCellRenderer},
-    { "_class_wxGridCellRenderer","_wxGridCellRenderer",0},
-    { "_wxPyBitmapDataObject","_class_wxPyBitmapDataObject",0},
-    { "_wxGridCellChoiceEditor","_class_wxGridCellChoiceEditor",0},
-    { "_wxGridSizeEvent","_class_wxGridSizeEvent",0},
-    { "_wxBitmapDataObject","_class_wxBitmapDataObject",0},
-    { "_class_wxPyCommandEvent","_wxPyCommandEvent",0},
      { "_wxPrintQuality","_WXGRIDSELECTIONMODES",0},
      { "_wxPrintQuality","_wxCoord",0},
      { "_wxPrintQuality","_int",0},
      { "_wxPrintQuality","_WXGRIDSELECTIONMODES",0},
      { "_wxPrintQuality","_wxCoord",0},
      { "_wxPrintQuality","_int",0},
@@ -12830,54 +14078,12 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
      { "_wxPrintQuality","_EBool",0},
      { "_wxPrintQuality","_size_t",0},
      { "_wxPrintQuality","_time_t",0},
      { "_wxPrintQuality","_EBool",0},
      { "_wxPrintQuality","_size_t",0},
      { "_wxPrintQuality","_time_t",0},
-    { "_class_wxCustomDataObject","_wxCustomDataObject",0},
-    { "_wxSpinCtrl","_class_wxSpinCtrl",0},
-    { "_class_wxRegionIterator","_wxRegionIterator",0},
-    { "_class_wxPyTextDropTarget","_wxPyTextDropTarget",0},
-    { "_class_wxMenuBar","_wxMenuBar",0},
-    { "_class_wxPyGridCellEditor","_wxPyGridCellEditor",0},
-    { "_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_wxGridRangeSelectEvent",SwigwxGridRangeSelectEventTowxNotifyEvent},
      { "_wxNotifyEvent","_wxGridRangeSelectEvent",SwigwxGridRangeSelectEventTowxNotifyEvent},
      { "_wxNotifyEvent","_wxGridRangeSelectEvent",SwigwxGridRangeSelectEventTowxNotifyEvent},
-    { "_wxNotifyEvent","_class_wxGridSizeEvent",SwigwxGridSizeEventTowxNotifyEvent},
      { "_wxNotifyEvent","_wxGridSizeEvent",SwigwxGridSizeEventTowxNotifyEvent},
      { "_wxNotifyEvent","_wxGridSizeEvent",SwigwxGridSizeEventTowxNotifyEvent},
-    { "_wxNotifyEvent","_class_wxGridEvent",SwigwxGridEventTowxNotifyEvent},
      { "_wxNotifyEvent","_wxGridEvent",SwigwxGridEventTowxNotifyEvent},
      { "_wxNotifyEvent","_wxGridEvent",SwigwxGridEventTowxNotifyEvent},
-    { "_wxNotifyEvent","_class_wxNotifyEvent",0},
-    { "_wxMask","_class_wxMask",0},
-    { "_wxGridCellNumberEditor","_class_wxGridCellNumberEditor",0},
-    { "_wxGrid","_class_wxGrid",0},
-    { "_wxPen","_class_wxPen",0},
-    { "_wxUpdateUIEvent","_class_wxUpdateUIEvent",0},
      { "_byte","_unsigned_char",0},
      { "_byte","_unsigned_char",0},
-    { "_wxDataObject","_class_wxDataObject",0},
-    { "_wxStaticBox","_class_wxStaticBox",0},
-    { "_wxPyDataObjectSimple","_class_wxPyDataObjectSimple",0},
-    { "_wxPyDropSource","_class_wxPyDropSource",0},
-    { "_wxChoice","_class_wxChoice",0},
-    { "_wxSlider","_class_wxSlider",0},
-    { "_wxGridTableMessage","_class_wxGridTableMessage",0},
      { "_long","_unsigned_long",0},
      { "_long","_signed_long",0},
      { "_long","_unsigned_long",0},
      { "_long","_signed_long",0},
-    { "_wxImageList","_class_wxImageList",0},
-    { "_wxDataObjectSimple","_class_wxDataObjectSimple",0},
-    { "_wxDropFilesEvent","_class_wxDropFilesEvent",0},
-    { "_wxBitmapButton","_class_wxBitmapButton",0},
-    { "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
-    { "_class_wxClipboard","_wxClipboard",0},
-    { "_class_wxGauge","_wxGauge",0},
-    { "_wxGridCellCoords","_class_wxGridCellCoords",0},
-    { "_wxGridCellNumberRenderer","_class_wxGridCellNumberRenderer",0},
-    { "_wxDC","_class_wxDC",0},
-    { "_class_wxGridSizeEvent","_wxGridSizeEvent",0},
-    { "_class_wxBitmapDataObject","_wxBitmapDataObject",0},
-    { "_class_wxGridCellBoolEditor","_wxGridCellBoolEditor",0},
-    { "_wxSpinEvent","_class_wxSpinEvent",0},
      { "_size_t","_WXGRIDSELECTIONMODES",0},
      { "_size_t","_wxCoord",0},
      { "_size_t","_wxPrintQuality",0},
      { "_size_t","_WXGRIDSELECTIONMODES",0},
      { "_size_t","_wxCoord",0},
      { "_size_t","_wxPrintQuality",0},
@@ -12886,38 +14092,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
      { "_size_t","_int",0},
      { "_size_t","_wxWindowID",0},
      { "_size_t","_uint",0},
      { "_size_t","_int",0},
      { "_size_t","_wxWindowID",0},
      { "_size_t","_uint",0},
-    { "_class_wxRealPoint","_wxRealPoint",0},
-    { "_wxNavigationKeyEvent","_class_wxNavigationKeyEvent",0},
-    { "_class_wxGridRangeSelectEvent","_wxGridRangeSelectEvent",0},
-    { "_wxPrinterDC","_class_wxPrinterDC",0},
-    { "_wxWindowCreateEvent","_class_wxWindowCreateEvent",0},
-    { "_class_wxMenuItem","_wxMenuItem",0},
-    { "_class_wxPaintEvent","_wxPaintEvent",0},
-    { "_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0},
-    { "_wxPanel","_class_wxGrid",SwigwxGridTowxPanel},
      { "_wxPanel","_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},
-    { "_wxTextDataObject","_class_wxTextDataObject",0},
-    { "_class_wxKeyEvent","_wxKeyEvent",0},
-    { "_class_wxGrid","_wxGrid",0},
-    { "_wxColour","_class_wxColour",0},
-    { "_class_wxDialog","_wxDialog",0},
-    { "_class_wxFileDataObject","_wxFileDataObject",0},
-    { "_wxIdleEvent","_class_wxIdleEvent",0},
-    { "_class_wxUpdateUIEvent","_wxUpdateUIEvent",0},
-    { "_class_wxDataObject","_wxDataObject",0},
-    { "_wxStaticLine","_class_wxStaticLine",0},
-    { "_wxBrush","_class_wxBrush",0},
-    { "_class_wxGridTableMessage","_wxGridTableMessage",0},
-    { "_wxDataFormat","_class_wxDataFormat",0},
-    { "_class_wxDataObjectSimple","_wxDataObjectSimple",0},
-    { "_class_wxGridCellAttr","_wxGridCellAttr",0},
-    { "_wxShowEvent","_class_wxShowEvent",0},
      { "_uint","_WXGRIDSELECTIONMODES",0},
      { "_uint","_wxCoord",0},
      { "_uint","_wxPrintQuality",0},
      { "_uint","_WXGRIDSELECTIONMODES",0},
      { "_uint","_wxCoord",0},
      { "_uint","_wxPrintQuality",0},
@@ -12927,91 +14102,22 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
      { "_uint","_int",0},
      { "_uint","_wxWindowID",0},
      { "_wxChar","_char",0},
      { "_uint","_int",0},
      { "_uint","_wxWindowID",0},
      { "_wxChar","_char",0},
-    { "_wxPyValidator","_class_wxPyValidator",0},
-    { "_class_wxEvent","_class_wxGridRangeSelectEvent",SwigwxGridRangeSelectEventTowxEvent},
-    { "_class_wxEvent","_wxGridRangeSelectEvent",SwigwxGridRangeSelectEventTowxEvent},
-    { "_class_wxEvent","_class_wxGridSizeEvent",SwigwxGridSizeEventTowxEvent},
-    { "_class_wxEvent","_wxGridSizeEvent",SwigwxGridSizeEventTowxEvent},
-    { "_class_wxEvent","_class_wxGridEvent",SwigwxGridEventTowxEvent},
-    { "_class_wxEvent","_wxGridEvent",SwigwxGridEventTowxEvent},
-    { "_class_wxEvent","_wxEvent",0},
-    { "_wxCheckListBox","_class_wxCheckListBox",0},
-    { "_class_wxGridCellNumberRenderer","_wxGridCellNumberRenderer",0},
-    { "_wxGridEvent","_class_wxGridEvent",0},
-    { "_wxRect","_class_wxRect",0},
-    { "_wxCommandEvent","_class_wxGridRangeSelectEvent",SwigwxGridRangeSelectEventTowxCommandEvent},
+    { "_wxCommandEvent","_wxGridEditorCreatedEvent",SwigwxGridEditorCreatedEventTowxCommandEvent},
      { "_wxCommandEvent","_wxGridRangeSelectEvent",SwigwxGridRangeSelectEventTowxCommandEvent},
      { "_wxCommandEvent","_wxGridRangeSelectEvent",SwigwxGridRangeSelectEventTowxCommandEvent},
-    { "_wxCommandEvent","_class_wxGridSizeEvent",SwigwxGridSizeEventTowxCommandEvent},
      { "_wxCommandEvent","_wxGridSizeEvent",SwigwxGridSizeEventTowxCommandEvent},
      { "_wxCommandEvent","_wxGridSizeEvent",SwigwxGridSizeEventTowxCommandEvent},
-    { "_wxCommandEvent","_class_wxGridEvent",SwigwxGridEventTowxCommandEvent},
      { "_wxCommandEvent","_wxGridEvent",SwigwxGridEventTowxCommandEvent},
      { "_wxCommandEvent","_wxGridEvent",SwigwxGridEventTowxCommandEvent},
-    { "_wxCommandEvent","_class_wxCommandEvent",0},
-    { "_class_wxGridCellChoiceEditor","_wxGridCellChoiceEditor",0},
-    { "_wxSizeEvent","_class_wxSizeEvent",0},
-    { "_wxPoint","_class_wxPoint",0},
-    { "_class_wxButton","_wxButton",0},
-    { "_wxRadioBox","_class_wxRadioBox",0},
-    { "_class_wxSpinCtrl","_wxSpinCtrl",0},
      { "_char","_wxChar",0},
      { "_char","_wxChar",0},
-    { "_wxBitmap","_class_wxBitmap",0},
-    { "_wxGridCellStringRenderer","_class_wxGridCellFloatRenderer",SwigwxGridCellFloatRendererTowxGridCellStringRenderer},
      { "_wxGridCellStringRenderer","_wxGridCellFloatRenderer",SwigwxGridCellFloatRendererTowxGridCellStringRenderer},
      { "_wxGridCellStringRenderer","_wxGridCellFloatRenderer",SwigwxGridCellFloatRendererTowxGridCellStringRenderer},
-    { "_wxGridCellStringRenderer","_class_wxGridCellNumberRenderer",SwigwxGridCellNumberRendererTowxGridCellStringRenderer},
      { "_wxGridCellStringRenderer","_wxGridCellNumberRenderer",SwigwxGridCellNumberRendererTowxGridCellStringRenderer},
      { "_wxGridCellStringRenderer","_wxGridCellNumberRenderer",SwigwxGridCellNumberRendererTowxGridCellStringRenderer},
-    { "_wxGridCellStringRenderer","_class_wxGridCellStringRenderer",0},
-    { "_wxPyGridTableBase","_class_wxPyGridTableBase",0},
-    { "_wxWindowDC","_class_wxWindowDC",0},
-    { "_wxTimerEvent","_class_wxTimerEvent",0},
-    { "_wxScrollBar","_class_wxScrollBar",0},
-    { "_wxSpinButton","_class_wxSpinButton",0},
-    { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
-    { "_class_wxNotifyEvent","_class_wxGridRangeSelectEvent",SwigwxGridRangeSelectEventTowxNotifyEvent},
-    { "_class_wxNotifyEvent","_wxGridRangeSelectEvent",SwigwxGridRangeSelectEventTowxNotifyEvent},
-    { "_class_wxNotifyEvent","_class_wxGridSizeEvent",SwigwxGridSizeEventTowxNotifyEvent},
-    { "_class_wxNotifyEvent","_wxGridSizeEvent",SwigwxGridSizeEventTowxNotifyEvent},
-    { "_class_wxNotifyEvent","_class_wxGridEvent",SwigwxGridEventTowxNotifyEvent},
-    { "_class_wxNotifyEvent","_wxGridEvent",SwigwxGridEventTowxNotifyEvent},
-    { "_class_wxNotifyEvent","_wxNotifyEvent",0},
-    { "_class_wxValidator","_wxValidator",0},
-    { "_class_wxPyEvent","_wxPyEvent",0},
-    { "_class_wxIconizeEvent","_wxIconizeEvent",0},
-    { "_class_wxStaticBitmap","_wxStaticBitmap",0},
-    { "_class_wxGridCellNumberEditor","_wxGridCellNumberEditor",0},
-    { "_wxDropTarget","_class_wxDropTarget",0},
-    { "_class_wxStaticLine","_wxStaticLine",0},
-    { "_wxPyGridCellAttrProvider","_class_wxPyGridCellAttrProvider",0},
-    { "_wxScrollEvent","_class_wxScrollEvent",0},
-    { "_wxGridTableBase","_class_wxGridStringTable",SwigwxGridStringTableTowxGridTableBase},
      { "_wxGridTableBase","_wxGridStringTable",SwigwxGridStringTableTowxGridTableBase},
      { "_wxGridTableBase","_wxGridStringTable",SwigwxGridStringTableTowxGridTableBase},
-    { "_wxGridTableBase","_class_wxPyGridTableBase",SwigwxPyGridTableBaseTowxGridTableBase},
      { "_wxGridTableBase","_wxPyGridTableBase",SwigwxPyGridTableBaseTowxGridTableBase},
      { "_wxGridTableBase","_wxPyGridTableBase",SwigwxPyGridTableBaseTowxGridTableBase},
-    { "_wxGridTableBase","_class_wxGridTableBase",0},
-    { "_wxGridStringTable","_class_wxGridStringTable",0},
      { "_EBool","_WXGRIDSELECTIONMODES",0},
      { "_EBool","_wxCoord",0},
      { "_EBool","_wxPrintQuality",0},
      { "_EBool","_signed_int",0},
      { "_EBool","_int",0},
      { "_EBool","_wxWindowID",0},
      { "_EBool","_WXGRIDSELECTIONMODES",0},
      { "_EBool","_wxCoord",0},
      { "_EBool","_wxPrintQuality",0},
      { "_EBool","_signed_int",0},
      { "_EBool","_int",0},
      { "_EBool","_wxWindowID",0},
-    { "_class_wxRegion","_wxRegion",0},
-    { "_class_wxDataFormat","_wxDataFormat",0},
-    { "_class_wxDropFilesEvent","_wxDropFilesEvent",0},
-    { "_wxWindowDestroyEvent","_class_wxWindowDestroyEvent",0},
-    { "_wxStaticText","_class_wxStaticText",0},
-    { "_wxFont","_class_wxFont",0},
-    { "_class_wxPyDropTarget","_wxPyDropTarget",0},
-    { "_wxCloseEvent","_class_wxCloseEvent",0},
-    { "_class_wxPyGridCellRenderer","_wxPyGridCellRenderer",0},
-    { "_class_wxGridCellCoords","_wxGridCellCoords",0},
-    { "_class_wxGridCellTextEditor","_class_wxGridCellFloatEditor",SwigwxGridCellFloatEditorTowxGridCellTextEditor},
-    { "_class_wxGridCellTextEditor","_wxGridCellFloatEditor",SwigwxGridCellFloatEditorTowxGridCellTextEditor},
-    { "_class_wxGridCellTextEditor","_class_wxGridCellNumberEditor",SwigwxGridCellNumberEditorTowxGridCellTextEditor},
-    { "_class_wxGridCellTextEditor","_wxGridCellNumberEditor",SwigwxGridCellNumberEditorTowxGridCellTextEditor},
-    { "_class_wxGridCellTextEditor","_wxGridCellTextEditor",0},
      { "_unsigned_long","_long",0},
      { "_unsigned_long","_long",0},
-    { "_class_wxRect","_wxRect",0},
-    { "_class_wxDC","_wxDC",0},
-    { "_wxScrollWinEvent","_class_wxScrollWinEvent",0},
      { "_WXGRIDSELECTIONMODES","_int",0},
      { "_WXGRIDSELECTIONMODES","_signed_int",0},
      { "_WXGRIDSELECTIONMODES","_unsigned_int",0},
      { "_WXGRIDSELECTIONMODES","_int",0},
      { "_WXGRIDSELECTIONMODES","_signed_int",0},
      { "_WXGRIDSELECTIONMODES","_unsigned_int",0},
@@ -13022,106 +14128,36 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
      { "_WXGRIDSELECTIONMODES","_time_t",0},
      { "_WXGRIDSELECTIONMODES","_wxPrintQuality",0},
      { "_WXGRIDSELECTIONMODES","_wxCoord",0},
      { "_WXGRIDSELECTIONMODES","_time_t",0},
      { "_WXGRIDSELECTIONMODES","_wxPrintQuality",0},
      { "_WXGRIDSELECTIONMODES","_wxCoord",0},
-    { "_wxQueryNewPaletteEvent","_class_wxQueryNewPaletteEvent",0},
-    { "_class_wxWindowCreateEvent","_wxWindowCreateEvent",0},
-    { "_class_wxGridCellStringRenderer","_class_wxGridCellFloatRenderer",SwigwxGridCellFloatRendererTowxGridCellStringRenderer},
-    { "_class_wxGridCellStringRenderer","_wxGridCellFloatRenderer",SwigwxGridCellFloatRendererTowxGridCellStringRenderer},
-    { "_class_wxGridCellStringRenderer","_class_wxGridCellNumberRenderer",SwigwxGridCellNumberRendererTowxGridCellStringRenderer},
-    { "_class_wxGridCellStringRenderer","_wxGridCellNumberRenderer",SwigwxGridCellNumberRendererTowxGridCellStringRenderer},
-    { "_class_wxGridCellStringRenderer","_wxGridCellStringRenderer",0},
-    { "_class_wxGridCellFloatRenderer","_wxGridCellFloatRenderer",0},
-    { "_wxFocusEvent","_class_wxFocusEvent",0},
-    { "_wxMaximizeEvent","_class_wxMaximizeEvent",0},
-    { "_class_wxTimerEvent","_wxTimerEvent",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","_WXGRIDSELECTIONMODES",0},
      { "_signed_int","_wxCoord",0},
      { "_signed_int","_wxPrintQuality",0},
      { "_signed_int","_EBool",0},
      { "_signed_int","_wxWindowID",0},
      { "_signed_int","_int",0},
      { "_signed_int","_WXGRIDSELECTIONMODES",0},
      { "_signed_int","_wxCoord",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},
-    { "_class_wxTextDataObject","_wxTextDataObject",0},
-    { "_wxMenu","_class_wxMenu",0},
-    { "_class_wxMoveEvent","_wxMoveEvent",0},
-    { "_wxListBox","_class_wxListBox",0},
-    { "_wxGridCellEditor","_class_wxGridCellChoiceEditor",SwigwxGridCellChoiceEditorTowxGridCellEditor},
      { "_wxGridCellEditor","_wxGridCellChoiceEditor",SwigwxGridCellChoiceEditorTowxGridCellEditor},
      { "_wxGridCellEditor","_wxGridCellChoiceEditor",SwigwxGridCellChoiceEditorTowxGridCellEditor},
-    { "_wxGridCellEditor","_class_wxGridCellBoolEditor",SwigwxGridCellBoolEditorTowxGridCellEditor},
      { "_wxGridCellEditor","_wxGridCellBoolEditor",SwigwxGridCellBoolEditorTowxGridCellEditor},
      { "_wxGridCellEditor","_wxGridCellBoolEditor",SwigwxGridCellBoolEditorTowxGridCellEditor},
-    { "_wxGridCellEditor","_class_wxGridCellFloatEditor",SwigwxGridCellFloatEditorTowxGridCellEditor},
      { "_wxGridCellEditor","_wxGridCellFloatEditor",SwigwxGridCellFloatEditorTowxGridCellEditor},
      { "_wxGridCellEditor","_wxGridCellFloatEditor",SwigwxGridCellFloatEditorTowxGridCellEditor},
-    { "_wxGridCellEditor","_class_wxGridCellNumberEditor",SwigwxGridCellNumberEditorTowxGridCellEditor},
      { "_wxGridCellEditor","_wxGridCellNumberEditor",SwigwxGridCellNumberEditorTowxGridCellEditor},
      { "_wxGridCellEditor","_wxGridCellNumberEditor",SwigwxGridCellNumberEditorTowxGridCellEditor},
-    { "_wxGridCellEditor","_class_wxGridCellTextEditor",SwigwxGridCellTextEditorTowxGridCellEditor},
      { "_wxGridCellEditor","_wxGridCellTextEditor",SwigwxGridCellTextEditorTowxGridCellEditor},
      { "_wxGridCellEditor","_wxGridCellTextEditor",SwigwxGridCellTextEditorTowxGridCellEditor},
-    { "_wxGridCellEditor","_class_wxPyGridCellEditor",SwigwxPyGridCellEditorTowxGridCellEditor},
      { "_wxGridCellEditor","_wxPyGridCellEditor",SwigwxPyGridCellEditorTowxGridCellEditor},
      { "_wxGridCellEditor","_wxPyGridCellEditor",SwigwxPyGridCellEditorTowxGridCellEditor},
-    { "_wxGridCellEditor","_class_wxGridCellEditor",0},
-    { "_wxScreenDC","_class_wxScreenDC",0},
      { "_WXTYPE","_short",0},
      { "_WXTYPE","_signed_short",0},
      { "_WXTYPE","_unsigned_short",0},
      { "_WXTYPE","_short",0},
      { "_WXTYPE","_signed_short",0},
      { "_WXTYPE","_unsigned_short",0},
-    { "_wxGridCellAttrProvider","_class_wxPyGridCellAttrProvider",SwigwxPyGridCellAttrProviderTowxGridCellAttrProvider},
      { "_wxGridCellAttrProvider","_wxPyGridCellAttrProvider",SwigwxPyGridCellAttrProviderTowxGridCellAttrProvider},
      { "_wxGridCellAttrProvider","_wxPyGridCellAttrProvider",SwigwxPyGridCellAttrProviderTowxGridCellAttrProvider},
-    { "_wxGridCellAttrProvider","_class_wxGridCellAttrProvider",0},
-    { "_class_wxDropTarget","_wxDropTarget",0},
-    { "_wxGridCellFloatEditor","_class_wxGridCellFloatEditor",0},
-    { "_class_wxPyGridCellAttrProvider","_wxPyGridCellAttrProvider",0},
-    { "_class_wxBrush","_wxBrush",0},
-    { "_class_wxGridTableBase","_class_wxGridStringTable",SwigwxGridStringTableTowxGridTableBase},
-    { "_class_wxGridTableBase","_wxGridStringTable",SwigwxGridStringTableTowxGridTableBase},
-    { "_class_wxGridTableBase","_class_wxPyGridTableBase",SwigwxPyGridTableBaseTowxGridTableBase},
-    { "_class_wxGridTableBase","_wxPyGridTableBase",SwigwxPyGridTableBaseTowxGridTableBase},
-    { "_class_wxGridTableBase","_wxGridTableBase",0},
      { "_unsigned_short","_WXTYPE",0},
      { "_unsigned_short","_short",0},
      { "_unsigned_short","_WXTYPE",0},
      { "_unsigned_short","_short",0},
-    { "_class_wxWindow","_class_wxGrid",SwigwxGridTowxWindow},
-    { "_class_wxWindow","_wxGrid",SwigwxGridTowxWindow},
-    { "_class_wxWindow","_wxWindow",0},
-    { "_class_wxStaticText","_wxStaticText",0},
-    { "_class_wxFont","_wxFont",0},
-    { "_wxClipboard","_class_wxClipboard",0},
-    { "_class_wxPyValidator","_wxPyValidator",0},
-    { "_class_wxCloseEvent","_wxCloseEvent",0},
-    { "_wxBusyInfo","_class_wxBusyInfo",0},
-    { "_class_wxMenuEvent","_wxMenuEvent",0},
-    { "_wxPaletteChangedEvent","_class_wxPaletteChangedEvent",0},
-    { "_class_wxPyBitmapDataObject","_wxPyBitmapDataObject",0},
-    { "_wxClientDC","_class_wxClientDC",0},
-    { "_wxMouseEvent","_class_wxMouseEvent",0},
-    { "_wxGridCellBoolEditor","_class_wxGridCellBoolEditor",0},
-    { "_class_wxPoint","_wxPoint",0},
-    { "_wxRealPoint","_class_wxRealPoint",0},
-    { "_class_wxRadioBox","_wxRadioBox",0},
+    { "_wxObject","_wxGridEditorCreatedEvent",SwigwxGridEditorCreatedEventTowxObject},
+    { "_wxObject","_wxGridRangeSelectEvent",SwigwxGridRangeSelectEventTowxObject},
+    { "_wxObject","_wxGridSizeEvent",SwigwxGridSizeEventTowxObject},
+    { "_wxObject","_wxGridEvent",SwigwxGridEventTowxObject},
+    { "_wxObject","_wxGrid",SwigwxGridTowxObject},
+    { "_wxObject","_wxGridStringTable",SwigwxGridStringTableTowxObject},
+    { "_wxObject","_wxPyGridTableBase",SwigwxPyGridTableBaseTowxObject},
+    { "_wxObject","_wxGridTableBase",SwigwxGridTableBaseTowxObject},
      { "_signed_short","_WXTYPE",0},
      { "_signed_short","_short",0},
      { "_signed_short","_WXTYPE",0},
      { "_signed_short","_short",0},
-    { "_wxMemoryDC","_class_wxMemoryDC",0},
-    { "_wxPyTextDataObject","_class_wxPyTextDataObject",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},
-    { "_wxPyFileDropTarget","_class_wxPyFileDropTarget",0},
-    { "_wxScrolledWindow","_class_wxGrid",SwigwxGridTowxScrolledWindow},
      { "_wxScrolledWindow","_wxGrid",SwigwxGridTowxScrolledWindow},
      { "_wxScrolledWindow","_wxGrid",SwigwxGridTowxScrolledWindow},
-    { "_wxScrolledWindow","_class_wxScrolledWindow",0},
      { "_unsigned_char","_byte",0},
      { "_unsigned_char","_byte",0},
-    { "_class_wxMetaFileDC","_wxMetaFileDC",0},
-    { "_class_wxMenu","_wxMenu",0},
-    { "_wxControl","_class_wxControl",0},
-    { "_class_wxListBox","_wxListBox",0},
      { "_unsigned_int","_WXGRIDSELECTIONMODES",0},
      { "_unsigned_int","_wxCoord",0},
      { "_unsigned_int","_wxPrintQuality",0},
      { "_unsigned_int","_WXGRIDSELECTIONMODES",0},
      { "_unsigned_int","_wxCoord",0},
      { "_unsigned_int","_wxPrintQuality",0},
@@ -13130,25 +14166,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
      { "_unsigned_int","_uint",0},
      { "_unsigned_int","_wxWindowID",0},
      { "_unsigned_int","_int",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},
-    { "_wxGridCellBoolRenderer","_class_wxGridCellBoolRenderer",0},
      { "_short","_WXTYPE",0},
      { "_short","_unsigned_short",0},
      { "_short","_signed_short",0},
      { "_short","_WXTYPE",0},
      { "_short","_unsigned_short",0},
      { "_short","_signed_short",0},
-    { "_class_wxStaticBox","_wxStaticBox",0},
-    { "_class_wxGridCellFloatEditor","_wxGridCellFloatEditor",0},
-    { "_class_wxPyDataObjectSimple","_wxPyDataObjectSimple",0},
-    { "_class_wxPyDropSource","_wxPyDropSource",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},
-    { "_wxGridCellAttr","_class_wxGridCellAttr",0},
-    { "_class_wxPaletteChangedEvent","_wxPaletteChangedEvent",0},
      { "_wxWindowID","_WXGRIDSELECTIONMODES",0},
      { "_wxWindowID","_wxCoord",0},
      { "_wxWindowID","_wxPrintQuality",0},
      { "_wxWindowID","_WXGRIDSELECTIONMODES",0},
      { "_wxWindowID","_wxCoord",0},
      { "_wxWindowID","_wxPrintQuality",0},
@@ -13159,7 +14179,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
      { "_wxWindowID","_int",0},
      { "_wxWindowID","_signed_int",0},
      { "_wxWindowID","_unsigned_int",0},
      { "_wxWindowID","_int",0},
      { "_wxWindowID","_signed_int",0},
      { "_wxWindowID","_unsigned_int",0},
-    { "_class_wxScrollWinEvent","_wxScrollWinEvent",0},
      { "_int","_WXGRIDSELECTIONMODES",0},
      { "_int","_wxCoord",0},
      { "_int","_wxPrintQuality",0},
      { "_int","_WXGRIDSELECTIONMODES",0},
      { "_int","_wxCoord",0},
      { "_int","_wxPrintQuality",0},
@@ -13170,10 +14189,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
      { "_int","_wxWindowID",0},
      { "_int","_unsigned_int",0},
      { "_int","_signed_int",0},
      { "_int","_wxWindowID",0},
      { "_int","_unsigned_int",0},
      { "_int","_signed_int",0},
-    { "_class_wxMouseEvent","_wxMouseEvent",0},
-    { "_wxPyCommandEvent","_class_wxPyCommandEvent",0},
-    { "_class_wxSpinEvent","_wxSpinEvent",0},
-    { "_class_wxQueryNewPaletteEvent","_wxQueryNewPaletteEvent",0},
      { "_time_t","_WXGRIDSELECTIONMODES",0},
      { "_time_t","_wxCoord",0},
      { "_time_t","_wxPrintQuality",0},
      { "_time_t","_WXGRIDSELECTIONMODES",0},
      { "_time_t","_wxCoord",0},
      { "_time_t","_wxPrintQuality",0},
@@ -13182,44 +14197,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
      { "_time_t","_wxWindowID",0},
      { "_time_t","_uint",0},
      { "_time_t","_size_t",0},
      { "_time_t","_wxWindowID",0},
      { "_time_t","_uint",0},
      { "_time_t","_size_t",0},
-    { "_class_wxNavigationKeyEvent","_wxNavigationKeyEvent",0},
-    { "_wxButton","_class_wxButton",0},
-    { "_wxSize","_class_wxSize",0},
-    { "_wxRegionIterator","_class_wxRegionIterator",0},
-    { "_class_wxPrinterDC","_wxPrinterDC",0},
-    { "_class_wxPyTextDataObject","_wxPyTextDataObject",0},
-    { "_class_wxPaintDC","_wxPaintDC",0},
-    { "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0},
-    { "_class_wxPyFileDropTarget","_wxPyFileDropTarget",0},
-    { "_class_wxInitDialogEvent","_wxInitDialogEvent",0},
-    { "_class_wxComboBox","_wxComboBox",0},
-    { "_class_wxRadioButton","_wxRadioButton",0},
-    { "_wxValidator","_class_wxValidator",0},
-    { "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
-    { "_wxIconizeEvent","_class_wxIconizeEvent",0},
-    { "_class_wxControl","_wxControl",0},
-    { "_wxStaticBitmap","_class_wxStaticBitmap",0},
-    { "_class_wxGridCellEditor","_class_wxGridCellChoiceEditor",SwigwxGridCellChoiceEditorTowxGridCellEditor},
-    { "_class_wxGridCellEditor","_wxGridCellChoiceEditor",SwigwxGridCellChoiceEditorTowxGridCellEditor},
-    { "_class_wxGridCellEditor","_class_wxGridCellBoolEditor",SwigwxGridCellBoolEditorTowxGridCellEditor},
-    { "_class_wxGridCellEditor","_wxGridCellBoolEditor",SwigwxGridCellBoolEditorTowxGridCellEditor},
-    { "_class_wxGridCellEditor","_class_wxGridCellFloatEditor",SwigwxGridCellFloatEditorTowxGridCellEditor},
-    { "_class_wxGridCellEditor","_wxGridCellFloatEditor",SwigwxGridCellFloatEditorTowxGridCellEditor},
-    { "_class_wxGridCellEditor","_class_wxGridCellNumberEditor",SwigwxGridCellNumberEditorTowxGridCellEditor},
-    { "_class_wxGridCellEditor","_wxGridCellNumberEditor",SwigwxGridCellNumberEditorTowxGridCellEditor},
-    { "_class_wxGridCellEditor","_class_wxGridCellTextEditor",SwigwxGridCellTextEditorTowxGridCellEditor},
-    { "_class_wxGridCellEditor","_wxGridCellTextEditor",SwigwxGridCellTextEditorTowxGridCellEditor},
-    { "_class_wxGridCellEditor","_class_wxPyGridCellEditor",SwigwxPyGridCellEditorTowxGridCellEditor},
-    { "_class_wxGridCellEditor","_wxPyGridCellEditor",SwigwxPyGridCellEditorTowxGridCellEditor},
-    { "_class_wxGridCellEditor","_wxGridCellEditor",0},
-    { "_class_wxIcon","_wxIcon",0},
-    { "_class_wxColour","_wxColour",0},
-    { "_class_wxScreenDC","_wxScreenDC",0},
-    { "_wxPalette","_class_wxPalette",0},
-    { "_class_wxIdleEvent","_wxIdleEvent",0},
-    { "_class_wxGridCellAttrProvider","_class_wxPyGridCellAttrProvider",SwigwxPyGridCellAttrProviderTowxGridCellAttrProvider},
-    { "_class_wxGridCellAttrProvider","_wxPyGridCellAttrProvider",SwigwxPyGridCellAttrProviderTowxGridCellAttrProvider},
-    { "_class_wxGridCellAttrProvider","_wxGridCellAttrProvider",0},
      { "_wxCoord","_WXGRIDSELECTIONMODES",0},
      { "_wxCoord","_int",0},
      { "_wxCoord","_signed_int",0},
      { "_wxCoord","_WXGRIDSELECTIONMODES",0},
      { "_wxCoord","_int",0},
      { "_wxCoord","_signed_int",0},
@@ -13230,73 +14207,15 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
      { "_wxCoord","_size_t",0},
      { "_wxCoord","_time_t",0},
      { "_wxCoord","_wxPrintQuality",0},
      { "_wxCoord","_size_t",0},
      { "_wxCoord","_time_t",0},
      { "_wxCoord","_wxPrintQuality",0},
-    { "_wxEraseEvent","_class_wxEraseEvent",0},
-    { "_wxDataObjectComposite","_class_wxDataObjectComposite",0},
-    { "_class_wxJoystickEvent","_wxJoystickEvent",0},
-    { "_wxRegion","_class_wxRegion",0},
-    { "_class_wxShowEvent","_wxShowEvent",0},
-    { "_wxPyDropTarget","_class_wxPyDropTarget",0},
-    { "_wxActivateEvent","_class_wxActivateEvent",0},
-    { "_wxGauge","_class_wxGauge",0},
-    { "_class_wxCheckListBox","_wxCheckListBox",0},
-    { "_wxPyGridCellRenderer","_class_wxPyGridCellRenderer",0},
-    { "_class_wxBusyInfo","_wxBusyInfo",0},
-    { "_wxGridCellRenderer","_class_wxGridCellBoolRenderer",SwigwxGridCellBoolRendererTowxGridCellRenderer},
      { "_wxGridCellRenderer","_wxGridCellBoolRenderer",SwigwxGridCellBoolRendererTowxGridCellRenderer},
      { "_wxGridCellRenderer","_wxGridCellBoolRenderer",SwigwxGridCellBoolRendererTowxGridCellRenderer},
-    { "_wxGridCellRenderer","_class_wxGridCellFloatRenderer",SwigwxGridCellFloatRendererTowxGridCellRenderer},
      { "_wxGridCellRenderer","_wxGridCellFloatRenderer",SwigwxGridCellFloatRendererTowxGridCellRenderer},
      { "_wxGridCellRenderer","_wxGridCellFloatRenderer",SwigwxGridCellFloatRendererTowxGridCellRenderer},
-    { "_wxGridCellRenderer","_class_wxGridCellNumberRenderer",SwigwxGridCellNumberRendererTowxGridCellRenderer},
      { "_wxGridCellRenderer","_wxGridCellNumberRenderer",SwigwxGridCellNumberRendererTowxGridCellRenderer},
      { "_wxGridCellRenderer","_wxGridCellNumberRenderer",SwigwxGridCellNumberRendererTowxGridCellRenderer},
-    { "_wxGridCellRenderer","_class_wxGridCellStringRenderer",SwigwxGridCellStringRendererTowxGridCellRenderer},
      { "_wxGridCellRenderer","_wxGridCellStringRenderer",SwigwxGridCellStringRendererTowxGridCellRenderer},
      { "_wxGridCellRenderer","_wxGridCellStringRenderer",SwigwxGridCellStringRendererTowxGridCellRenderer},
-    { "_wxGridCellRenderer","_class_wxPyGridCellRenderer",SwigwxPyGridCellRendererTowxGridCellRenderer},
      { "_wxGridCellRenderer","_wxPyGridCellRenderer",SwigwxPyGridCellRendererTowxGridCellRenderer},
      { "_wxGridCellRenderer","_wxPyGridCellRenderer",SwigwxPyGridCellRendererTowxGridCellRenderer},
-    { "_wxGridCellRenderer","_class_wxGridCellRenderer",0},
-    { "_wxGridCellTextEditor","_class_wxGridCellFloatEditor",SwigwxGridCellFloatEditorTowxGridCellTextEditor},
      { "_wxGridCellTextEditor","_wxGridCellFloatEditor",SwigwxGridCellFloatEditorTowxGridCellTextEditor},
      { "_wxGridCellTextEditor","_wxGridCellFloatEditor",SwigwxGridCellFloatEditorTowxGridCellTextEditor},
-    { "_wxGridCellTextEditor","_class_wxGridCellNumberEditor",SwigwxGridCellNumberEditorTowxGridCellTextEditor},
      { "_wxGridCellTextEditor","_wxGridCellNumberEditor",SwigwxGridCellNumberEditorTowxGridCellTextEditor},
      { "_wxGridCellTextEditor","_wxGridCellNumberEditor",SwigwxGridCellNumberEditorTowxGridCellTextEditor},
-    { "_wxGridCellTextEditor","_class_wxGridCellTextEditor",0},
-    { "_class_wxGridEvent","_wxGridEvent",0},
-    { "_class_wxCommandEvent","_class_wxGridRangeSelectEvent",SwigwxGridRangeSelectEventTowxCommandEvent},
-    { "_class_wxCommandEvent","_wxGridRangeSelectEvent",SwigwxGridRangeSelectEventTowxCommandEvent},
-    { "_class_wxCommandEvent","_class_wxGridSizeEvent",SwigwxGridSizeEventTowxCommandEvent},
-    { "_class_wxCommandEvent","_wxGridSizeEvent",SwigwxGridSizeEventTowxCommandEvent},
-    { "_class_wxCommandEvent","_class_wxGridEvent",SwigwxGridEventTowxCommandEvent},
-    { "_class_wxCommandEvent","_wxGridEvent",SwigwxGridEventTowxCommandEvent},
-    { "_class_wxCommandEvent","_wxCommandEvent",0},
-    { "_class_wxClientDC","_wxClientDC",0},
-    { "_class_wxSizeEvent","_wxSizeEvent",0},
-    { "_wxCustomDataObject","_class_wxCustomDataObject",0},
-    { "_wxGridRangeSelectEvent","_class_wxGridRangeSelectEvent",0},
-    { "_class_wxSize","_wxSize",0},
-    { "_class_wxBitmap","_wxBitmap",0},
-    { "_class_wxMemoryDC","_wxMemoryDC",0},
-    { "_wxPyTextDropTarget","_class_wxPyTextDropTarget",0},
-    { "_wxMenuBar","_class_wxMenuBar",0},
-    { "_wxGridCellFloatRenderer","_class_wxGridCellFloatRenderer",0},
-    { "_wxPyGridCellEditor","_class_wxPyGridCellEditor",0},
-    { "_class_wxPyGridTableBase","_wxPyGridTableBase",0},
-    { "_wxEvtHandler","_class_wxGrid",SwigwxGridTowxEvtHandler},
      { "_wxEvtHandler","_wxGrid",SwigwxGridTowxEvtHandler},
      { "_wxEvtHandler","_wxGrid",SwigwxGridTowxEvtHandler},
-    { "_wxEvtHandler","_class_wxEvtHandler",0},
-    { "_wxMenuItem","_class_wxMenuItem",0},
-    { "_class_wxScrollBar","_wxScrollBar",0},
-    { "_class_wxScrolledWindow","_class_wxGrid",SwigwxGridTowxScrolledWindow},
-    { "_class_wxScrolledWindow","_wxGrid",SwigwxGridTowxScrolledWindow},
-    { "_class_wxScrolledWindow","_wxScrolledWindow",0},
-    { "_wxKeyEvent","_class_wxKeyEvent",0},
-    { "_wxMoveEvent","_class_wxMoveEvent",0},
-    { "_class_wxPalette","_wxPalette",0},
-    { "_wxFileDataObject","_class_wxFileDataObject",0},
-    { "_class_wxGridCellBoolRenderer","_wxGridCellBoolRenderer",0},
-    { "_class_wxEraseEvent","_wxEraseEvent",0},
-    { "_class_wxDataObjectComposite","_wxDataObjectComposite",0},
-    { "_class_wxGridStringTable","_wxGridStringTable",0},
-    { "_wxWindow","_class_wxGrid",SwigwxGridTowxWindow},
      { "_wxWindow","_wxGrid",SwigwxGridTowxWindow},
      { "_wxWindow","_wxGrid",SwigwxGridTowxWindow},
-    { "_wxWindow","_class_wxWindow",0},
-    { "_class_wxWindowDestroyEvent","_wxWindowDestroyEvent",0},
  {0,0,0}};
  
  static PyObject *SWIG_globals;
  {0,0,0}};
  
  static PyObject *SWIG_globals;
@@ -13341,6 +14260,16 @@ SWIGEXPORT(void) initgridc() {
          PyDict_SetItemString(d,"wxEVT_GRID_SELECT_CELL", PyInt_FromLong((long) wxEVT_GRID_SELECT_CELL));
          PyDict_SetItemString(d,"wxEVT_GRID_EDITOR_SHOWN", PyInt_FromLong((long) wxEVT_GRID_EDITOR_SHOWN));
          PyDict_SetItemString(d,"wxEVT_GRID_EDITOR_HIDDEN", PyInt_FromLong((long) wxEVT_GRID_EDITOR_HIDDEN));
          PyDict_SetItemString(d,"wxEVT_GRID_SELECT_CELL", PyInt_FromLong((long) wxEVT_GRID_SELECT_CELL));
          PyDict_SetItemString(d,"wxEVT_GRID_EDITOR_SHOWN", PyInt_FromLong((long) wxEVT_GRID_EDITOR_SHOWN));
          PyDict_SetItemString(d,"wxEVT_GRID_EDITOR_HIDDEN", PyInt_FromLong((long) wxEVT_GRID_EDITOR_HIDDEN));
+        PyDict_SetItemString(d,"wxEVT_GRID_EDITOR_CREATED", PyInt_FromLong((long) wxEVT_GRID_EDITOR_CREATED));
+
+    wxClassInfo::CleanUpClasses();
+    wxClassInfo::InitializeClasses();
+        PyDict_SetItemString(d,"wxGridCellAttr_Any", PyInt_FromLong((long) wxGridCellAttr::Any));
+        PyDict_SetItemString(d,"wxGridCellAttr_Default", PyInt_FromLong((long) wxGridCellAttr::Default));
+        PyDict_SetItemString(d,"wxGridCellAttr_Cell", PyInt_FromLong((long) wxGridCellAttr::Cell));
+        PyDict_SetItemString(d,"wxGridCellAttr_Row", PyInt_FromLong((long) wxGridCellAttr::Row));
+        PyDict_SetItemString(d,"wxGridCellAttr_Col", PyInt_FromLong((long) wxGridCellAttr::Col));
+        PyDict_SetItemString(d,"wxGridCellAttr_Merged", PyInt_FromLong((long) wxGridCellAttr::Merged));
          PyDict_SetItemString(d,"wxGrid_wxGridSelectCells", PyInt_FromLong((long) wxGrid::wxGridSelectCells));
          PyDict_SetItemString(d,"wxGrid_wxGridSelectRows", PyInt_FromLong((long) wxGrid::wxGridSelectRows));
          PyDict_SetItemString(d,"wxGrid_wxGridSelectColumns", PyInt_FromLong((long) wxGrid::wxGridSelectColumns));
          PyDict_SetItemString(d,"wxGrid_wxGridSelectCells", PyInt_FromLong((long) wxGrid::wxGridSelectCells));
          PyDict_SetItemString(d,"wxGrid_wxGridSelectRows", PyInt_FromLong((long) wxGrid::wxGridSelectRows));
          PyDict_SetItemString(d,"wxGrid_wxGridSelectColumns", PyInt_FromLong((long) wxGrid::wxGridSelectColumns));