hopefully fixes focus assertion

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

index 636d9c0c46b2bd29ff9259c73791a6e1e2e9976b..b65d674a27a9d763bb394af61e77909be86fc88a 100644 (file)
--- a/wxPython/src/msw/grid.cpp
+++ b/wxPython/src/msw/grid.cpp
@@ -55,432 +55,439 @@ 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>
+#include <wx/generic/gridctrl.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;
      PyObject*   o3;
  
  
  static PyObject* t_output_helper(PyObject* target, PyObject* o) {
      PyObject*   o2;
      PyObject*   o3;
  
-    if (!target) {                   
+    if (!target) {
          target = o;
          target = o;
-    } else if (target == Py_None) {  
+    } else if (target == Py_None) {
          Py_DECREF(Py_None);
          target = o;
          Py_DECREF(Py_None);
          target = o;
-    } else {                         
+    } else {
          if (!PyTuple_Check(target)) {
              o2 = target;
              target = PyTuple_New(1);
              PyTuple_SetItem(target, 0, o2);
          }
          if (!PyTuple_Check(target)) {
              o2 = target;
              target = PyTuple_New(1);
              PyTuple_SetItem(target, 0, o2);
          }
-        o3 = PyTuple_New(1);            
-        PyTuple_SetItem(o3, 0, o);      
+        o3 = PyTuple_New(1);
+        PyTuple_SetItem(o3, 0, o);
  
          o2 = target;
  
          o2 = target;
-        target = PySequence_Concat(o2, o3); 
-        Py_DECREF(o2);                      
+        target = PySequence_Concat(o2, o3);
+        Py_DECREF(o2);
          Py_DECREF(o3);
      }
      return target;
  }
  
          Py_DECREF(o3);
      }
      return target;
  }
  
-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 found;                                                             \
+        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        if ((found = 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);                                    \
-    }
-
-
-
-#define PYCALLBACK__GCAINTINT(PCLASS, CBNAME)                           \
-    void CBNAME(wxGridCellAttr *attr, int a, int b) {                   \
-        bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME)) {                           \
-            PyObject* obj = wxPyConstructObject((void*)attr, "wxGridCellAttr");\
-            m_myInst.callCallback(Py_BuildValue("(Oii)", obj, a, b));   \
-            Py_DECREF(obj);                                             \
-        }                                                               \
-        else                                                            \
-            PCLASS::CBNAME(attr, a, b);                                 \
-        wxPySaveThread(doSave);                                         \
-    }                                                                   \
-    void base_##CBNAME(wxGridCellAttr *attr, int a, int b) {            \
-        PCLASS::CBNAME(attr, a, b);                                     \
-    }
-
-
-
-#define PYCALLBACK__GCAINT(PCLASS, CBNAME)                              \
-    void CBNAME(wxGridCellAttr *attr, int val) {                        \
-        bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME)) {                           \
-            PyObject* obj = wxPyConstructObject((void*)attr, "wxGridCellAttr");\
-            m_myInst.callCallback(Py_BuildValue("(Oi)", obj, val));     \
-            Py_DECREF(obj);                                             \
-        }                                                               \
-        else                                                            \
-            PCLASS::CBNAME(attr, val);                                  \
-        wxPySaveThread(doSave);                                         \
-    }                                                                   \
-    void base_##CBNAME(wxGridCellAttr *attr, int val) {                 \
-        PCLASS::CBNAME(attr, val);                                      \
-    }
-
-
-
-#define PYCALLBACK_INT__pure(CBNAME)                                    \
-    int  CBNAME() {                                                     \
-        bool doSave = wxPyRestoreThread();                              \
-        int rval = 0;                                                   \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            rval = m_myInst.callCallback(Py_BuildValue("()"));          \
-        wxPySaveThread(doSave);                                         \
-        return rval;                                                    \
-    }
-
-
-
-#define PYCALLBACK_BOOL_INTINT_pure(CBNAME)                             \
-    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));    \
-        wxPySaveThread(doSave);                                         \
-        return rval;                                                    \
-    }
-
-
-
-#define PYCALLBACK_STRING_INTINT_pure(CBNAME)                           \
-    wxString CBNAME(int a, int b) {                                     \
-        bool doSave = wxPyRestoreThread();                              \
-        wxString rval;                                                  \
-        if (m_myInst.findCallback(#CBNAME)) {                           \
-            PyObject* ro;                                               \
-            ro = m_myInst.callCallbackObj(Py_BuildValue("(ii)",a,b));   \
-            if (ro) {                                                   \
-                PyObject* str = PyObject_Str(ro);                       \
-                rval = PyString_AsString(str);                          \
-                Py_DECREF(ro);  Py_DECREF(str);                         \
-            }                                                           \
-        }                                                               \
-        wxPySaveThread(doSave);                                         \
-        return rval;                                                    \
-    }
-
-
-
-#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()));    \
-        wxPySaveThread(doSave);                                         \
-    }
-
-
-#define PYCALLBACK_STRING_INTINT(PCLASS, CBNAME)                        \
-    wxString CBNAME(int a, int b) {                                     \
-        bool doSave = wxPyRestoreThread();                              \
-        wxString rval;                                                  \
-        if (m_myInst.findCallback(#CBNAME)) {                           \
-            PyObject* ro;                                               \
-            ro = m_myInst.callCallbackObj(Py_BuildValue("(ii)",a,b));   \
-            if (ro) {                                                   \
-                PyObject* str = PyObject_Str(ro);                       \
-                rval = PyString_AsString(str);                          \
-                Py_DECREF(ro);  Py_DECREF(str);                         \
-            }                                                           \
-        } else                                                          \
-            rval = PCLASS::CBNAME(a, b);                                \
-        wxPySaveThread(doSave);                                         \
-        return rval;                                                    \
-    }                                                                   \
-    wxString base_##CBNAME(int a, int b) {                              \
-        return PCLASS::CBNAME(a, b);                                    \
-    }
-
-
-
-#define PYCALLBACK_BOOL_INTINTSTRING(PCLASS, CBNAME)                    \
-    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()));   \
-        else                                                            \
-            rval = PCLASS::CBNAME(a,b,c);                               \
-        wxPySaveThread(doSave);                                         \
-        return rval;                                                    \
-    }                                                                   \
-    bool base_##CBNAME(int a, int b, const wxString& c) {               \
-        return PCLASS::CBNAME(a,b,c);                                   \
-    }
-
-
-
-
-#define PYCALLBACK_LONG_INTINT(PCLASS, CBNAME)                          \
-    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));   \
-        else                                                            \
-            rval = PCLASS::CBNAME(a,b);                                 \
-        wxPySaveThread(doSave);                                         \
-        return rval;                                                    \
-    }                                                                   \
-    long base_##CBNAME(int a, int b) {                                  \
-        return PCLASS::CBNAME(a,b);                                     \
-    }
-
-
-
-#define PYCALLBACK_BOOL_INTINT(PCLASS, CBNAME)                          \
-    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));   \
-        else                                                            \
-            rval = PCLASS::CBNAME(a,b);                                 \
-        wxPySaveThread(doSave);                                         \
-        return rval;                                                    \
-    }                                                                   \
-    bool base_##CBNAME(int a, int b) {                                  \
-        return PCLASS::CBNAME(a,b);                                     \
-    }
-
-
-
-#define PYCALLBACK_DOUBLE_INTINT(PCLASS, CBNAME)                        \
-    double CBNAME(int a, int b) {                                       \
-        bool doSave = wxPyRestoreThread();                              \
-        double rval;                                                    \
-        if (m_myInst.findCallback(#CBNAME)) {                           \
-            PyObject* ro;                                               \
-            ro = m_myInst.callCallbackObj(Py_BuildValue("(ii)",a,b));   \
-            if (ro) {                                                   \
-                PyObject* str = PyObject_Str(ro);                       \
-                rval = PyFloat_AsDouble(str);                           \
-                Py_DECREF(ro);   Py_DECREF(str);                        \
-            }                                                           \
-        } else                                                          \
-            rval = PCLASS::CBNAME(a, b);                                \
-        wxPySaveThread(doSave);                                         \
-        return rval;                                                    \
-    }                                                                   \
-    double base_##CBNAME(int a, int b) {                                \
-        return PCLASS::CBNAME(a, b);                                    \
-    }
-
-
-
-#define PYCALLBACK__(PCLASS, CBNAME)                                    \
-    void CBNAME()  {                                                    \
-        bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            m_myInst.callCallback(Py_BuildValue("()"));                 \
-        else                                                            \
-            PCLASS::CBNAME();                                           \
-        wxPySaveThread(doSave);                                         \
-    }                                                                   \
-    void base_##CBNAME() {                                              \
-        PCLASS::CBNAME();                                               \
-    }
-
-
-
-
-#define PYCALLBACK_BOOL_SIZETSIZET(PCLASS, CBNAME)                      \
-    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));   \
-        else                                                            \
-            rval = PCLASS::CBNAME(a,b);                                 \
-        wxPySaveThread(doSave);                                         \
-        return rval;                                                    \
-    }                                                                   \
-    bool base_##CBNAME(size_t a, size_t b) {                            \
-        return PCLASS::CBNAME(a,b);                                     \
-    }
-
-
-
-#define PYCALLBACK_BOOL_SIZET(PCLASS, CBNAME)                           \
-    bool CBNAME(size_t a)  {                                            \
-        bool rval;                                                      \
-        bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            rval = m_myInst.callCallback(Py_BuildValue("(i)", a));      \
-        else                                                            \
-            rval = PCLASS::CBNAME(a);                                   \
-        wxPySaveThread(doSave);                                         \
-        return rval;                                                    \
-    }                                                                   \
-    bool base_##CBNAME(size_t a) {                                      \
-        return PCLASS::CBNAME(a);                                       \
-    }
-
-
-
-#define PYCALLBACK_STRING_INT(PCLASS, CBNAME)                           \
-    wxString CBNAME(int a) {                                            \
-        bool doSave = wxPyRestoreThread();                              \
-        wxString rval;                                                  \
-        if (m_myInst.findCallback(#CBNAME)) {                           \
-            PyObject* ro;                                               \
-            ro = m_myInst.callCallbackObj(Py_BuildValue("(i)",a));      \
-            if (ro) {                                                   \
-                PyObject* str = PyObject_Str(ro);                       \
-                rval = PyString_AsString(str);                          \
-                Py_DECREF(ro);   Py_DECREF(str);                        \
-            }                                                           \
-        } else                                                          \
-            rval = PCLASS::CBNAME(a);                                   \
-        wxPySaveThread(doSave);                                         \
-        return rval;                                                    \
-    }                                                                   \
-    wxString base_##CBNAME(int a) {                                     \
-        return PCLASS::CBNAME(a);                                       \
-    }
-
-
-
-#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()));  \
-        else                                                            \
-            PCLASS::CBNAME(a,c);                                        \
-        wxPySaveThread(doSave);                                         \
-    }                                                                   \
-    void base_##CBNAME(int a, const wxString& c) {                      \
-        PCLASS::CBNAME(a,c);                                            \
+                    rval = ptr;                                                 \
+                Py_DECREF(ro);                                                  \
+            }                                                                   \
+        }                                                                       \
+        wxPyEndBlockThreads(state);                                             \
+        if (! found)                                                            \
+            rval = PCLASS::CBNAME(a, b, c);                                     \
+        return rval;                                                            \
+    }                                                                           \
+    wxGridCellAttr *base_##CBNAME(int a, int b, wxGridCellAttr::wxAttrKind c) { \
+        return PCLASS::CBNAME(a, b, c);                                         \
+    }
+
+
+
+#define PYCALLBACK__GCAINTINT(PCLASS, CBNAME)                                   \
+    void CBNAME(wxGridCellAttr *attr, int a, int b) {                           \
+        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        bool found;                                                             \
+        if ((found = 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);                                                     \
+        }                                                                       \
+        wxPyEndBlockThreads(state);                                             \
+        if (! found)                                                            \
+            PCLASS::CBNAME(attr, a, b);                                         \
+    }                                                                           \
+    void base_##CBNAME(wxGridCellAttr *attr, int a, int b) {                    \
+        PCLASS::CBNAME(attr, a, b);                                             \
+    }
+
+
+
+#define PYCALLBACK__GCAINT(PCLASS, CBNAME)                                      \
+    void CBNAME(wxGridCellAttr *attr, int val) {                                \
+        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        bool found;                                                             \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
+            PyObject* obj = wxPyConstructObject((void*)attr, "wxGridCellAttr", 0);\
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, val));    \
+            Py_DECREF(obj);                                                     \
+        }                                                                       \
+        wxPyEndBlockThreads(state);                                             \
+        if (! found)                                                            \
+            PCLASS::CBNAME(attr, val);                                          \
+    }                                                                           \
+    void base_##CBNAME(wxGridCellAttr *attr, int val) {                         \
+        PCLASS::CBNAME(attr, val);                                              \
+    }
+
+
+
+#define PYCALLBACK_INT__pure(CBNAME)                                            \
+    int  CBNAME() {                                                             \
+        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        int rval = 0;                                                           \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME))                            \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));         \
+        wxPyEndBlockThreads(state);                                             \
+        return rval;                                                            \
+    }
+
+
+
+#define PYCALLBACK_BOOL_INTINT_pure(CBNAME)                                     \
+    bool CBNAME(int a, int b) {                                                 \
+        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        bool rval = 0;                                                          \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME))                            \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b));   \
+        wxPyEndBlockThreads(state);                                             \
+        return rval;                                                            \
+    }
+
+
+
+#define PYCALLBACK_STRING_INTINT_pure(CBNAME)                                   \
+    wxString CBNAME(int a, int b) {                                             \
+        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        wxString rval;                                                          \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
+            PyObject* ro;                                                       \
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ii)",a,b));  \
+            if (ro) {                                                           \
+                PyObject* str = PyObject_Str(ro);                               \
+                rval = PyString_AsString(str);                                  \
+                Py_DECREF(ro);  Py_DECREF(str);                                 \
+            }                                                                   \
+        }                                                                       \
+        wxPyEndBlockThreads(state);                                             \
+        return rval;                                                            \
+    }
+
+
+
+#define PYCALLBACK__INTINTSTRING_pure(CBNAME)                                   \
+    void CBNAME(int a, int b, const wxString& c) {                              \
+        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME))                            \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iis)",a,b,c.c_str()));\
+        wxPyEndBlockThreads(state);                                             \
+    }
+
+
+#define PYCALLBACK_STRING_INTINT(PCLASS, CBNAME)                                \
+    wxString CBNAME(int a, int b) {                                             \
+        bool found;                                                             \
+        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        wxString rval;                                                          \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
+            PyObject* ro;                                                       \
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ii)",a,b));  \
+            if (ro) {                                                           \
+                PyObject* str = PyObject_Str(ro);                               \
+                rval = PyString_AsString(str);                                  \
+                Py_DECREF(ro);  Py_DECREF(str);                                 \
+            }                                                                   \
+        }                                                                       \
+        wxPyEndBlockThreads(state);                                             \
+        if (! found)                                                            \
+            rval = PCLASS::CBNAME(a, b);                                        \
+        return rval;                                                            \
+    }                                                                           \
+    wxString base_##CBNAME(int a, int b) {                                      \
+        return PCLASS::CBNAME(a, b);                                            \
+    }
+
+
+
+#define PYCALLBACK_BOOL_INTINTSTRING(PCLASS, CBNAME)                            \
+    bool CBNAME(int a, int b, const wxString& c)  {                             \
+        bool rval;                                                              \
+        bool found;                                                             \
+        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iis)", a,b,c.c_str()));\
+        wxPyEndBlockThreads(state);                                             \
+        if (! found)                                                            \
+            rval = PCLASS::CBNAME(a,b,c);                                       \
+        return rval;                                                            \
+    }                                                                           \
+    bool base_##CBNAME(int a, int b, const wxString& c) {                       \
+        return PCLASS::CBNAME(a,b,c);                                           \
+    }
+
+
+
+
+#define PYCALLBACK_LONG_INTINT(PCLASS, CBNAME)                                  \
+    long CBNAME(int a, int b)  {                                                \
+        long rval;                                                              \
+        bool found;                                                             \
+        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));  \
+        wxPyEndBlockThreads(state);                                             \
+        if (! found)                                                            \
+            rval = PCLASS::CBNAME(a,b);                                         \
+        return rval;                                                            \
+    }                                                                           \
+    long base_##CBNAME(int a, int b) {                                          \
+        return PCLASS::CBNAME(a,b);                                             \
+    }
+
+
+
+#define PYCALLBACK_BOOL_INTINT(PCLASS, CBNAME)                                  \
+    bool CBNAME(int a, int b)  {                                                \
+        bool rval;                                                              \
+        bool found;                                                             \
+        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));  \
+        wxPyEndBlockThreads(state);                                             \
+        if (! found)                                                            \
+            rval = PCLASS::CBNAME(a,b);                                         \
+        return rval;                                                            \
+    }                                                                           \
+    bool base_##CBNAME(int a, int b) {                                          \
+        return PCLASS::CBNAME(a,b);                                             \
+    }
+
+
+
+#define PYCALLBACK_DOUBLE_INTINT(PCLASS, CBNAME)                                \
+    double CBNAME(int a, int b) {                                               \
+        bool found;                                                             \
+        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        double rval;                                                            \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
+            PyObject* ro;                                                       \
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ii)",a,b));  \
+            if (ro) {                                                           \
+                PyObject* str = PyObject_Str(ro);                               \
+                rval = PyFloat_AsDouble(str);                                   \
+                Py_DECREF(ro);   Py_DECREF(str);                                \
+            }                                                                   \
+        }                                                                       \
+        wxPyEndBlockThreads(state);                                             \
+        if (! found)                                                            \
+            rval = PCLASS::CBNAME(a, b);                                        \
+        return rval;                                                            \
+    }                                                                           \
+    double base_##CBNAME(int a, int b) {                                        \
+        return PCLASS::CBNAME(a, b);                                            \
+    }
+
+
+
+#define PYCALLBACK__(PCLASS, CBNAME)                                            \
+    void CBNAME()  {                                                            \
+        bool found;                                                             \
+        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));                \
+        wxPyEndBlockThreads(state);                                             \
+        if (! found)                                                            \
+            PCLASS::CBNAME();                                                   \
+    }                                                                           \
+    void base_##CBNAME() {                                                      \
+        PCLASS::CBNAME();                                                       \
+    }
+
+
+
+
+#define PYCALLBACK_BOOL_SIZETSIZET(PCLASS, CBNAME)                              \
+    bool CBNAME(size_t a, size_t b)  {                                          \
+        bool rval;                                                              \
+        bool found;                                                             \
+        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));  \
+        wxPyEndBlockThreads(state);                                             \
+        if (! found)                                                            \
+            rval = PCLASS::CBNAME(a,b);                                         \
+        return rval;                                                            \
+    }                                                                           \
+    bool base_##CBNAME(size_t a, size_t b) {                                    \
+        return PCLASS::CBNAME(a,b);                                             \
+    }
+
+
+
+#define PYCALLBACK_BOOL_SIZET(PCLASS, CBNAME)                                   \
+    bool CBNAME(size_t a)  {                                                    \
+        bool rval;                                                              \
+        bool found;                                                             \
+        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a));     \
+        wxPyEndBlockThreads(state);                                             \
+        if (! found)                                                            \
+            rval = PCLASS::CBNAME(a);                                           \
+        return rval;                                                            \
+    }                                                                           \
+    bool base_##CBNAME(size_t a) {                                              \
+        return PCLASS::CBNAME(a);                                               \
+    }
+
+
+
+#define PYCALLBACK_STRING_INT(PCLASS, CBNAME)                                   \
+    wxString CBNAME(int a) {                                                    \
+        bool found;                                                             \
+        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        wxString rval;                                                          \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
+            PyObject* ro;                                                       \
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(i)",a));     \
+            if (ro) {                                                           \
+                PyObject* str = PyObject_Str(ro);                               \
+                rval = PyString_AsString(str);                                  \
+                Py_DECREF(ro);   Py_DECREF(str);                                \
+            }                                                                   \
+        }                                                                       \
+        wxPyEndBlockThreads(state);                                             \
+        if (! found)                                                            \
+            rval = PCLASS::CBNAME(a);                                           \
+        return rval;                                                            \
+    }                                                                           \
+    wxString base_##CBNAME(int a) {                                             \
+        return PCLASS::CBNAME(a);                                               \
+    }
+
+
+
+#define PYCALLBACK__INTSTRING(PCLASS, CBNAME)                                   \
+    void CBNAME(int a, const wxString& c)  {                                    \
+        bool found;                                                             \
+        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(is)", a,c.c_str())); \
+        wxPyEndBlockThreads(state);                                             \
+        if (! found)                                                            \
+            PCLASS::CBNAME(a,c);                                                \
+    }                                                                           \
+    void base_##CBNAME(int a, const wxString& c) {                              \
+        PCLASS::CBNAME(a,c);                                                    \
      }
  
  
  
  
      }
  
  
  
  
-#define PYCALLBACK_BOOL_(PCLASS, CBNAME)                                \
-    bool CBNAME()  {                                                    \
-        bool rval;                                                      \
-        bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            rval = m_myInst.callCallback(Py_BuildValue("()"));          \
-        else                                                            \
-            rval = PCLASS::CBNAME();                                    \
-        wxPySaveThread(doSave);                                         \
-        return rval;                                                    \
-    }                                                                   \
-    bool base_##CBNAME() {                                              \
-        return PCLASS::CBNAME();                                        \
+#define PYCALLBACK_BOOL_(PCLASS, CBNAME)                                        \
+    bool CBNAME()  {                                                            \
+        bool rval;                                                              \
+        bool found;                                                             \
+        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));         \
+        wxPyEndBlockThreads(state);                                             \
+        if (! found)                                                            \
+            rval = PCLASS::CBNAME();                                            \
+        return rval;                                                            \
+    }                                                                           \
+    bool base_##CBNAME() {                                                      \
+        return PCLASS::CBNAME();                                                \
      }
  
  
  
      }
  
  
  
-#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));          \
-        else                                                            \
-            PCLASS::CBNAME(a,b);                                        \
-        wxPySaveThread(doSave);                                         \
-    }                                                                   \
-    void base_##CBNAME(size_t a, int b) {                               \
-        PCLASS::CBNAME(a,b);                                            \
+#define PYCALLBACK__SIZETINT(PCLASS, CBNAME)                                    \
+    void CBNAME(size_t a, int b)  {                                             \
+        bool found;                                                             \
+        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));         \
+        wxPyEndBlockThreads(state);                                             \
+        if (! found)                                                            \
+            PCLASS::CBNAME(a,b);                                                \
+    }                                                                           \
+    void base_##CBNAME(size_t a, int b) {                                       \
+        PCLASS::CBNAME(a,b);                                                    \
      }
  
  
  
  
      }
  
  
  
  
-#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));       \
-        else                                                            \
-            PCLASS::CBNAME(a,b,c);                                      \
-        wxPySaveThread(doSave);                                         \
-    }                                                                   \
-    void base_##CBNAME(int a, int b, long c) {                          \
-        PCLASS::CBNAME(a,b,c);                                          \
+#define PYCALLBACK__INTINTLONG(PCLASS, CBNAME)                                  \
+    void CBNAME(int a, int b, long c)  {                                        \
+        bool found;                                                             \
+        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));      \
+        wxPyEndBlockThreads(state);                                             \
+        if (! found)                                                            \
+            PCLASS::CBNAME(a,b,c);                                              \
+    }                                                                           \
+    void base_##CBNAME(int a, int b, long c) {                                  \
+        PCLASS::CBNAME(a,b,c);                                                  \
      }
  
  
  
  
      }
  
  
  
  
-#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));       \
-        else                                                            \
-            PCLASS::CBNAME(a,b,c);                                      \
-        wxPySaveThread(doSave);                                         \
-    }                                                                   \
-    void base_##CBNAME(int a, int b, double c) {                        \
-        PCLASS::CBNAME(a,b,c);                                          \
+#define PYCALLBACK__INTINTDOUBLE(PCLASS, CBNAME)                                \
+    void CBNAME(int a, int b, double c)  {                                      \
+        bool found;                                                             \
+        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iif)", a,b,c));      \
+        wxPyEndBlockThreads(state);                                             \
+        if (! found)                                                            \
+            PCLASS::CBNAME(a,b,c);                                              \
+    }                                                                           \
+    void base_##CBNAME(int a, int b, double c) {                                \
+        PCLASS::CBNAME(a,b,c);                                                  \
      }
  
  
  
      }
  
  
  
-#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));       \
-        else                                                            \
-            PCLASS::CBNAME(a,b,c);                                      \
-        wxPySaveThread(doSave);                                         \
-    }                                                                   \
-    void base_##CBNAME(int a, int b, bool c) {                          \
-        PCLASS::CBNAME(a,b,c);                                          \
+#define PYCALLBACK__INTINTBOOL(PCLASS, CBNAME)                                  \
+    void CBNAME(int a, int b, bool c)  {                                        \
+        bool found;                                                             \
+        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));      \
+        wxPyEndBlockThreads(state);                                             \
+        if (! found)                                                            \
+            PCLASS::CBNAME(a,b,c);                                              \
+    }                                                                           \
+    void base_##CBNAME(int a, int b, bool c) {                                  \
+        PCLASS::CBNAME(a,b,c);                                                  \
      }
  
  
      }
  
  
@@ -496,31 +503,31 @@ public:
      void Draw(wxGrid& grid, wxGridCellAttr& attr,
                wxDC& dc, const wxRect& rect,
                int row, int col, bool isSelected) {
      void Draw(wxGrid& grid, wxGridCellAttr& attr,
                wxDC& dc, const wxRect& rect,
                int row, int col, bool isSelected) {
-        bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("Draw")) {
-            m_myInst.callCallback(
+        wxPyTState* state = wxPyBeginBlockThreads();
+        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));
          }
                                row, col, isSelected));
          }
-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads(state);
      }
  
      wxSize GetBestSize(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc,
                         int row, int col) {
          wxSize rval;
      }
  
      wxSize GetBestSize(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc,
                         int row, int col) {
          wxSize rval;
-        bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("GetBestSize")) {
+        wxPyTState* state = wxPyBeginBlockThreads();
+        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"))
@@ -528,25 +535,25 @@ public:
                  Py_DECREF(ro);
              }
          }
                  Py_DECREF(ro);
              }
          }
-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads(state);
          return rval;
      }
  
  
      wxGridCellRenderer *Clone() const {
          wxGridCellRenderer* rval = NULL;
          return rval;
      }
  
  
      wxGridCellRenderer *Clone() const {
          wxGridCellRenderer* rval = NULL;
-        bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("Clone")) {
+        wxPyTState* state = wxPyBeginBlockThreads();
+        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;
                  Py_DECREF(ro);
              }
          }
              if (ro) {
                  if (!SWIG_GetPtrObj(ro, (void **)&ptr, "_wxGridCellRenderer_p"))
                      rval = ptr;
                  Py_DECREF(ro);
              }
          }
-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads(state);
          return rval;
      }
  
          return rval;
      }
  
@@ -564,69 +571,70 @@ public:
      wxPyGridCellEditor() : wxGridCellEditor() {}
  
      void Create(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler) {
      wxPyGridCellEditor() : wxGridCellEditor() {}
  
      void Create(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler) {
-        bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("Create")) {
-            m_myInst.callCallback(
+        wxPyTState* state = wxPyBeginBlockThreads();
+        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);
+        wxPyEndBlockThreads(state);
      }
  
  
      void BeginEdit(int row, int col, wxGrid* grid) {
      }
  
  
      void BeginEdit(int row, int col, wxGrid* grid) {
-        bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("BeginEdit")) {
-            m_myInst.callCallback(
+        wxPyTState* state = wxPyBeginBlockThreads();
+        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);
+        wxPyEndBlockThreads(state);
      }
  
  
      bool EndEdit(int row, int col, wxGrid* grid) {
          bool rv = FALSE;
      }
  
  
      bool EndEdit(int row, int col, wxGrid* grid) {
          bool rv = FALSE;
-        bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("EndEdit")) {
-            rv = m_myInst.callCallback(
+        wxPyTState* state = wxPyBeginBlockThreads();
+        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);
+        wxPyEndBlockThreads(state);
          return rv;
      }
  
  
      wxGridCellEditor*Clone() const {
          wxGridCellEditor* rval = NULL;
          return rv;
      }
  
  
      wxGridCellEditor*Clone() const {
          wxGridCellEditor* rval = NULL;
-        bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("Clone")) {
+        wxPyTState* state = wxPyBeginBlockThreads();
+        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;
                  Py_DECREF(ro);
              }
          }
              if (ro) {
                  if (!SWIG_GetPtrObj(ro, (void **)&ptr, "_wxGridCellEditor_p"))
                      rval = ptr;
                  Py_DECREF(ro);
              }
          }
-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads(state);
          return rval;
      }
  
  
      void Show(bool show, wxGridCellAttr *attr) {
          return rval;
      }
  
  
      void Show(bool show, wxGridCellAttr *attr) {
-        bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("Show"))
-            m_myInst.callCallback(
+        bool found;
+        wxPyTState* state = wxPyBeginBlockThreads();
+        if ((found = wxPyCBH_findCallback(m_myInst, "Show")))
+            wxPyCBH_callCallback(m_myInst,
                  Py_BuildValue("(iO)", show,
                  Py_BuildValue("(iO)", show,
-                              wxPyConstructObject((void*)attr, "wxGridCellAttr")));
-        else
+                              wxPyConstructObject((void*)attr, "wxGridCellAttr", 0)));
+        wxPyEndBlockThreads(state);
+        if (! found)
              wxGridCellEditor::Show(show, attr);
              wxGridCellEditor::Show(show, attr);
-        wxPySaveThread(doSave);
      }
      void base_Show(bool show, wxGridCellAttr *attr) {
          wxGridCellEditor::Show(show, attr);
      }
      void base_Show(bool show, wxGridCellAttr *attr) {
          wxGridCellEditor::Show(show, attr);
@@ -634,15 +642,16 @@ public:
  
  
      void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) {
  
  
      void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) {
-        bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("PaintBackground"))
-            m_myInst.callCallback(
+        bool found;                                                             \
+        wxPyTState* state = wxPyBeginBlockThreads();
+        if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground)")))
+            wxPyCBH_callCallback(m_myInst,
                  Py_BuildValue("(OO)",
                  Py_BuildValue("(OO)",
-                              wxPyConstructObject((void*)&rectCell, "wxRect"),
-                              wxPyConstructObject((void*)attr, "wxGridCellAttr")));
-        else
+                              wxPyConstructObject((void*)&rectCell, "wxRect", 0),
+                              wxPyConstructObject((void*)attr, "wxGridCellAttr", 0)));
+        wxPyEndBlockThreads(state);
+        if (! found)
              wxGridCellEditor::PaintBackground(rectCell, attr);
              wxGridCellEditor::PaintBackground(rectCell, attr);
-        wxPySaveThread(doSave);
      }
      void base_PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) {
          wxGridCellEditor::PaintBackground(rectCell, attr);
      }
      void base_PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) {
          wxGridCellEditor::PaintBackground(rectCell, attr);
@@ -677,7 +686,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);
@@ -708,18 +717,18 @@ 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);
  
  
      wxString GetValue(int row, int col) {
      PYCALLBACK__GCAINTINT(wxGridTableBase, SetAttr);
      PYCALLBACK__GCAINT(wxGridTableBase, SetRowAttr);
      PYCALLBACK__GCAINT(wxGridTableBase, SetColAttr);
  
  
      wxString GetValue(int row, int col) {
-        bool doSave = wxPyRestoreThread();
+        wxPyTState* state = wxPyBeginBlockThreads();
          wxString rval;
          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) {
                  PyObject* str = PyObject_Str(ro);
                  rval = PyString_AsString(str);
              if (ro) {
                  PyObject* str = PyObject_Str(ro);
                  rval = PyString_AsString(str);
@@ -727,15 +736,15 @@ public:
                  Py_DECREF(str);
              }
          }
                  Py_DECREF(str);
              }
          }
-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads(state);
          return rval;
      }
  
      void SetValue(int row, int col, const wxString& val) {
          return rval;
      }
  
      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()));
-        wxPySaveThread(doSave);
+        wxPyTState* state = wxPyBeginBlockThreads();
+        if (wxPyCBH_findCallback(m_myInst, "SetValue"))
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iis)",row,col,val.c_str()));
+        wxPyEndBlockThreads(state);
      }
  
  
      }
  
  
@@ -743,11 +752,11 @@ public:
      // the GetValue and SetValue python methods.
      long GetValueAsLong( int row, int col ) {
          long rval = 0;
      // the GetValue and SetValue python methods.
      long GetValueAsLong( int row, int col ) {
          long rval = 0;
-        bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("GetValue")) {
+        wxPyTState* state = wxPyBeginBlockThreads();
+        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) {
@@ -757,17 +766,17 @@ public:
                  Py_DECREF(ro);
              }
          }
                  Py_DECREF(ro);
              }
          }
-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads(state);
          return rval;
      }
  
      double GetValueAsDouble( int row, int col ) {
          double rval = 0.0;
          return rval;
      }
  
      double GetValueAsDouble( int row, int col ) {
          double rval = 0.0;
-        bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("GetValue")) {
+        wxPyTState* state = wxPyBeginBlockThreads();
+        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) {
@@ -777,7 +786,7 @@ public:
                  Py_DECREF(ro);
              }
          }
                  Py_DECREF(ro);
              }
          }
-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads(state);
          return rval;
      }
  
          return rval;
      }
  
@@ -786,19 +795,19 @@ public:
      }
  
      void SetValueAsLong( int row, int col, long value ) {
      }
  
      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));
+        wxPyTState* state = wxPyBeginBlockThreads();
+        if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", row, col, value));
          }
          }
-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads(state);
      }
  
      void SetValueAsDouble( int row, int col, double value ) {
      }
  
      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));
+        wxPyTState* state = wxPyBeginBlockThreads();
+        if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iid)", row, col, value));
          }
          }
-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads(state);
      }
  
      void SetValueAsBool( int row, int col, bool value ) {
      }
  
      void SetValueAsBool( int row, int col, bool value ) {
@@ -889,7 +898,7 @@ static PyObject *_wrap_wxGridCellRenderer_SetParameters(PyObject *self, PyObject
  #if PYTHON_API_VERSION >= 1009
      char* tmpPtr; int tmpSize;
      if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) {
  #if PYTHON_API_VERSION >= 1009
      char* tmpPtr; int tmpSize;
      if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) {
-        PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1)
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1)
@@ -908,6 +917,7 @@ static PyObject *_wrap_wxGridCellRenderer_SetParameters(PyObject *self, PyObject
          wxGridCellRenderer_SetParameters(_arg0,*_arg1);
  
      wxPy_END_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;
  {
@@ -939,6 +949,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;
@@ -966,6 +977,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;
@@ -1033,6 +1045,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;
@@ -1091,6 +1104,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;
@@ -1120,6 +1134,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);
@@ -1153,6 +1168,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);
@@ -1195,6 +1211,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;
@@ -1223,7 +1240,7 @@ 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)) {
  #if PYTHON_API_VERSION >= 1009
      char* tmpPtr; int tmpSize;
      if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) {
-        PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1)
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1)
@@ -1242,6 +1259,7 @@ static PyObject *_wrap_wxPyGridCellRenderer_base_SetParameters(PyObject *self, P
          wxPyGridCellRenderer_base_SetParameters(_arg0,*_arg1);
  
      wxPy_END_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;
  {
@@ -1274,6 +1292,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);
@@ -1315,6 +1334,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);
@@ -1358,6 +1378,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);
@@ -1391,6 +1412,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;
  }
@@ -1418,6 +1440,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;
@@ -1446,6 +1469,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;
  }
@@ -1473,6 +1497,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;
@@ -1501,6 +1526,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);
@@ -1511,6 +1537,194 @@ static PyObject *_wrap_new_wxGridCellBoolRenderer(PyObject *self, PyObject *args
      return _resultobj;
  }
  
      return _resultobj;
  }
  
+static void *SwigwxGridCellDateTimeRendererTowxGridCellStringRenderer(void *ptr) {
+    wxGridCellDateTimeRenderer *src;
+    wxGridCellStringRenderer *dest;
+    src = (wxGridCellDateTimeRenderer *) ptr;
+    dest = (wxGridCellStringRenderer *) src;
+    return (void *) dest;
+}
+
+static void *SwigwxGridCellDateTimeRendererTowxGridCellRenderer(void *ptr) {
+    wxGridCellDateTimeRenderer *src;
+    wxGridCellRenderer *dest;
+    src = (wxGridCellDateTimeRenderer *) ptr;
+    dest = (wxGridCellRenderer *) src;
+    return (void *) dest;
+}
+
+#define new_wxGridCellDateTimeRenderer(_swigarg0,_swigarg1) (new wxGridCellDateTimeRenderer(_swigarg0,_swigarg1))
+static PyObject *_wrap_new_wxGridCellDateTimeRenderer(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxGridCellDateTimeRenderer * _result;
+    wxString * _arg0 = (wxString *) &"%c";
+    wxString * _arg1 = (wxString *) &"%c";
+    PyObject * _obj0 = 0;
+    PyObject * _obj1 = 0;
+    char *_kwnames[] = { "outformat","informat", NULL };
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|OO:new_wxGridCellDateTimeRenderer",_kwnames,&_obj0,&_obj1)) 
+        return NULL;
+    if (_obj0)
+{
+#if PYTHON_API_VERSION >= 1009
+    char* tmpPtr; int tmpSize;
+    if (!PyString_Check(_obj0) && !PyUnicode_Check(_obj0)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    if (PyString_AsStringAndSize(_obj0, &tmpPtr, &tmpSize) == -1)
+        return NULL;
+    _arg0 = new wxString(tmpPtr, tmpSize);
+#else
+    if (!PyString_Check(_obj0)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg0 = new wxString(PyString_AS_STRING(_obj0), PyString_GET_SIZE(_obj0));
+#endif
+}
+    if (_obj1)
+{
+#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;
+    }
+    _arg1 = new wxString(PyString_AS_STRING(_obj1), PyString_GET_SIZE(_obj1));
+#endif
+}
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxGridCellDateTimeRenderer *)new_wxGridCellDateTimeRenderer(*_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellDateTimeRenderer_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
+{
+    if (_obj0)
+        delete _arg0;
+}
+{
+    if (_obj1)
+        delete _arg1;
+}
+    return _resultobj;
+}
+
+static void *SwigwxGridCellEnumRendererTowxGridCellStringRenderer(void *ptr) {
+    wxGridCellEnumRenderer *src;
+    wxGridCellStringRenderer *dest;
+    src = (wxGridCellEnumRenderer *) ptr;
+    dest = (wxGridCellStringRenderer *) src;
+    return (void *) dest;
+}
+
+static void *SwigwxGridCellEnumRendererTowxGridCellRenderer(void *ptr) {
+    wxGridCellEnumRenderer *src;
+    wxGridCellRenderer *dest;
+    src = (wxGridCellEnumRenderer *) ptr;
+    dest = (wxGridCellRenderer *) src;
+    return (void *) dest;
+}
+
+#define new_wxGridCellEnumRenderer(_swigarg0) (new wxGridCellEnumRenderer(_swigarg0))
+static PyObject *_wrap_new_wxGridCellEnumRenderer(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxGridCellEnumRenderer * _result;
+    wxString * _arg0 = (wxString *) &"";
+    PyObject * _obj0 = 0;
+    char *_kwnames[] = { "choices", NULL };
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|O:new_wxGridCellEnumRenderer",_kwnames,&_obj0)) 
+        return NULL;
+    if (_obj0)
+{
+    _arg0 = wxString_LIST_helper(_obj0);
+    if (_arg0 == NULL) {
+        return NULL;
+    }
+}
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxGridCellEnumRenderer *)new_wxGridCellEnumRenderer(*_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellEnumRenderer_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
+{
+    delete [] _arg0;
+}
+    return _resultobj;
+}
+
+static void *SwigwxGridCellAutoWrapStringRendererTowxGridCellStringRenderer(void *ptr) {
+    wxGridCellAutoWrapStringRenderer *src;
+    wxGridCellStringRenderer *dest;
+    src = (wxGridCellAutoWrapStringRenderer *) ptr;
+    dest = (wxGridCellStringRenderer *) src;
+    return (void *) dest;
+}
+
+static void *SwigwxGridCellAutoWrapStringRendererTowxGridCellRenderer(void *ptr) {
+    wxGridCellAutoWrapStringRenderer *src;
+    wxGridCellRenderer *dest;
+    src = (wxGridCellAutoWrapStringRenderer *) ptr;
+    dest = (wxGridCellRenderer *) src;
+    return (void *) dest;
+}
+
+#define new_wxGridCellAutoWrapStringRenderer() (new wxGridCellAutoWrapStringRenderer())
+static PyObject *_wrap_new_wxGridCellAutoWrapStringRenderer(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxGridCellAutoWrapStringRenderer * _result;
+    char *_kwnames[] = {  NULL };
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxGridCellAutoWrapStringRenderer",_kwnames)) 
+        return NULL;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxGridCellAutoWrapStringRenderer *)new_wxGridCellAutoWrapStringRenderer();
+
+    wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAutoWrapStringRenderer_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
+    return _resultobj;
+}
+
  #define wxGridCellEditor_IsCreated(_swigobj)  (_swigobj->IsCreated())
  static PyObject *_wrap_wxGridCellEditor_IsCreated(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
  #define wxGridCellEditor_IsCreated(_swigobj)  (_swigobj->IsCreated())
  static PyObject *_wrap_wxGridCellEditor_IsCreated(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
@@ -1534,6 +1748,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;
  }
@@ -1545,7 +1760,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)) 
@@ -1562,13 +1776,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;
  }
  
@@ -1603,6 +1812,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;
@@ -1631,7 +1841,7 @@ static PyObject *_wrap_wxGridCellEditor_SetParameters(PyObject *self, PyObject *
  #if PYTHON_API_VERSION >= 1009
      char* tmpPtr; int tmpSize;
      if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) {
  #if PYTHON_API_VERSION >= 1009
      char* tmpPtr; int tmpSize;
      if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) {
-        PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1)
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1)
@@ -1650,6 +1860,7 @@ static PyObject *_wrap_wxGridCellEditor_SetParameters(PyObject *self, PyObject *
          wxGridCellEditor_SetParameters(_arg0,*_arg1);
  
      wxPy_END_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;
  {
@@ -1681,6 +1892,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;
@@ -1708,6 +1920,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;
@@ -1754,6 +1967,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;
@@ -1792,6 +2006,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;
@@ -1831,6 +2046,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;
  }
@@ -1857,6 +2073,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;
@@ -1886,6 +2103,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);
@@ -1926,6 +2144,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;
@@ -1965,6 +2184,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;
@@ -2009,6 +2229,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;
@@ -2046,6 +2267,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;
  }
@@ -2081,6 +2303,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;
@@ -2108,6 +2331,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;
@@ -2144,6 +2368,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;
@@ -2171,6 +2396,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;
@@ -2199,6 +2425,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);
@@ -2241,6 +2468,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;
@@ -2276,6 +2504,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;
@@ -2315,6 +2544,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;
@@ -2359,6 +2589,7 @@ 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;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
@@ -2395,6 +2626,7 @@ static PyObject *_wrap_wxPyGridCellEditor_base_IsAcceptedKey(PyObject *self, PyO
          wxPyGridCellEditor_base_IsAcceptedKey(_arg0,*_arg1);
  
      wxPy_END_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;
@@ -2431,6 +2663,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;
@@ -2458,6 +2691,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;
@@ -2494,6 +2728,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;
@@ -2521,6 +2756,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;
@@ -2549,7 +2785,7 @@ 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)) {
  #if PYTHON_API_VERSION >= 1009
      char* tmpPtr; int tmpSize;
      if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) {
-        PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1)
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1)
@@ -2568,6 +2804,7 @@ static PyObject *_wrap_wxPyGridCellEditor_base_SetParameters(PyObject *self, PyO
          wxPyGridCellEditor_base_SetParameters(_arg0,*_arg1);
  
      wxPy_END_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;
  {
@@ -2600,6 +2837,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);
@@ -2643,6 +2881,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);
@@ -2684,6 +2923,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);
@@ -2717,6 +2957,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);
@@ -2771,6 +3012,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);
@@ -2784,6 +3026,102 @@ static PyObject *_wrap_new_wxGridCellChoiceEditor(PyObject *self, PyObject *args
      return _resultobj;
  }
  
      return _resultobj;
  }
  
+static void *SwigwxGridCellEnumEditorTowxGridCellChoiceEditor(void *ptr) {
+    wxGridCellEnumEditor *src;
+    wxGridCellChoiceEditor *dest;
+    src = (wxGridCellEnumEditor *) ptr;
+    dest = (wxGridCellChoiceEditor *) src;
+    return (void *) dest;
+}
+
+static void *SwigwxGridCellEnumEditorTowxGridCellEditor(void *ptr) {
+    wxGridCellEnumEditor *src;
+    wxGridCellEditor *dest;
+    src = (wxGridCellEnumEditor *) ptr;
+    dest = (wxGridCellEditor *) src;
+    return (void *) dest;
+}
+
+#define new_wxGridCellEnumEditor(_swigarg0) (new wxGridCellEnumEditor(_swigarg0))
+static PyObject *_wrap_new_wxGridCellEnumEditor(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxGridCellEnumEditor * _result;
+    wxString * _arg0 = (wxString *) &"";
+    PyObject * _obj0 = 0;
+    char *_kwnames[] = { "choices", NULL };
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|O:new_wxGridCellEnumEditor",_kwnames,&_obj0)) 
+        return NULL;
+    if (_obj0)
+{
+    _arg0 = wxString_LIST_helper(_obj0);
+    if (_arg0 == NULL) {
+        return NULL;
+    }
+}
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxGridCellEnumEditor *)new_wxGridCellEnumEditor(*_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellEnumEditor_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
+{
+    delete [] _arg0;
+}
+    return _resultobj;
+}
+
+static void *SwigwxGridCellAutoWrapStringEditorTowxGridCellTextEditor(void *ptr) {
+    wxGridCellAutoWrapStringEditor *src;
+    wxGridCellTextEditor *dest;
+    src = (wxGridCellAutoWrapStringEditor *) ptr;
+    dest = (wxGridCellTextEditor *) src;
+    return (void *) dest;
+}
+
+static void *SwigwxGridCellAutoWrapStringEditorTowxGridCellEditor(void *ptr) {
+    wxGridCellAutoWrapStringEditor *src;
+    wxGridCellEditor *dest;
+    src = (wxGridCellAutoWrapStringEditor *) ptr;
+    dest = (wxGridCellEditor *) src;
+    return (void *) dest;
+}
+
+#define new_wxGridCellAutoWrapStringEditor() (new wxGridCellAutoWrapStringEditor())
+static PyObject *_wrap_new_wxGridCellAutoWrapStringEditor(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxGridCellAutoWrapStringEditor * _result;
+    char *_kwnames[] = {  NULL };
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxGridCellAutoWrapStringEditor",_kwnames)) 
+        return NULL;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxGridCellAutoWrapStringEditor *)new_wxGridCellAutoWrapStringEditor();
+
+    wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAutoWrapStringEditor_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
+    return _resultobj;
+}
+
  #define new_wxGridCellAttr() (new wxGridCellAttr())
  static PyObject *_wrap_new_wxGridCellAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
  #define new_wxGridCellAttr() (new wxGridCellAttr())
  static PyObject *_wrap_new_wxGridCellAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
@@ -2799,6 +3137,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);
@@ -2833,6 +3172,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);
@@ -2843,6 +3183,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;
@@ -2865,6 +3242,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;
@@ -2892,6 +3270,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;
@@ -2927,6 +3306,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;
@@ -2962,6 +3342,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;
@@ -2998,6 +3379,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;
@@ -3027,6 +3409,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;
@@ -3057,6 +3440,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;
@@ -3093,6 +3477,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;
@@ -3129,21 +3514,51 @@ 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;
  }
  
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      return _resultobj;
  }
  
-#define wxGridCellAttr_HasTextColour(_swigobj)  (_swigobj->HasTextColour())
-static PyObject *_wrap_wxGridCellAttr_HasTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+#define wxGridCellAttr_SetKind(_swigobj,_swigarg0)  (_swigobj->SetKind(_swigarg0))
+static PyObject *_wrap_wxGridCellAttr_SetKind(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
      PyObject * _resultobj;
-    bool  _result;
      wxGridCellAttr * _arg0;
      wxGridCellAttr * _arg0;
+    wxGridCellAttr::wxAttrKind  _arg1;
      PyObject * _argo0 = 0;
      PyObject * _argo0 = 0;
-    char *_kwnames[] = { "self", NULL };
+    char *_kwnames[] = { "self","kind", NULL };
  
      self = self;
  
      self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridCellAttr_HasTextColour",_kwnames,&_argo0)) 
+    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;
+}
+
+#define wxGridCellAttr_HasTextColour(_swigobj)  (_swigobj->HasTextColour())
+static PyObject *_wrap_wxGridCellAttr_HasTextColour(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_HasTextColour",_kwnames,&_argo0)) 
          return NULL;
      if (_argo0) {
          if (_argo0 == Py_None) { _arg0 = NULL; }
          return NULL;
      if (_argo0) {
          if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3157,6 +3572,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;
  }
@@ -3184,6 +3600,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;
  }
@@ -3211,6 +3628,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;
  }
@@ -3238,6 +3656,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;
  }
@@ -3265,6 +3684,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;
  }
@@ -3292,6 +3712,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;
  }
@@ -3321,6 +3770,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);
@@ -3356,6 +3806,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);
@@ -3391,6 +3842,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);
@@ -3433,6 +3885,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;
  {
@@ -3483,6 +3936,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);
@@ -3528,6 +3982,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);
@@ -3561,6 +4016,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;
  }
@@ -3596,6 +4052,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;
@@ -3616,6 +4073,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);
@@ -3626,19 +4084,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; }
@@ -3649,9 +4108,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);
@@ -3695,6 +4155,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;
@@ -3732,6 +4193,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;
@@ -3769,6 +4231,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;
@@ -3798,6 +4261,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;
@@ -3827,6 +4291,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;
@@ -3855,6 +4320,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);
@@ -3897,24 +4363,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; }
@@ -3925,9 +4393,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);
@@ -3971,6 +4440,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;
@@ -4008,6 +4478,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;
@@ -4045,11 +4516,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;
@@ -4081,6 +4561,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;
@@ -4110,6 +4591,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);
@@ -4151,6 +4633,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;
@@ -4163,7 +4646,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)) 
@@ -4180,13 +4662,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;
  }
  
@@ -4213,6 +4690,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;
  }
@@ -4240,6 +4718,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;
  }
@@ -4269,6 +4748,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;
  }
@@ -4298,6 +4778,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());
  }
@@ -4332,7 +4813,7 @@ 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)) {
  #if PYTHON_API_VERSION >= 1009
      char* tmpPtr; int tmpSize;
      if (!PyString_Check(_obj3) && !PyUnicode_Check(_obj3)) {
-        PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj3, &tmpPtr, &tmpSize) == -1)
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj3, &tmpPtr, &tmpSize) == -1)
@@ -4351,6 +4832,7 @@ static PyObject *_wrap_wxGridTableBase_SetValue(PyObject *self, PyObject *args,
          wxGridTableBase_SetValue(_arg0,_arg1,_arg2,*_arg3);
  
      wxPy_END_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;
  {
@@ -4385,6 +4867,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());
  }
@@ -4420,7 +4903,7 @@ 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)) {
  #if PYTHON_API_VERSION >= 1009
      char* tmpPtr; int tmpSize;
      if (!PyString_Check(_obj3) && !PyUnicode_Check(_obj3)) {
-        PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj3, &tmpPtr, &tmpSize) == -1)
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj3, &tmpPtr, &tmpSize) == -1)
@@ -4439,6 +4922,7 @@ static PyObject *_wrap_wxGridTableBase_CanGetValueAs(PyObject *self, PyObject *a
          _result = (bool )wxGridTableBase_CanGetValueAs(_arg0,_arg1,_arg2,*_arg3);
  
      wxPy_END_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)
@@ -4473,7 +4957,7 @@ 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)) {
  #if PYTHON_API_VERSION >= 1009
      char* tmpPtr; int tmpSize;
      if (!PyString_Check(_obj3) && !PyUnicode_Check(_obj3)) {
-        PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj3, &tmpPtr, &tmpSize) == -1)
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj3, &tmpPtr, &tmpSize) == -1)
@@ -4492,6 +4976,7 @@ static PyObject *_wrap_wxGridTableBase_CanSetValueAs(PyObject *self, PyObject *a
          _result = (bool )wxGridTableBase_CanSetValueAs(_arg0,_arg1,_arg2,*_arg3);
  
      wxPy_END_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)
@@ -4525,6 +5010,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;
  }
@@ -4554,6 +5040,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;
  }
@@ -4583,6 +5070,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;
  }
@@ -4612,6 +5100,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;
@@ -4642,6 +5131,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;
@@ -4674,6 +5164,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;
@@ -4701,6 +5192,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;
@@ -4731,6 +5223,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;
  }
@@ -4759,6 +5252,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;
  }
@@ -4788,6 +5282,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;
  }
@@ -4817,6 +5312,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;
  }
@@ -4845,6 +5341,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;
  }
@@ -4874,6 +5371,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;
  }
@@ -4902,6 +5400,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());
  }
@@ -4935,6 +5434,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());
  }
@@ -4968,7 +5468,7 @@ static PyObject *_wrap_wxGridTableBase_SetRowLabelValue(PyObject *self, PyObject
  #if PYTHON_API_VERSION >= 1009
      char* tmpPtr; int tmpSize;
      if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) {
  #if PYTHON_API_VERSION >= 1009
      char* tmpPtr; int tmpSize;
      if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) {
-        PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
@@ -4987,6 +5487,7 @@ static PyObject *_wrap_wxGridTableBase_SetRowLabelValue(PyObject *self, PyObject
          wxGridTableBase_SetRowLabelValue(_arg0,_arg1,*_arg2);
  
      wxPy_END_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;
  {
@@ -5020,7 +5521,7 @@ static PyObject *_wrap_wxGridTableBase_SetColLabelValue(PyObject *self, PyObject
  #if PYTHON_API_VERSION >= 1009
      char* tmpPtr; int tmpSize;
      if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) {
  #if PYTHON_API_VERSION >= 1009
      char* tmpPtr; int tmpSize;
      if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) {
-        PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
@@ -5039,6 +5540,7 @@ static PyObject *_wrap_wxGridTableBase_SetColLabelValue(PyObject *self, PyObject
          wxGridTableBase_SetColLabelValue(_arg0,_arg1,*_arg2);
  
      wxPy_END_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;
  {
@@ -5071,23 +5573,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; }
@@ -5098,9 +5602,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);
@@ -5144,6 +5649,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;
@@ -5181,6 +5687,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;
@@ -5218,6 +5725,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;
@@ -5231,6 +5739,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;
@@ -5246,6 +5762,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);
@@ -5288,6 +5805,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;
@@ -5315,6 +5833,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;
@@ -5345,6 +5864,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());
  }
@@ -5380,7 +5900,7 @@ 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)) {
  #if PYTHON_API_VERSION >= 1009
      char* tmpPtr; int tmpSize;
      if (!PyString_Check(_obj3) && !PyUnicode_Check(_obj3)) {
-        PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj3, &tmpPtr, &tmpSize) == -1)
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj3, &tmpPtr, &tmpSize) == -1)
@@ -5399,6 +5919,7 @@ static PyObject *_wrap_wxPyGridTableBase_base_CanGetValueAs(PyObject *self, PyOb
          _result = (bool )wxPyGridTableBase_base_CanGetValueAs(_arg0,_arg1,_arg2,*_arg3);
  
      wxPy_END_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)
@@ -5433,7 +5954,7 @@ 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)) {
  #if PYTHON_API_VERSION >= 1009
      char* tmpPtr; int tmpSize;
      if (!PyString_Check(_obj3) && !PyUnicode_Check(_obj3)) {
-        PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj3, &tmpPtr, &tmpSize) == -1)
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj3, &tmpPtr, &tmpSize) == -1)
@@ -5452,6 +5973,7 @@ static PyObject *_wrap_wxPyGridTableBase_base_CanSetValueAs(PyObject *self, PyOb
          _result = (bool )wxPyGridTableBase_base_CanSetValueAs(_arg0,_arg1,_arg2,*_arg3);
  
      wxPy_END_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)
@@ -5482,6 +6004,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;
@@ -5512,6 +6035,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;
  }
@@ -5540,6 +6064,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;
  }
@@ -5569,6 +6094,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;
  }
@@ -5598,6 +6124,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;
  }
@@ -5626,6 +6153,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;
  }
@@ -5655,6 +6183,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;
  }
@@ -5683,6 +6212,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());
  }
@@ -5716,6 +6246,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());
  }
@@ -5749,7 +6280,7 @@ 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)) {
  #if PYTHON_API_VERSION >= 1009
      char* tmpPtr; int tmpSize;
      if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) {
-        PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
@@ -5768,6 +6299,7 @@ static PyObject *_wrap_wxPyGridTableBase_base_SetRowLabelValue(PyObject *self, P
          wxPyGridTableBase_base_SetRowLabelValue(_arg0,_arg1,*_arg2);
  
      wxPy_END_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;
  {
@@ -5801,7 +6333,7 @@ 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)) {
  #if PYTHON_API_VERSION >= 1009
      char* tmpPtr; int tmpSize;
      if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) {
-        PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
@@ -5820,6 +6352,7 @@ static PyObject *_wrap_wxPyGridTableBase_base_SetColLabelValue(PyObject *self, P
          wxPyGridTableBase_base_SetColLabelValue(_arg0,_arg1,*_arg2);
  
      wxPy_END_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;
  {
@@ -5852,23 +6385,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; }
@@ -5879,9 +6414,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);
@@ -5925,6 +6461,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;
@@ -5962,6 +6499,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;
@@ -5999,6 +6537,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;
@@ -6012,6 +6551,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;
@@ -6029,6 +6576,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);
@@ -6066,6 +6614,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);
@@ -6098,6 +6647,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;
@@ -6134,6 +6684,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;
@@ -6146,7 +6697,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)) 
@@ -6163,13 +6713,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;
  }
  
@@ -6196,6 +6741,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;
@@ -6224,6 +6770,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;
  }
@@ -6251,6 +6798,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;
@@ -6279,6 +6827,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;
  }
@@ -6306,6 +6855,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;
@@ -6334,6 +6884,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;
  }
@@ -6355,6 +6906,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);
@@ -6387,6 +6939,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;
@@ -6415,6 +6968,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;
  }
@@ -6442,6 +6996,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;
@@ -6470,6 +7025,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;
  }
@@ -6497,6 +7053,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;
@@ -6526,6 +7083,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;
@@ -6559,6 +7117,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;
  }
@@ -6599,6 +7158,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;
  }
@@ -6635,6 +7195,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;
@@ -6680,6 +7248,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);
@@ -6716,6 +7285,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;
  }
@@ -6743,6 +7313,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;
@@ -6771,6 +7342,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;
  }
@@ -6798,6 +7370,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;
  }
@@ -6834,6 +7407,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;
  }
@@ -6845,7 +7419,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)) 
@@ -6862,13 +7435,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;
  }
  
@@ -6908,6 +7476,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;
  }
@@ -6934,6 +7503,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;
@@ -6967,6 +7537,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;
  }
@@ -6998,6 +7569,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;
  }
@@ -7030,6 +7602,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;
  }
@@ -7062,6 +7635,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;
  }
@@ -7093,6 +7667,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;
  }
@@ -7125,6 +7700,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;
  }
@@ -7169,6 +7745,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;
@@ -7211,7 +7788,7 @@ 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)) {
  #if PYTHON_API_VERSION >= 1009
      char* tmpPtr; int tmpSize;
      if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) {
-        PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
@@ -7235,6 +7812,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;
  {
@@ -7269,7 +7847,7 @@ 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)) {
  #if PYTHON_API_VERSION >= 1009
      char* tmpPtr; int tmpSize;
      if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) {
-        PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1)
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1)
@@ -7295,6 +7873,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;
  {
@@ -7354,6 +7933,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;
  {
@@ -7391,6 +7971,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;
@@ -7418,6 +7999,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;
@@ -7446,10 +8028,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;
@@ -7473,6 +8084,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;
  }
@@ -7502,6 +8114,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;
@@ -7532,6 +8145,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;
@@ -7559,6 +8173,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;
@@ -7587,6 +8202,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;
  }
@@ -7614,6 +8230,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;
  }
@@ -7641,6 +8258,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;
  }
@@ -7668,6 +8286,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;
  }
@@ -7694,6 +8313,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;
@@ -7721,6 +8341,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;
@@ -7748,6 +8369,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;
@@ -7783,6 +8405,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);
@@ -7817,6 +8440,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;
  }
@@ -7845,6 +8469,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;
  }
@@ -7873,6 +8498,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;
  }
@@ -7901,6 +8527,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;
  }
@@ -7931,6 +8558,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;
@@ -7959,6 +8587,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;
  }
@@ -7986,6 +8615,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;
  }
@@ -8018,6 +8648,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;
  }
@@ -8046,6 +8677,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;
@@ -8075,6 +8707,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;
@@ -8106,6 +8739,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;
  }
@@ -8136,6 +8770,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;
  }
@@ -8166,6 +8801,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;
  }
@@ -8196,6 +8832,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;
  }
@@ -8223,6 +8860,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;
  }
@@ -8250,6 +8888,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;
  }
@@ -8280,6 +8919,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;
  }
@@ -8310,6 +8950,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;
  }
@@ -8340,6 +8981,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;
  }
@@ -8370,6 +9012,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;
  }
@@ -8397,6 +9040,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;
  }
@@ -8424,6 +9068,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;
  }
@@ -8451,6 +9096,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;
  }
@@ -8478,6 +9124,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;
  }
@@ -8506,6 +9153,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;
@@ -8535,6 +9183,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;
@@ -8564,6 +9213,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;
@@ -8601,6 +9251,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;
  {
@@ -8648,6 +9299,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;
  {
@@ -8687,6 +9339,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());
  }
@@ -8720,6 +9373,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());
  }
@@ -8753,6 +9407,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;
@@ -8782,11 +9437,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;
@@ -8810,6 +9522,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;
@@ -8838,6 +9551,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;
@@ -8873,6 +9587,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;
@@ -8908,6 +9623,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;
@@ -8944,6 +9660,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;
@@ -8973,6 +9690,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;
@@ -9002,6 +9720,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;
@@ -9031,7 +9750,7 @@ 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)) {
  #if PYTHON_API_VERSION >= 1009
      char* tmpPtr; int tmpSize;
      if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) {
-        PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
@@ -9050,6 +9769,7 @@ static PyObject *_wrap_wxGrid_SetRowLabelValue(PyObject *self, PyObject *args, P
          wxGrid_SetRowLabelValue(_arg0,_arg1,*_arg2);
  
      wxPy_END_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;
  {
@@ -9083,7 +9803,7 @@ 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)) {
  #if PYTHON_API_VERSION >= 1009
      char* tmpPtr; int tmpSize;
      if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) {
-        PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
@@ -9102,6 +9822,7 @@ static PyObject *_wrap_wxGrid_SetColLabelValue(PyObject *self, PyObject *args, P
          wxGrid_SetColLabelValue(_arg0,_arg1,*_arg2);
  
      wxPy_END_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;
  {
@@ -9141,6 +9862,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;
@@ -9176,6 +9898,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;
@@ -9206,6 +9987,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;
@@ -9233,6 +10015,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;
@@ -9261,6 +10044,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;
  }
@@ -9290,6 +10074,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;
@@ -9317,6 +10102,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;
@@ -9345,6 +10131,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;
  }
@@ -9374,6 +10161,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;
@@ -9401,6 +10189,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;
@@ -9429,6 +10218,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;
  }
@@ -9465,6 +10255,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;
@@ -9502,6 +10293,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;
@@ -9530,6 +10322,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;
@@ -9558,6 +10351,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;
@@ -9588,6 +10382,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;
@@ -9617,7 +10412,7 @@ 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)) {
  #if PYTHON_API_VERSION >= 1009
      char* tmpPtr; int tmpSize;
      if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) {
-        PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
@@ -9636,6 +10431,7 @@ static PyObject *_wrap_wxGrid_SetColFormatCustom(PyObject *self, PyObject *args,
          wxGrid_SetColFormatCustom(_arg0,_arg1,*_arg2);
  
      wxPy_END_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;
  {
@@ -9670,6 +10466,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;
@@ -9698,6 +10495,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;
  }
@@ -9725,6 +10523,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;
  }
@@ -9753,6 +10552,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;
  }
@@ -9780,6 +10580,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;
  }
@@ -9808,6 +10609,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;
  }
@@ -9836,6 +10638,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;
@@ -9867,6 +10670,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;
@@ -9896,6 +10700,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;
@@ -9927,6 +10732,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;
@@ -9956,6 +10762,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;
@@ -9987,6 +10794,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;
@@ -10032,6 +10840,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;
@@ -10079,6 +10888,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;
@@ -10110,6 +10920,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;
@@ -10139,6 +10950,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;
@@ -10170,6 +10982,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;
@@ -10199,6 +11012,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;
@@ -10230,6 +11044,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;
@@ -10261,6 +11076,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;
@@ -10291,6 +11107,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;
@@ -10321,6 +11138,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;
@@ -10348,6 +11166,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;
@@ -10377,6 +11196,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;
@@ -10406,6 +11226,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;
@@ -10441,6 +11262,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;
@@ -10478,6 +11300,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;
@@ -10513,6 +11336,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;
@@ -10550,6 +11374,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;
@@ -10586,6 +11411,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;
@@ -10624,6 +11450,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;
@@ -10653,6 +11480,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;
@@ -10684,6 +11512,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;
@@ -10720,6 +11549,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;
@@ -10758,6 +11588,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;
@@ -10787,6 +11618,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);
@@ -10823,6 +11655,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);
@@ -10864,6 +11697,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;
@@ -10902,6 +11736,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;
@@ -10931,6 +11766,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);
@@ -10967,6 +11803,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);
@@ -11002,6 +11839,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());
  }
@@ -11036,7 +11874,7 @@ 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)) {
  #if PYTHON_API_VERSION >= 1009
      char* tmpPtr; int tmpSize;
      if (!PyString_Check(_obj3) && !PyUnicode_Check(_obj3)) {
-        PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj3, &tmpPtr, &tmpSize) == -1)
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj3, &tmpPtr, &tmpSize) == -1)
@@ -11055,6 +11893,7 @@ static PyObject *_wrap_wxGrid_SetCellValue(PyObject *self, PyObject *args, PyObj
          wxGrid_SetCellValue(_arg0,_arg1,_arg2,*_arg3);
  
      wxPy_END_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;
  {
@@ -11089,6 +11928,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;
  }
@@ -11120,6 +11960,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;
@@ -11151,6 +11992,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;
@@ -11182,6 +12024,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;
@@ -11216,6 +12059,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;
@@ -11243,6 +12087,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;
@@ -11271,6 +12116,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;
  }
@@ -11297,6 +12143,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;
@@ -11327,6 +12174,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;
  }
@@ -11371,6 +12219,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;
@@ -11400,6 +12249,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;
@@ -11429,6 +12279,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;
@@ -11464,6 +12315,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;
@@ -11499,6 +12351,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;
@@ -11531,7 +12384,7 @@ 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)) {
  #if PYTHON_API_VERSION >= 1009
      char* tmpPtr; int tmpSize;
      if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) {
-        PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1)
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1)
@@ -11564,6 +12417,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;
  {
@@ -11599,6 +12453,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);
@@ -11635,6 +12490,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);
@@ -11670,7 +12526,7 @@ static PyObject *_wrap_wxGrid_GetDefaultEditorForType(PyObject *self, PyObject *
  #if PYTHON_API_VERSION >= 1009
      char* tmpPtr; int tmpSize;
      if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) {
  #if PYTHON_API_VERSION >= 1009
      char* tmpPtr; int tmpSize;
      if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) {
-        PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1)
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1)
@@ -11689,6 +12545,7 @@ static PyObject *_wrap_wxGrid_GetDefaultEditorForType(PyObject *self, PyObject *
          _result = (wxGridCellEditor *)wxGrid_GetDefaultEditorForType(_arg0,*_arg1);
  
      wxPy_END_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);
@@ -11728,7 +12585,7 @@ static PyObject *_wrap_wxGrid_GetDefaultRendererForType(PyObject *self, PyObject
  #if PYTHON_API_VERSION >= 1009
      char* tmpPtr; int tmpSize;
      if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) {
  #if PYTHON_API_VERSION >= 1009
      char* tmpPtr; int tmpSize;
      if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) {
-        PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1)
          return NULL;
      }
      if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1)
@@ -11747,6 +12604,7 @@ static PyObject *_wrap_wxGrid_GetDefaultRendererForType(PyObject *self, PyObject
          _result = (wxGridCellRenderer *)wxGrid_GetDefaultRendererForType(_arg0,*_arg1);
  
      wxPy_END_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);
@@ -11785,11 +12643,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;
@@ -11814,6 +12785,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;
@@ -11859,6 +12838,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);
@@ -11892,6 +12872,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;
  }
@@ -11919,6 +12900,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;
  }
@@ -11947,6 +12929,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;
@@ -11975,6 +12958,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;
  }
@@ -12002,6 +12986,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;
  }
@@ -12029,6 +13014,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;
  }
@@ -12056,6 +13042,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;
  }
@@ -12083,6 +13070,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;
  }
@@ -12111,6 +13099,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;
@@ -12152,6 +13148,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);
@@ -12185,6 +13182,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;
  }
@@ -12213,6 +13211,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;
@@ -12241,6 +13240,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;
  }
@@ -12268,6 +13268,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;
  }
@@ -12295,6 +13296,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;
  }
@@ -12322,6 +13324,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;
  }
@@ -12350,6 +13353,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;
@@ -12407,6 +13418,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);
@@ -12441,6 +13453,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;
@@ -12470,6 +13483,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;
@@ -12498,6 +13512,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;
  }
@@ -12525,6 +13540,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;
  }
@@ -12552,6 +13568,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;
  }
@@ -12579,6 +13596,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;
  }
@@ -12606,6 +13624,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;
  }
@@ -12633,6 +13652,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;
  }
@@ -12660,6 +13680,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;
  }
@@ -12687,6 +13708,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;
  }
@@ -12714,11 +13736,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;
  }
  
  }    _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;
+}
+
+#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 },
@@ -12747,6 +14028,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 },
@@ -12825,6 +14110,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 },
@@ -12836,6 +14123,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 },
@@ -12881,6 +14170,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 },
@@ -13000,12 +14290,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 },
@@ -13015,8 +14307,11 @@ 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 },
          { "wxGridCellAttr_Clone", (PyCFunction) _wrap_wxGridCellAttr_Clone, METH_VARARGS | METH_KEYWORDS },
          { "new_wxGridCellAttr", (PyCFunction) _wrap_new_wxGridCellAttr, METH_VARARGS | METH_KEYWORDS },
+        { "new_wxGridCellAutoWrapStringEditor", (PyCFunction) _wrap_new_wxGridCellAutoWrapStringEditor, METH_VARARGS | METH_KEYWORDS },
+        { "new_wxGridCellEnumEditor", (PyCFunction) _wrap_new_wxGridCellEnumEditor, METH_VARARGS | METH_KEYWORDS },
          { "new_wxGridCellChoiceEditor", (PyCFunction) _wrap_new_wxGridCellChoiceEditor, METH_VARARGS | METH_KEYWORDS },
          { "new_wxGridCellBoolEditor", (PyCFunction) _wrap_new_wxGridCellBoolEditor, METH_VARARGS | METH_KEYWORDS },
          { "new_wxGridCellFloatEditor", (PyCFunction) _wrap_new_wxGridCellFloatEditor, METH_VARARGS | METH_KEYWORDS },
          { "new_wxGridCellChoiceEditor", (PyCFunction) _wrap_new_wxGridCellChoiceEditor, METH_VARARGS | METH_KEYWORDS },
          { "new_wxGridCellBoolEditor", (PyCFunction) _wrap_new_wxGridCellBoolEditor, METH_VARARGS | METH_KEYWORDS },
          { "new_wxGridCellFloatEditor", (PyCFunction) _wrap_new_wxGridCellFloatEditor, METH_VARARGS | METH_KEYWORDS },
@@ -13052,6 +14347,9 @@ static PyMethodDef gridcMethods[] = {
          { "wxGridCellEditor_SetControl", (PyCFunction) _wrap_wxGridCellEditor_SetControl, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellEditor_GetControl", (PyCFunction) _wrap_wxGridCellEditor_GetControl, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellEditor_IsCreated", (PyCFunction) _wrap_wxGridCellEditor_IsCreated, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellEditor_SetControl", (PyCFunction) _wrap_wxGridCellEditor_SetControl, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellEditor_GetControl", (PyCFunction) _wrap_wxGridCellEditor_GetControl, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellEditor_IsCreated", (PyCFunction) _wrap_wxGridCellEditor_IsCreated, METH_VARARGS | METH_KEYWORDS },
+        { "new_wxGridCellAutoWrapStringRenderer", (PyCFunction) _wrap_new_wxGridCellAutoWrapStringRenderer, METH_VARARGS | METH_KEYWORDS },
+        { "new_wxGridCellEnumRenderer", (PyCFunction) _wrap_new_wxGridCellEnumRenderer, METH_VARARGS | METH_KEYWORDS },
+        { "new_wxGridCellDateTimeRenderer", (PyCFunction) _wrap_new_wxGridCellDateTimeRenderer, METH_VARARGS | METH_KEYWORDS },
          { "new_wxGridCellBoolRenderer", (PyCFunction) _wrap_new_wxGridCellBoolRenderer, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellFloatRenderer_SetPrecision", (PyCFunction) _wrap_wxGridCellFloatRenderer_SetPrecision, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellFloatRenderer_GetPrecision", (PyCFunction) _wrap_wxGridCellFloatRenderer_GetPrecision, METH_VARARGS | METH_KEYWORDS },
          { "new_wxGridCellBoolRenderer", (PyCFunction) _wrap_new_wxGridCellBoolRenderer, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellFloatRenderer_SetPrecision", (PyCFunction) _wrap_wxGridCellFloatRenderer_SetPrecision, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellFloatRenderer_GetPrecision", (PyCFunction) _wrap_wxGridCellFloatRenderer_GetPrecision, METH_VARARGS | METH_KEYWORDS },
@@ -13078,33 +14376,12 @@ 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},
+    { "_wxGridCellChoiceEditor","_wxGridCellEnumEditor",SwigwxGridCellEnumEditorTowxGridCellChoiceEditor},
      { "_wxPrintQuality","_WXGRIDSELECTIONMODES",0},
      { "_wxPrintQuality","_wxCoord",0},
      { "_wxPrintQuality","_int",0},
      { "_wxPrintQuality","_WXGRIDSELECTIONMODES",0},
      { "_wxPrintQuality","_wxCoord",0},
      { "_wxPrintQuality","_int",0},
@@ -13115,54 +14392,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},
@@ -13171,38 +14406,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},
@@ -13212,91 +14416,26 @@ 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","_wxGridCellAutoWrapStringRenderer",SwigwxGridCellAutoWrapStringRendererTowxGridCellStringRenderer},
+    { "_wxGridCellStringRenderer","_wxGridCellEnumRenderer",SwigwxGridCellEnumRendererTowxGridCellStringRenderer},
+    { "_wxGridCellStringRenderer","_wxGridCellDateTimeRenderer",SwigwxGridCellDateTimeRendererTowxGridCellStringRenderer},
      { "_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},
+    { "_struct_wxNativeFontInfo","_wxNativeFontInfo",0},
      { "_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},
@@ -13307,106 +14446,39 @@ 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},
+    { "_wxNativeFontInfo","_struct_wxNativeFontInfo",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","_wxGridCellAutoWrapStringEditor",SwigwxGridCellAutoWrapStringEditorTowxGridCellEditor},
+    { "_wxGridCellEditor","_wxGridCellEnumEditor",SwigwxGridCellEnumEditorTowxGridCellEditor},
      { "_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},
@@ -13415,25 +14487,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},
@@ -13444,7 +14500,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},
@@ -13455,10 +14510,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},
@@ -13467,44 +14518,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},
@@ -13515,73 +14528,19 @@ 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","_wxGridCellAutoWrapStringRenderer",SwigwxGridCellAutoWrapStringRendererTowxGridCellRenderer},
+    { "_wxGridCellRenderer","_wxGridCellEnumRenderer",SwigwxGridCellEnumRendererTowxGridCellRenderer},
+    { "_wxGridCellRenderer","_wxGridCellDateTimeRenderer",SwigwxGridCellDateTimeRendererTowxGridCellRenderer},
      { "_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","_wxGridCellAutoWrapStringEditor",SwigwxGridCellAutoWrapStringEditorTowxGridCellTextEditor},
      { "_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;
@@ -13626,6 +14585,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));