Added VC++ project files for remaining Gizmo samples

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

index b32d7a19db860018b53d814ab306f58453556e90..70512a99213e9f31d5750e1a0580e71eab6050d2 100644 (file)
--- a/wxPython/src/gtk/grid.cpp
+++ b/wxPython/src/gtk/grid.cpp
@@ -89,14 +89,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
  #if PYTHON_API_VERSION >= 1009
      static char* wxStringErrorMsg = "String or Unicode type required";
  #else
  #if PYTHON_API_VERSION >= 1009
      static char* wxStringErrorMsg = "String or Unicode type required";
  #else
-    static char* wxStringErrorMsg = "string type is required for parameter";
+    static char* wxStringErrorMsg = "String type required";
  #endif
  
  #define PYCALLBACK_GCA_INTINTKIND(PCLASS, CBNAME)                               \
      wxGridCellAttr* CBNAME(int a, int b, wxGridCellAttr::wxAttrKind c) {        \
          wxGridCellAttr* rval = NULL;                                            \
          bool found;                                                             \
  #endif
  
  #define PYCALLBACK_GCA_INTINTKIND(PCLASS, CBNAME)                               \
      wxGridCellAttr* CBNAME(int a, int b, wxGridCellAttr::wxAttrKind c) {        \
          wxGridCellAttr* rval = NULL;                                            \
          bool found;                                                             \
-        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                            \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
              wxGridCellAttr* ptr;                                                \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
              wxGridCellAttr* ptr;                                                \
@@ -107,7 +107,7 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
-        wxPyEndBlockThreads(state);                                             \
+        wxPyEndBlockThreads();                                             \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a, b, c);                                     \
          return rval;                                                            \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a, b, c);                                     \
          return rval;                                                            \
@@ -120,14 +120,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
  
  #define PYCALLBACK__GCAINTINT(PCLASS, CBNAME)                                   \
      void CBNAME(wxGridCellAttr *attr, int a, int b) {                           \
  
  #define PYCALLBACK__GCAINTINT(PCLASS, CBNAME)                                   \
      void CBNAME(wxGridCellAttr *attr, int a, int b) {                           \
-        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        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);                                                     \
          }                                                                       \
          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);                                             \
+        wxPyEndBlockThreads();                                             \
          if (! found)                                                            \
              PCLASS::CBNAME(attr, a, b);                                         \
      }                                                                           \
          if (! found)                                                            \
              PCLASS::CBNAME(attr, a, b);                                         \
      }                                                                           \
@@ -139,14 +139,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
  
  #define PYCALLBACK__GCAINT(PCLASS, CBNAME)                                      \
      void CBNAME(wxGridCellAttr *attr, int val) {                                \
  
  #define PYCALLBACK__GCAINT(PCLASS, CBNAME)                                      \
      void CBNAME(wxGridCellAttr *attr, int val) {                                \
-        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        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);                                                     \
          }                                                                       \
          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);                                             \
+        wxPyEndBlockThreads();                                             \
          if (! found)                                                            \
              PCLASS::CBNAME(attr, val);                                          \
      }                                                                           \
          if (! found)                                                            \
              PCLASS::CBNAME(attr, val);                                          \
      }                                                                           \
@@ -158,11 +158,11 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
  
  #define PYCALLBACK_INT__pure(CBNAME)                                            \
      int  CBNAME() {                                                             \
  
  #define PYCALLBACK_INT__pure(CBNAME)                                            \
      int  CBNAME() {                                                             \
-        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                            \
          int rval = 0;                                                           \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME))                            \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));         \
          int rval = 0;                                                           \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME))                            \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));         \
-        wxPyEndBlockThreads(state);                                             \
+        wxPyEndBlockThreads();                                             \
          return rval;                                                            \
      }
  
          return rval;                                                            \
      }
  
@@ -170,11 +170,11 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
  
  #define PYCALLBACK_BOOL_INTINT_pure(CBNAME)                                     \
      bool CBNAME(int a, int b) {                                                 \
  
  #define PYCALLBACK_BOOL_INTINT_pure(CBNAME)                                     \
      bool CBNAME(int a, int b) {                                                 \
-        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                            \
          bool rval = 0;                                                          \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME))                            \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b));   \
          bool rval = 0;                                                          \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME))                            \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b));   \
-        wxPyEndBlockThreads(state);                                             \
+        wxPyEndBlockThreads();                                             \
          return rval;                                                            \
      }
  
          return rval;                                                            \
      }
  
@@ -182,7 +182,7 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
  
  #define PYCALLBACK_STRING_INTINT_pure(CBNAME)                                   \
      wxString CBNAME(int a, int b) {                                             \
  
  #define PYCALLBACK_STRING_INTINT_pure(CBNAME)                                   \
      wxString CBNAME(int a, int b) {                                             \
-        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                            \
          wxString rval;                                                          \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
              PyObject* ro;                                                       \
          wxString rval;                                                          \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
              PyObject* ro;                                                       \
@@ -193,7 +193,7 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
                  Py_DECREF(ro);  Py_DECREF(str);                                 \
              }                                                                   \
          }                                                                       \
                  Py_DECREF(ro);  Py_DECREF(str);                                 \
              }                                                                   \
          }                                                                       \
-        wxPyEndBlockThreads(state);                                             \
+        wxPyEndBlockThreads();                                             \
          return rval;                                                            \
      }
  
          return rval;                                                            \
      }
  
@@ -201,17 +201,17 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
  
  #define PYCALLBACK__INTINTSTRING_pure(CBNAME)                                   \
      void CBNAME(int a, int b, const wxString& c) {                              \
  
  #define PYCALLBACK__INTINTSTRING_pure(CBNAME)                                   \
      void CBNAME(int a, int b, const wxString& c) {                              \
-        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                            \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME))                            \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iis)",a,b,c.c_str()));\
          if (wxPyCBH_findCallback(m_myInst, #CBNAME))                            \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iis)",a,b,c.c_str()));\
-        wxPyEndBlockThreads(state);                                             \
+        wxPyEndBlockThreads();                                             \
      }
  
  
  #define PYCALLBACK_STRING_INTINT(PCLASS, CBNAME)                                \
      wxString CBNAME(int a, int b) {                                             \
          bool found;                                                             \
      }
  
  
  #define PYCALLBACK_STRING_INTINT(PCLASS, CBNAME)                                \
      wxString CBNAME(int a, int b) {                                             \
          bool found;                                                             \
-        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                            \
          wxString rval;                                                          \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
          wxString rval;                                                          \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
@@ -222,7 +222,7 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
                  Py_DECREF(ro);  Py_DECREF(str);                                 \
              }                                                                   \
          }                                                                       \
                  Py_DECREF(ro);  Py_DECREF(str);                                 \
              }                                                                   \
          }                                                                       \
-        wxPyEndBlockThreads(state);                                             \
+        wxPyEndBlockThreads();                                             \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a, b);                                        \
          return rval;                                                            \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a, b);                                        \
          return rval;                                                            \
@@ -235,12 +235,12 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
  
  #define PYCALLBACK_BOOL_INTINTSTRING(PCLASS, CBNAME)                            \
      bool CBNAME(int a, int b, const wxString& c)  {                             \
  
  #define PYCALLBACK_BOOL_INTINTSTRING(PCLASS, CBNAME)                            \
      bool CBNAME(int a, int b, const wxString& c)  {                             \
-        bool rval;                                                              \
+        bool rval = 0;                                                          \
          bool found;                                                             \
          bool found;                                                             \
-        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                            \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iis)", a,b,c.c_str()));\
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iis)", a,b,c.c_str()));\
-        wxPyEndBlockThreads(state);                                             \
+        wxPyEndBlockThreads();                                             \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a,b,c);                                       \
          return rval;                                                            \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a,b,c);                                       \
          return rval;                                                            \
@@ -256,10 +256,10 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
      long CBNAME(int a, int b)  {                                                \
          long rval;                                                              \
          bool found;                                                             \
      long CBNAME(int a, int b)  {                                                \
          long rval;                                                              \
          bool found;                                                             \
-        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                            \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));  \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));  \
-        wxPyEndBlockThreads(state);                                             \
+        wxPyEndBlockThreads();                                             \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a,b);                                         \
          return rval;                                                            \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a,b);                                         \
          return rval;                                                            \
@@ -272,12 +272,12 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
  
  #define PYCALLBACK_BOOL_INTINT(PCLASS, CBNAME)                                  \
      bool CBNAME(int a, int b)  {                                                \
  
  #define PYCALLBACK_BOOL_INTINT(PCLASS, CBNAME)                                  \
      bool CBNAME(int a, int b)  {                                                \
-        bool rval;                                                              \
+        bool rval = 0;                                                          \
          bool found;                                                             \
          bool found;                                                             \
-        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                            \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));  \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));  \
-        wxPyEndBlockThreads(state);                                             \
+        wxPyEndBlockThreads();                                             \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a,b);                                         \
          return rval;                                                            \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a,b);                                         \
          return rval;                                                            \
@@ -291,7 +291,7 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
  #define PYCALLBACK_DOUBLE_INTINT(PCLASS, CBNAME)                                \
      double CBNAME(int a, int b) {                                               \
          bool found;                                                             \
  #define PYCALLBACK_DOUBLE_INTINT(PCLASS, CBNAME)                                \
      double CBNAME(int a, int b) {                                               \
          bool found;                                                             \
-        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                            \
          double rval;                                                            \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
          double rval;                                                            \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
@@ -302,7 +302,7 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
                  Py_DECREF(ro);   Py_DECREF(str);                                \
              }                                                                   \
          }                                                                       \
                  Py_DECREF(ro);   Py_DECREF(str);                                \
              }                                                                   \
          }                                                                       \
-        wxPyEndBlockThreads(state);                                             \
+        wxPyEndBlockThreads();                                             \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a, b);                                        \
          return rval;                                                            \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a, b);                                        \
          return rval;                                                            \
@@ -316,10 +316,10 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
  #define PYCALLBACK__(PCLASS, CBNAME)                                            \
      void CBNAME()  {                                                            \
          bool found;                                                             \
  #define PYCALLBACK__(PCLASS, CBNAME)                                            \
      void CBNAME()  {                                                            \
          bool found;                                                             \
-        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                            \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));                \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));                \
-        wxPyEndBlockThreads(state);                                             \
+        wxPyEndBlockThreads();                                             \
          if (! found)                                                            \
              PCLASS::CBNAME();                                                   \
      }                                                                           \
          if (! found)                                                            \
              PCLASS::CBNAME();                                                   \
      }                                                                           \
@@ -332,12 +332,12 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
  
  #define PYCALLBACK_BOOL_SIZETSIZET(PCLASS, CBNAME)                              \
      bool CBNAME(size_t a, size_t b)  {                                          \
  
  #define PYCALLBACK_BOOL_SIZETSIZET(PCLASS, CBNAME)                              \
      bool CBNAME(size_t a, size_t b)  {                                          \
-        bool rval;                                                              \
+        bool rval = 0;                                                          \
          bool found;                                                             \
          bool found;                                                             \
-        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                            \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));  \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));  \
-        wxPyEndBlockThreads(state);                                             \
+        wxPyEndBlockThreads();                                             \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a,b);                                         \
          return rval;                                                            \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a,b);                                         \
          return rval;                                                            \
@@ -350,12 +350,12 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
  
  #define PYCALLBACK_BOOL_SIZET(PCLASS, CBNAME)                                   \
      bool CBNAME(size_t a)  {                                                    \
  
  #define PYCALLBACK_BOOL_SIZET(PCLASS, CBNAME)                                   \
      bool CBNAME(size_t a)  {                                                    \
-        bool rval;                                                              \
+        bool rval = 0;                                                          \
          bool found;                                                             \
          bool found;                                                             \
-        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                            \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a));     \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a));     \
-        wxPyEndBlockThreads(state);                                             \
+        wxPyEndBlockThreads();                                             \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a);                                           \
          return rval;                                                            \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a);                                           \
          return rval;                                                            \
@@ -369,7 +369,7 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
  #define PYCALLBACK_STRING_INT(PCLASS, CBNAME)                                   \
      wxString CBNAME(int a) {                                                    \
          bool found;                                                             \
  #define PYCALLBACK_STRING_INT(PCLASS, CBNAME)                                   \
      wxString CBNAME(int a) {                                                    \
          bool found;                                                             \
-        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                            \
          wxString rval;                                                          \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
          wxString rval;                                                          \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
@@ -380,7 +380,7 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
                  Py_DECREF(ro);   Py_DECREF(str);                                \
              }                                                                   \
          }                                                                       \
                  Py_DECREF(ro);   Py_DECREF(str);                                \
              }                                                                   \
          }                                                                       \
-        wxPyEndBlockThreads(state);                                             \
+        wxPyEndBlockThreads();                                             \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a);                                           \
          return rval;                                                            \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a);                                           \
          return rval;                                                            \
@@ -394,10 +394,10 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
  #define PYCALLBACK__INTSTRING(PCLASS, CBNAME)                                   \
      void CBNAME(int a, const wxString& c)  {                                    \
          bool found;                                                             \
  #define PYCALLBACK__INTSTRING(PCLASS, CBNAME)                                   \
      void CBNAME(int a, const wxString& c)  {                                    \
          bool found;                                                             \
-        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                            \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(is)", a,c.c_str())); \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(is)", a,c.c_str())); \
-        wxPyEndBlockThreads(state);                                             \
+        wxPyEndBlockThreads();                                             \
          if (! found)                                                            \
              PCLASS::CBNAME(a,c);                                                \
      }                                                                           \
          if (! found)                                                            \
              PCLASS::CBNAME(a,c);                                                \
      }                                                                           \
@@ -410,12 +410,12 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
  
  #define PYCALLBACK_BOOL_(PCLASS, CBNAME)                                        \
      bool CBNAME()  {                                                            \
  
  #define PYCALLBACK_BOOL_(PCLASS, CBNAME)                                        \
      bool CBNAME()  {                                                            \
-        bool rval;                                                              \
+        bool rval = 0;                                                          \
          bool found;                                                             \
          bool found;                                                             \
-        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                            \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));         \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));         \
-        wxPyEndBlockThreads(state);                                             \
+        wxPyEndBlockThreads();                                             \
          if (! found)                                                            \
              rval = PCLASS::CBNAME();                                            \
          return rval;                                                            \
          if (! found)                                                            \
              rval = PCLASS::CBNAME();                                            \
          return rval;                                                            \
@@ -429,10 +429,10 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
  #define PYCALLBACK__SIZETINT(PCLASS, CBNAME)                                    \
      void CBNAME(size_t a, int b)  {                                             \
          bool found;                                                             \
  #define PYCALLBACK__SIZETINT(PCLASS, CBNAME)                                    \
      void CBNAME(size_t a, int b)  {                                             \
          bool found;                                                             \
-        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                            \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));         \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));         \
-        wxPyEndBlockThreads(state);                                             \
+        wxPyEndBlockThreads();                                             \
          if (! found)                                                            \
              PCLASS::CBNAME(a,b);                                                \
      }                                                                           \
          if (! found)                                                            \
              PCLASS::CBNAME(a,b);                                                \
      }                                                                           \
@@ -446,10 +446,10 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
  #define PYCALLBACK__INTINTLONG(PCLASS, CBNAME)                                  \
      void CBNAME(int a, int b, long c)  {                                        \
          bool found;                                                             \
  #define PYCALLBACK__INTINTLONG(PCLASS, CBNAME)                                  \
      void CBNAME(int a, int b, long c)  {                                        \
          bool found;                                                             \
-        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                            \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));      \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));      \
-        wxPyEndBlockThreads(state);                                             \
+        wxPyEndBlockThreads();                                             \
          if (! found)                                                            \
              PCLASS::CBNAME(a,b,c);                                              \
      }                                                                           \
          if (! found)                                                            \
              PCLASS::CBNAME(a,b,c);                                              \
      }                                                                           \
@@ -463,10 +463,10 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
  #define PYCALLBACK__INTINTDOUBLE(PCLASS, CBNAME)                                \
      void CBNAME(int a, int b, double c)  {                                      \
          bool found;                                                             \
  #define PYCALLBACK__INTINTDOUBLE(PCLASS, CBNAME)                                \
      void CBNAME(int a, int b, double c)  {                                      \
          bool found;                                                             \
-        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                            \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iif)", a,b,c));      \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iif)", a,b,c));      \
-        wxPyEndBlockThreads(state);                                             \
+        wxPyEndBlockThreads();                                             \
          if (! found)                                                            \
              PCLASS::CBNAME(a,b,c);                                              \
      }                                                                           \
          if (! found)                                                            \
              PCLASS::CBNAME(a,b,c);                                              \
      }                                                                           \
@@ -479,10 +479,10 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
  #define PYCALLBACK__INTINTBOOL(PCLASS, CBNAME)                                  \
      void CBNAME(int a, int b, bool c)  {                                        \
          bool found;                                                             \
  #define PYCALLBACK__INTINTBOOL(PCLASS, CBNAME)                                  \
      void CBNAME(int a, int b, bool c)  {                                        \
          bool found;                                                             \
-        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                            \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));      \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));      \
-        wxPyEndBlockThreads(state);                                             \
+        wxPyEndBlockThreads();                                             \
          if (! found)                                                            \
              PCLASS::CBNAME(a,b,c);                                              \
      }                                                                           \
          if (! found)                                                            \
              PCLASS::CBNAME(a,b,c);                                              \
      }                                                                           \
@@ -503,7 +503,7 @@ 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) {
-        wxPyTState* state = wxPyBeginBlockThreads();
+        wxPyBeginBlockThreads();
          if (wxPyCBH_findCallback(m_myInst, "Draw")) {
              wxPyCBH_callCallback(m_myInst,
                  Py_BuildValue("(OOOOiii)",
          if (wxPyCBH_findCallback(m_myInst, "Draw")) {
              wxPyCBH_callCallback(m_myInst,
                  Py_BuildValue("(OOOOiii)",
@@ -513,13 +513,13 @@ public:
                                wxPyConstructObject((void*)&rect, "wxRect", 0),
                                row, col, isSelected));
          }
                                wxPyConstructObject((void*)&rect, "wxRect", 0),
                                row, col, isSelected));
          }
-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();
      }
  
      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;
-        wxPyTState* state = wxPyBeginBlockThreads();
+        wxPyBeginBlockThreads();
          if (wxPyCBH_findCallback(m_myInst, "GetBestSize")) {
              PyObject* ro;
              wxSize*   ptr;
          if (wxPyCBH_findCallback(m_myInst, "GetBestSize")) {
              PyObject* ro;
              wxSize*   ptr;
@@ -535,14 +535,14 @@ public:
                  Py_DECREF(ro);
              }
          }
                  Py_DECREF(ro);
              }
          }
-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();
          return rval;
      }
  
  
      wxGridCellRenderer *Clone() const {
          wxGridCellRenderer* rval = NULL;
          return rval;
      }
  
  
      wxGridCellRenderer *Clone() const {
          wxGridCellRenderer* rval = NULL;
-        wxPyTState* state = wxPyBeginBlockThreads();
+        wxPyBeginBlockThreads();
          if (wxPyCBH_findCallback(m_myInst, "Clone")) {
              PyObject* ro;
              wxGridCellRenderer* ptr;
          if (wxPyCBH_findCallback(m_myInst, "Clone")) {
              PyObject* ro;
              wxGridCellRenderer* ptr;
@@ -553,7 +553,7 @@ public:
                  Py_DECREF(ro);
              }
          }
                  Py_DECREF(ro);
              }
          }
-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();
          return rval;
      }
  
          return rval;
      }
  
@@ -571,7 +571,7 @@ public:
      wxPyGridCellEditor() : wxGridCellEditor() {}
  
      void Create(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler) {
      wxPyGridCellEditor() : wxGridCellEditor() {}
  
      void Create(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler) {
-        wxPyTState* state = wxPyBeginBlockThreads();
+        wxPyBeginBlockThreads();
          if (wxPyCBH_findCallback(m_myInst, "Create")) {
              wxPyCBH_callCallback(m_myInst,
                  Py_BuildValue("(OiO)",
          if (wxPyCBH_findCallback(m_myInst, "Create")) {
              wxPyCBH_callCallback(m_myInst,
                  Py_BuildValue("(OiO)",
@@ -579,37 +579,37 @@ public:
                                id,
                                wxPyConstructObject((void*)evtHandler, "wxEvtHandler", 0)));
          }
                                id,
                                wxPyConstructObject((void*)evtHandler, "wxEvtHandler", 0)));
          }
-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();
      }
  
  
      void BeginEdit(int row, int col, wxGrid* grid) {
      }
  
  
      void BeginEdit(int row, int col, wxGrid* grid) {
-        wxPyTState* state = wxPyBeginBlockThreads();
+        wxPyBeginBlockThreads();
          if (wxPyCBH_findCallback(m_myInst, "BeginEdit")) {
              wxPyCBH_callCallback(m_myInst,
                  Py_BuildValue("(iiO)", row, col,
                                wxPyConstructObject((void*)grid, "wxGrid", 0)));
          }
          if (wxPyCBH_findCallback(m_myInst, "BeginEdit")) {
              wxPyCBH_callCallback(m_myInst,
                  Py_BuildValue("(iiO)", row, col,
                                wxPyConstructObject((void*)grid, "wxGrid", 0)));
          }
-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();
      }
  
  
      bool EndEdit(int row, int col, wxGrid* grid) {
          bool rv = FALSE;
      }
  
  
      bool EndEdit(int row, int col, wxGrid* grid) {
          bool rv = FALSE;
-        wxPyTState* state = wxPyBeginBlockThreads();
+        wxPyBeginBlockThreads();
          if (wxPyCBH_findCallback(m_myInst, "EndEdit")) {
              rv = wxPyCBH_callCallback(m_myInst,
                  Py_BuildValue("(iiO)", row, col,
                                wxPyConstructObject((void*)grid, "wxGrid", 0)));
          }
          if (wxPyCBH_findCallback(m_myInst, "EndEdit")) {
              rv = wxPyCBH_callCallback(m_myInst,
                  Py_BuildValue("(iiO)", row, col,
                                wxPyConstructObject((void*)grid, "wxGrid", 0)));
          }
-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();
          return rv;
      }
  
  
      wxGridCellEditor*Clone() const {
          wxGridCellEditor* rval = NULL;
          return rv;
      }
  
  
      wxGridCellEditor*Clone() const {
          wxGridCellEditor* rval = NULL;
-        wxPyTState* state = wxPyBeginBlockThreads();
+        wxPyBeginBlockThreads();
          if (wxPyCBH_findCallback(m_myInst, "Clone")) {
              PyObject* ro;
              wxGridCellEditor* ptr;
          if (wxPyCBH_findCallback(m_myInst, "Clone")) {
              PyObject* ro;
              wxGridCellEditor* ptr;
@@ -620,19 +620,19 @@ public:
                  Py_DECREF(ro);
              }
          }
                  Py_DECREF(ro);
              }
          }
-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();
          return rval;
      }
  
  
      void Show(bool show, wxGridCellAttr *attr) {
          bool found;
          return rval;
      }
  
  
      void Show(bool show, wxGridCellAttr *attr) {
          bool found;
-        wxPyTState* state = wxPyBeginBlockThreads();
+        wxPyBeginBlockThreads();
          if ((found = wxPyCBH_findCallback(m_myInst, "Show")))
              wxPyCBH_callCallback(m_myInst,
                  Py_BuildValue("(iO)", show,
                                wxPyConstructObject((void*)attr, "wxGridCellAttr", 0)));
          if ((found = wxPyCBH_findCallback(m_myInst, "Show")))
              wxPyCBH_callCallback(m_myInst,
                  Py_BuildValue("(iO)", show,
                                wxPyConstructObject((void*)attr, "wxGridCellAttr", 0)));
-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();
          if (! found)
              wxGridCellEditor::Show(show, attr);
      }
          if (! found)
              wxGridCellEditor::Show(show, attr);
      }
@@ -643,13 +643,13 @@ public:
  
      void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) {
          bool found;                                                             \
  
      void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) {
          bool found;                                                             \
-        wxPyTState* state = wxPyBeginBlockThreads();
+        wxPyBeginBlockThreads();
          if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground)")))
              wxPyCBH_callCallback(m_myInst,
                  Py_BuildValue("(OO)",
                                wxPyConstructObject((void*)&rectCell, "wxRect", 0),
                                wxPyConstructObject((void*)attr, "wxGridCellAttr", 0)));
          if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground)")))
              wxPyCBH_callCallback(m_myInst,
                  Py_BuildValue("(OO)",
                                wxPyConstructObject((void*)&rectCell, "wxRect", 0),
                                wxPyConstructObject((void*)attr, "wxGridCellAttr", 0)));
-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();
          if (! found)
              wxGridCellEditor::PaintBackground(rectCell, attr);
      }
          if (! found)
              wxGridCellEditor::PaintBackground(rectCell, attr);
      }
@@ -724,7 +724,7 @@ public:
  
  
      wxString GetValue(int row, int col) {
  
  
      wxString GetValue(int row, int col) {
-        wxPyTState* state = wxPyBeginBlockThreads();
+        wxPyBeginBlockThreads();
          wxString rval;
          if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
              PyObject* ro;
          wxString rval;
          if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
              PyObject* ro;
@@ -736,15 +736,15 @@ public:
                  Py_DECREF(str);
              }
          }
                  Py_DECREF(str);
              }
          }
-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();
          return rval;
      }
  
      void SetValue(int row, int col, const wxString& val) {
          return rval;
      }
  
      void SetValue(int row, int col, const wxString& val) {
-        wxPyTState* state = wxPyBeginBlockThreads();
+        wxPyBeginBlockThreads();
          if (wxPyCBH_findCallback(m_myInst, "SetValue"))
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iis)",row,col,val.c_str()));
          if (wxPyCBH_findCallback(m_myInst, "SetValue"))
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iis)",row,col,val.c_str()));
-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();
      }
  
  
      }
  
  
@@ -752,7 +752,7 @@ 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;
-        wxPyTState* state = wxPyBeginBlockThreads();
+        wxPyBeginBlockThreads();
          if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
              PyObject* ro;
              PyObject* num;
          if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
              PyObject* ro;
              PyObject* num;
@@ -766,13 +766,13 @@ public:
                  Py_DECREF(ro);
              }
          }
                  Py_DECREF(ro);
              }
          }
-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();
          return rval;
      }
  
      double GetValueAsDouble( int row, int col ) {
          double rval = 0.0;
          return rval;
      }
  
      double GetValueAsDouble( int row, int col ) {
          double rval = 0.0;
-        wxPyTState* state = wxPyBeginBlockThreads();
+        wxPyBeginBlockThreads();
          if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
              PyObject* ro;
              PyObject* num;
          if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
              PyObject* ro;
              PyObject* num;
@@ -786,7 +786,7 @@ public:
                  Py_DECREF(ro);
              }
          }
                  Py_DECREF(ro);
              }
          }
-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();
          return rval;
      }
  
          return rval;
      }
  
@@ -795,19 +795,19 @@ public:
      }
  
      void SetValueAsLong( int row, int col, long value ) {
      }
  
      void SetValueAsLong( int row, int col, long value ) {
-        wxPyTState* state = wxPyBeginBlockThreads();
+        wxPyBeginBlockThreads();
          if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", row, col, value));
          }
          if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", row, col, value));
          }
-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();
      }
  
      void SetValueAsDouble( int row, int col, double value ) {
      }
  
      void SetValueAsDouble( int row, int col, double value ) {
-        wxPyTState* state = wxPyBeginBlockThreads();
+        wxPyBeginBlockThreads();
          if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iid)", row, col, value));
          }
          if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iid)", row, col, value));
          }
-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();
      }
  
      void SetValueAsBool( int row, int col, bool value ) {
      }
  
      void SetValueAsBool( int row, int col, bool value ) {
@@ -913,10 +913,10 @@ static PyObject *_wrap_wxGridCellRenderer_SetParameters(PyObject *self, PyObject
  #endif
  }
  {
  #endif
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellRenderer_SetParameters(_arg0,*_arg1);
  
          wxGridCellRenderer_SetParameters(_arg0,*_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -945,10 +945,10 @@ static PyObject *_wrap_wxGridCellRenderer_IncRef(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellRenderer_IncRef(_arg0);
  
          wxGridCellRenderer_IncRef(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -973,10 +973,10 @@ static PyObject *_wrap_wxGridCellRenderer_DecRef(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellRenderer_DecRef(_arg0);
  
          wxGridCellRenderer_DecRef(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -1041,10 +1041,10 @@ static PyObject *_wrap_wxGridCellRenderer_Draw(PyObject *self, PyObject *args, P
  }
      _arg7 = (bool ) tempbool7;
  {
  }
      _arg7 = (bool ) tempbool7;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellRenderer_Draw(_arg0,*_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6,_arg7);
  
          wxGridCellRenderer_Draw(_arg0,*_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6,_arg7);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -1100,10 +1100,10 @@ static PyObject *_wrap_wxGridCellRenderer_GetBestSize(PyObject *self, PyObject *
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = new wxSize (wxGridCellRenderer_GetBestSize(_arg0,*_arg1,*_arg2,*_arg3,_arg4,_arg5));
  
          _result = new wxSize (wxGridCellRenderer_GetBestSize(_arg0,*_arg1,*_arg2,*_arg3,_arg4,_arg5));
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p");
      _resultobj = Py_BuildValue("s",_ptemp);
@@ -1130,10 +1130,10 @@ static PyObject *_wrap_wxGridCellRenderer_Clone(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellRenderer *)wxGridCellRenderer_Clone(_arg0);
  
          _result = (wxGridCellRenderer *)wxGridCellRenderer_Clone(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellRenderer_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellRenderer_p");
@@ -1164,10 +1164,10 @@ static PyObject *_wrap_new_wxPyGridCellRenderer(PyObject *self, PyObject *args,
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxPyGridCellRenderer",_kwnames)) 
          return NULL;
  {
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxPyGridCellRenderer",_kwnames)) 
          return NULL;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxPyGridCellRenderer *)new_wxPyGridCellRenderer();
  
          _result = (wxPyGridCellRenderer *)new_wxPyGridCellRenderer();
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyGridCellRenderer_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyGridCellRenderer_p");
@@ -1179,8 +1179,8 @@ static PyObject *_wrap_new_wxPyGridCellRenderer(PyObject *self, PyObject *args,
      return _resultobj;
  }
  
      return _resultobj;
  }
  
-#define wxPyGridCellRenderer__setSelf(_swigobj,_swigarg0,_swigarg1)  (_swigobj->_setSelf(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxPyGridCellRenderer__setSelf(PyObject *self, PyObject *args, PyObject *kwargs) {
+#define wxPyGridCellRenderer__setCallbackInfo(_swigobj,_swigarg0,_swigarg1)  (_swigobj->_setCallbackInfo(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxPyGridCellRenderer__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
      wxPyGridCellRenderer * _arg0;
      PyObject * _arg1;
      PyObject * _resultobj;
      wxPyGridCellRenderer * _arg0;
      PyObject * _arg1;
@@ -1191,12 +1191,12 @@ static PyObject *_wrap_wxPyGridCellRenderer__setSelf(PyObject *self, PyObject *a
      char *_kwnames[] = { "self","self","_class", NULL };
  
      self = self;
      char *_kwnames[] = { "self","self","_class", NULL };
  
      self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPyGridCellRenderer__setSelf",_kwnames,&_argo0,&_obj1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPyGridCellRenderer__setCallbackInfo",_kwnames,&_argo0,&_obj1,&_obj2)) 
          return NULL;
      if (_argo0) {
          if (_argo0 == Py_None) { _arg0 = NULL; }
          else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyGridCellRenderer_p")) {
          return NULL;
      if (_argo0) {
          if (_argo0 == Py_None) { _arg0 = NULL; }
          else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyGridCellRenderer_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyGridCellRenderer__setSelf. Expected _wxPyGridCellRenderer_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyGridCellRenderer__setCallbackInfo. Expected _wxPyGridCellRenderer_p.");
          return NULL;
          }
      }
          return NULL;
          }
      }
@@ -1207,10 +1207,10 @@ static PyObject *_wrap_wxPyGridCellRenderer__setSelf(PyObject *self, PyObject *a
    _arg2 = _obj2;
  }
  {
    _arg2 = _obj2;
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
-        wxPyGridCellRenderer__setSelf(_arg0,_arg1,_arg2);
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+        wxPyGridCellRenderer__setCallbackInfo(_arg0,_arg1,_arg2);
  
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -1255,10 +1255,10 @@ static PyObject *_wrap_wxPyGridCellRenderer_base_SetParameters(PyObject *self, P
  #endif
  }
  {
  #endif
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxPyGridCellRenderer_base_SetParameters(_arg0,*_arg1);
  
          wxPyGridCellRenderer_base_SetParameters(_arg0,*_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -1288,10 +1288,10 @@ static PyObject *_wrap_new_wxGridCellStringRenderer(PyObject *self, PyObject *ar
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxGridCellStringRenderer",_kwnames)) 
          return NULL;
  {
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxGridCellStringRenderer",_kwnames)) 
          return NULL;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellStringRenderer *)new_wxGridCellStringRenderer();
  
          _result = (wxGridCellStringRenderer *)new_wxGridCellStringRenderer();
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellStringRenderer_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellStringRenderer_p");
@@ -1330,10 +1330,10 @@ static PyObject *_wrap_new_wxGridCellNumberRenderer(PyObject *self, PyObject *ar
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxGridCellNumberRenderer",_kwnames)) 
          return NULL;
  {
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxGridCellNumberRenderer",_kwnames)) 
          return NULL;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellNumberRenderer *)new_wxGridCellNumberRenderer();
  
          _result = (wxGridCellNumberRenderer *)new_wxGridCellNumberRenderer();
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellNumberRenderer_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellNumberRenderer_p");
@@ -1374,10 +1374,10 @@ static PyObject *_wrap_new_wxGridCellFloatRenderer(PyObject *self, PyObject *arg
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|ii:new_wxGridCellFloatRenderer",_kwnames,&_arg0,&_arg1)) 
          return NULL;
  {
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|ii:new_wxGridCellFloatRenderer",_kwnames,&_arg0,&_arg1)) 
          return NULL;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellFloatRenderer *)new_wxGridCellFloatRenderer(_arg0,_arg1);
  
          _result = (wxGridCellFloatRenderer *)new_wxGridCellFloatRenderer(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellFloatRenderer_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellFloatRenderer_p");
@@ -1408,10 +1408,10 @@ static PyObject *_wrap_wxGridCellFloatRenderer_GetWidth(PyObject *self, PyObject
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGridCellFloatRenderer_GetWidth(_arg0);
  
          _result = (int )wxGridCellFloatRenderer_GetWidth(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -1436,10 +1436,10 @@ static PyObject *_wrap_wxGridCellFloatRenderer_SetWidth(PyObject *self, PyObject
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellFloatRenderer_SetWidth(_arg0,_arg1);
  
          wxGridCellFloatRenderer_SetWidth(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -1465,10 +1465,10 @@ static PyObject *_wrap_wxGridCellFloatRenderer_GetPrecision(PyObject *self, PyOb
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGridCellFloatRenderer_GetPrecision(_arg0);
  
          _result = (int )wxGridCellFloatRenderer_GetPrecision(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -1493,10 +1493,10 @@ static PyObject *_wrap_wxGridCellFloatRenderer_SetPrecision(PyObject *self, PyOb
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellFloatRenderer_SetPrecision(_arg0,_arg1);
  
          wxGridCellFloatRenderer_SetPrecision(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -1522,10 +1522,10 @@ static PyObject *_wrap_new_wxGridCellBoolRenderer(PyObject *self, PyObject *args
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxGridCellBoolRenderer",_kwnames)) 
          return NULL;
  {
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxGridCellBoolRenderer",_kwnames)) 
          return NULL;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellBoolRenderer *)new_wxGridCellBoolRenderer();
  
          _result = (wxGridCellBoolRenderer *)new_wxGridCellBoolRenderer();
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellBoolRenderer_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellBoolRenderer_p");
@@ -1606,10 +1606,10 @@ static PyObject *_wrap_new_wxGridCellDateTimeRenderer(PyObject *self, PyObject *
  #endif
  }
  {
  #endif
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellDateTimeRenderer *)new_wxGridCellDateTimeRenderer(*_arg0,*_arg1);
  
          _result = (wxGridCellDateTimeRenderer *)new_wxGridCellDateTimeRenderer(*_arg0,*_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellDateTimeRenderer_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellDateTimeRenderer_p");
@@ -1665,10 +1665,10 @@ static PyObject *_wrap_new_wxGridCellEnumRenderer(PyObject *self, PyObject *args
      }
  }
  {
      }
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellEnumRenderer *)new_wxGridCellEnumRenderer(*_arg0);
  
          _result = (wxGridCellEnumRenderer *)new_wxGridCellEnumRenderer(*_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellEnumRenderer_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellEnumRenderer_p");
@@ -1710,10 +1710,10 @@ static PyObject *_wrap_new_wxGridCellAutoWrapStringRenderer(PyObject *self, PyOb
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxGridCellAutoWrapStringRenderer",_kwnames)) 
          return NULL;
  {
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxGridCellAutoWrapStringRenderer",_kwnames)) 
          return NULL;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellAutoWrapStringRenderer *)new_wxGridCellAutoWrapStringRenderer();
  
          _result = (wxGridCellAutoWrapStringRenderer *)new_wxGridCellAutoWrapStringRenderer();
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAutoWrapStringRenderer_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAutoWrapStringRenderer_p");
@@ -1744,10 +1744,10 @@ static PyObject *_wrap_wxGridCellEditor_IsCreated(PyObject *self, PyObject *args
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridCellEditor_IsCreated(_arg0);
  
          _result = (bool )wxGridCellEditor_IsCreated(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -1772,10 +1772,10 @@ static PyObject *_wrap_wxGridCellEditor_GetControl(PyObject *self, PyObject *arg
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxControl *)wxGridCellEditor_GetControl(_arg0);
  
          _result = (wxControl *)wxGridCellEditor_GetControl(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }{ _resultobj = wxPyMake_wxObject(_result); }
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }{ _resultobj = wxPyMake_wxObject(_result); }
      return _resultobj;
@@ -1808,10 +1808,10 @@ static PyObject *_wrap_wxGridCellEditor_SetControl(PyObject *self, PyObject *arg
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellEditor_SetControl(_arg0,_arg1);
  
          wxGridCellEditor_SetControl(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -1856,10 +1856,10 @@ static PyObject *_wrap_wxGridCellEditor_SetParameters(PyObject *self, PyObject *
  #endif
  }
  {
  #endif
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellEditor_SetParameters(_arg0,*_arg1);
  
          wxGridCellEditor_SetParameters(_arg0,*_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -1888,10 +1888,10 @@ static PyObject *_wrap_wxGridCellEditor_IncRef(PyObject *self, PyObject *args, P
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellEditor_IncRef(_arg0);
  
          wxGridCellEditor_IncRef(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -1916,10 +1916,10 @@ static PyObject *_wrap_wxGridCellEditor_DecRef(PyObject *self, PyObject *args, P
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellEditor_DecRef(_arg0);
  
          wxGridCellEditor_DecRef(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -1963,10 +1963,10 @@ static PyObject *_wrap_wxGridCellEditor_Create(PyObject *self, PyObject *args, P
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellEditor_Create(_arg0,_arg1,_arg2,_arg3);
  
          wxGridCellEditor_Create(_arg0,_arg1,_arg2,_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -2002,10 +2002,10 @@ static PyObject *_wrap_wxGridCellEditor_BeginEdit(PyObject *self, PyObject *args
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellEditor_BeginEdit(_arg0,_arg1,_arg2,_arg3);
  
          wxGridCellEditor_BeginEdit(_arg0,_arg1,_arg2,_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -2042,10 +2042,10 @@ static PyObject *_wrap_wxGridCellEditor_EndEdit(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridCellEditor_EndEdit(_arg0,_arg1,_arg2,_arg3);
  
          _result = (bool )wxGridCellEditor_EndEdit(_arg0,_arg1,_arg2,_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -2069,10 +2069,10 @@ static PyObject *_wrap_wxGridCellEditor_Reset(PyObject *self, PyObject *args, Py
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellEditor_Reset(_arg0);
  
          wxGridCellEditor_Reset(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -2099,10 +2099,10 @@ static PyObject *_wrap_wxGridCellEditor_Clone(PyObject *self, PyObject *args, Py
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellEditor *)wxGridCellEditor_Clone(_arg0);
  
          _result = (wxGridCellEditor *)wxGridCellEditor_Clone(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellEditor_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellEditor_p");
@@ -2140,10 +2140,10 @@ static PyObject *_wrap_wxGridCellEditor_SetSize(PyObject *self, PyObject *args,
          return NULL;
  }
  {
          return NULL;
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellEditor_SetSize(_arg0,*_arg1);
  
          wxGridCellEditor_SetSize(_arg0,*_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -2180,10 +2180,10 @@ static PyObject *_wrap_wxGridCellEditor_Show(PyObject *self, PyObject *args, PyO
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellEditor_Show(_arg0,_arg1,_arg2);
  
          wxGridCellEditor_Show(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -2225,10 +2225,10 @@ static PyObject *_wrap_wxGridCellEditor_PaintBackground(PyObject *self, PyObject
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellEditor_PaintBackground(_arg0,*_arg1,_arg2);
  
          wxGridCellEditor_PaintBackground(_arg0,*_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -2263,10 +2263,10 @@ static PyObject *_wrap_wxGridCellEditor_IsAcceptedKey(PyObject *self, PyObject *
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridCellEditor_IsAcceptedKey(_arg0,*_arg1);
  
          _result = (bool )wxGridCellEditor_IsAcceptedKey(_arg0,*_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -2299,10 +2299,10 @@ static PyObject *_wrap_wxGridCellEditor_StartingKey(PyObject *self, PyObject *ar
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellEditor_StartingKey(_arg0,*_arg1);
  
          wxGridCellEditor_StartingKey(_arg0,*_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -2327,10 +2327,10 @@ static PyObject *_wrap_wxGridCellEditor_StartingClick(PyObject *self, PyObject *
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellEditor_StartingClick(_arg0);
  
          wxGridCellEditor_StartingClick(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -2364,10 +2364,10 @@ static PyObject *_wrap_wxGridCellEditor_HandleReturn(PyObject *self, PyObject *a
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellEditor_HandleReturn(_arg0,*_arg1);
  
          wxGridCellEditor_HandleReturn(_arg0,*_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -2392,10 +2392,10 @@ static PyObject *_wrap_wxGridCellEditor_Destroy(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellEditor_Destroy(_arg0);
  
          wxGridCellEditor_Destroy(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -2421,10 +2421,10 @@ static PyObject *_wrap_new_wxPyGridCellEditor(PyObject *self, PyObject *args, Py
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxPyGridCellEditor",_kwnames)) 
          return NULL;
  {
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxPyGridCellEditor",_kwnames)) 
          return NULL;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxPyGridCellEditor *)new_wxPyGridCellEditor();
  
          _result = (wxPyGridCellEditor *)new_wxPyGridCellEditor();
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyGridCellEditor_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyGridCellEditor_p");
@@ -2436,8 +2436,8 @@ static PyObject *_wrap_new_wxPyGridCellEditor(PyObject *self, PyObject *args, Py
      return _resultobj;
  }
  
      return _resultobj;
  }
  
-#define wxPyGridCellEditor__setSelf(_swigobj,_swigarg0,_swigarg1)  (_swigobj->_setSelf(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxPyGridCellEditor__setSelf(PyObject *self, PyObject *args, PyObject *kwargs) {
+#define wxPyGridCellEditor__setCallbackInfo(_swigobj,_swigarg0,_swigarg1)  (_swigobj->_setCallbackInfo(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxPyGridCellEditor__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
      wxPyGridCellEditor * _arg0;
      PyObject * _arg1;
      PyObject * _resultobj;
      wxPyGridCellEditor * _arg0;
      PyObject * _arg1;
@@ -2448,12 +2448,12 @@ static PyObject *_wrap_wxPyGridCellEditor__setSelf(PyObject *self, PyObject *arg
      char *_kwnames[] = { "self","self","_class", NULL };
  
      self = self;
      char *_kwnames[] = { "self","self","_class", NULL };
  
      self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPyGridCellEditor__setSelf",_kwnames,&_argo0,&_obj1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPyGridCellEditor__setCallbackInfo",_kwnames,&_argo0,&_obj1,&_obj2)) 
          return NULL;
      if (_argo0) {
          if (_argo0 == Py_None) { _arg0 = NULL; }
          else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyGridCellEditor_p")) {
          return NULL;
      if (_argo0) {
          if (_argo0 == Py_None) { _arg0 = NULL; }
          else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyGridCellEditor_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyGridCellEditor__setSelf. Expected _wxPyGridCellEditor_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyGridCellEditor__setCallbackInfo. Expected _wxPyGridCellEditor_p.");
          return NULL;
          }
      }
          return NULL;
          }
      }
@@ -2464,10 +2464,10 @@ static PyObject *_wrap_wxPyGridCellEditor__setSelf(PyObject *self, PyObject *arg
    _arg2 = _obj2;
  }
  {
    _arg2 = _obj2;
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
-        wxPyGridCellEditor__setSelf(_arg0,_arg1,_arg2);
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+        wxPyGridCellEditor__setCallbackInfo(_arg0,_arg1,_arg2);
  
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -2500,10 +2500,10 @@ static PyObject *_wrap_wxPyGridCellEditor_base_SetSize(PyObject *self, PyObject
          return NULL;
  }
  {
          return NULL;
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxPyGridCellEditor_base_SetSize(_arg0,*_arg1);
  
          wxPyGridCellEditor_base_SetSize(_arg0,*_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -2540,10 +2540,10 @@ static PyObject *_wrap_wxPyGridCellEditor_base_Show(PyObject *self, PyObject *ar
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxPyGridCellEditor_base_Show(_arg0,_arg1,_arg2);
  
          wxPyGridCellEditor_base_Show(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -2585,10 +2585,10 @@ static PyObject *_wrap_wxPyGridCellEditor_base_PaintBackground(PyObject *self, P
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxPyGridCellEditor_base_PaintBackground(_arg0,*_arg1,_arg2);
  
          wxPyGridCellEditor_base_PaintBackground(_arg0,*_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -2622,10 +2622,10 @@ static PyObject *_wrap_wxPyGridCellEditor_base_IsAcceptedKey(PyObject *self, PyO
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxPyGridCellEditor_base_IsAcceptedKey(_arg0,*_arg1);
  
          wxPyGridCellEditor_base_IsAcceptedKey(_arg0,*_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -2659,10 +2659,10 @@ static PyObject *_wrap_wxPyGridCellEditor_base_StartingKey(PyObject *self, PyObj
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxPyGridCellEditor_base_StartingKey(_arg0,*_arg1);
  
          wxPyGridCellEditor_base_StartingKey(_arg0,*_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -2687,10 +2687,10 @@ static PyObject *_wrap_wxPyGridCellEditor_base_StartingClick(PyObject *self, PyO
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxPyGridCellEditor_base_StartingClick(_arg0);
  
          wxPyGridCellEditor_base_StartingClick(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -2724,10 +2724,10 @@ static PyObject *_wrap_wxPyGridCellEditor_base_HandleReturn(PyObject *self, PyOb
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxPyGridCellEditor_base_HandleReturn(_arg0,*_arg1);
  
          wxPyGridCellEditor_base_HandleReturn(_arg0,*_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -2752,10 +2752,10 @@ static PyObject *_wrap_wxPyGridCellEditor_base_Destroy(PyObject *self, PyObject
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxPyGridCellEditor_base_Destroy(_arg0);
  
          wxPyGridCellEditor_base_Destroy(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -2800,10 +2800,10 @@ static PyObject *_wrap_wxPyGridCellEditor_base_SetParameters(PyObject *self, PyO
  #endif
  }
  {
  #endif
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxPyGridCellEditor_base_SetParameters(_arg0,*_arg1);
  
          wxPyGridCellEditor_base_SetParameters(_arg0,*_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -2833,10 +2833,10 @@ static PyObject *_wrap_new_wxGridCellTextEditor(PyObject *self, PyObject *args,
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxGridCellTextEditor",_kwnames)) 
          return NULL;
  {
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxGridCellTextEditor",_kwnames)) 
          return NULL;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellTextEditor *)new_wxGridCellTextEditor();
  
          _result = (wxGridCellTextEditor *)new_wxGridCellTextEditor();
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellTextEditor_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellTextEditor_p");
@@ -2877,10 +2877,10 @@ static PyObject *_wrap_new_wxGridCellNumberEditor(PyObject *self, PyObject *args
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|ii:new_wxGridCellNumberEditor",_kwnames,&_arg0,&_arg1)) 
          return NULL;
  {
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|ii:new_wxGridCellNumberEditor",_kwnames,&_arg0,&_arg1)) 
          return NULL;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellNumberEditor *)new_wxGridCellNumberEditor(_arg0,_arg1);
  
          _result = (wxGridCellNumberEditor *)new_wxGridCellNumberEditor(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellNumberEditor_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellNumberEditor_p");
@@ -2919,10 +2919,10 @@ static PyObject *_wrap_new_wxGridCellFloatEditor(PyObject *self, PyObject *args,
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxGridCellFloatEditor",_kwnames)) 
          return NULL;
  {
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxGridCellFloatEditor",_kwnames)) 
          return NULL;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellFloatEditor *)new_wxGridCellFloatEditor();
  
          _result = (wxGridCellFloatEditor *)new_wxGridCellFloatEditor();
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellFloatEditor_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellFloatEditor_p");
@@ -2953,10 +2953,10 @@ static PyObject *_wrap_new_wxGridCellBoolEditor(PyObject *self, PyObject *args,
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxGridCellBoolEditor",_kwnames)) 
          return NULL;
  {
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxGridCellBoolEditor",_kwnames)) 
          return NULL;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellBoolEditor *)new_wxGridCellBoolEditor();
  
          _result = (wxGridCellBoolEditor *)new_wxGridCellBoolEditor();
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellBoolEditor_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellBoolEditor_p");
@@ -3008,10 +3008,10 @@ static PyObject *_wrap_new_wxGridCellChoiceEditor(PyObject *self, PyObject *args
      }
  }
  {
      }
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellChoiceEditor *)new_wxGridCellChoiceEditor(_arg0,_arg1,_arg2);
  
          _result = (wxGridCellChoiceEditor *)new_wxGridCellChoiceEditor(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellChoiceEditor_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellChoiceEditor_p");
@@ -3062,10 +3062,10 @@ static PyObject *_wrap_new_wxGridCellEnumEditor(PyObject *self, PyObject *args,
      }
  }
  {
      }
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellEnumEditor *)new_wxGridCellEnumEditor(*_arg0);
  
          _result = (wxGridCellEnumEditor *)new_wxGridCellEnumEditor(*_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellEnumEditor_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellEnumEditor_p");
@@ -3107,10 +3107,10 @@ static PyObject *_wrap_new_wxGridCellAutoWrapStringEditor(PyObject *self, PyObje
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxGridCellAutoWrapStringEditor",_kwnames)) 
          return NULL;
  {
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxGridCellAutoWrapStringEditor",_kwnames)) 
          return NULL;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellAutoWrapStringEditor *)new_wxGridCellAutoWrapStringEditor();
  
          _result = (wxGridCellAutoWrapStringEditor *)new_wxGridCellAutoWrapStringEditor();
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAutoWrapStringEditor_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAutoWrapStringEditor_p");
@@ -3122,21 +3122,30 @@ static PyObject *_wrap_new_wxGridCellAutoWrapStringEditor(PyObject *self, PyObje
      return _resultobj;
  }
  
      return _resultobj;
  }
  
-#define new_wxGridCellAttr() (new wxGridCellAttr())
+#define new_wxGridCellAttr(_swigarg0) (new wxGridCellAttr(_swigarg0))
  static PyObject *_wrap_new_wxGridCellAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
      wxGridCellAttr * _result;
  static PyObject *_wrap_new_wxGridCellAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
      wxGridCellAttr * _result;
-    char *_kwnames[] = {  NULL };
+    wxGridCellAttr * _arg0 = (wxGridCellAttr *) NULL;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "attrDefault", NULL };
      char _ptemp[128];
  
      self = self;
      char _ptemp[128];
  
      self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxGridCellAttr",_kwnames)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|O:new_wxGridCellAttr",_kwnames,&_argo0)) 
          return NULL;
          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 new_wxGridCellAttr. Expected _wxGridCellAttr_p.");
+        return NULL;
+        }
+    }
  {
  {
-    wxPy_BEGIN_ALLOW_THREADS;
-        _result = (wxGridCellAttr *)new_wxGridCellAttr();
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+        _result = (wxGridCellAttr *)new_wxGridCellAttr(_arg0);
  
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAttr_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAttr_p");
@@ -3168,10 +3177,10 @@ static PyObject *_wrap_wxGridCellAttr_Clone(PyObject *self, PyObject *args, PyOb
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellAttr *)wxGridCellAttr_Clone(_arg0);
  
          _result = (wxGridCellAttr *)wxGridCellAttr_Clone(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAttr_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAttr_p");
@@ -3210,10 +3219,10 @@ static PyObject *_wrap_wxGridCellAttr_MergeWith(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellAttr_MergeWith(_arg0,_arg1);
  
          wxGridCellAttr_MergeWith(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -3238,10 +3247,10 @@ static PyObject *_wrap_wxGridCellAttr_IncRef(PyObject *self, PyObject *args, PyO
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellAttr_IncRef(_arg0);
  
          wxGridCellAttr_IncRef(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -3266,10 +3275,10 @@ static PyObject *_wrap_wxGridCellAttr_DecRef(PyObject *self, PyObject *args, PyO
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellAttr_DecRef(_arg0);
  
          wxGridCellAttr_DecRef(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -3302,10 +3311,10 @@ static PyObject *_wrap_wxGridCellAttr_SetTextColour(PyObject *self, PyObject *ar
          return NULL;
  }
  {
          return NULL;
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellAttr_SetTextColour(_arg0,*_arg1);
  
          wxGridCellAttr_SetTextColour(_arg0,*_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -3338,10 +3347,10 @@ static PyObject *_wrap_wxGridCellAttr_SetBackgroundColour(PyObject *self, PyObje
          return NULL;
  }
  {
          return NULL;
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellAttr_SetBackgroundColour(_arg0,*_arg1);
  
          wxGridCellAttr_SetBackgroundColour(_arg0,*_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -3375,10 +3384,10 @@ static PyObject *_wrap_wxGridCellAttr_SetFont(PyObject *self, PyObject *args, Py
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellAttr_SetFont(_arg0,*_arg1);
  
          wxGridCellAttr_SetFont(_arg0,*_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -3405,10 +3414,10 @@ static PyObject *_wrap_wxGridCellAttr_SetAlignment(PyObject *self, PyObject *arg
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellAttr_SetAlignment(_arg0,_arg1,_arg2);
  
          wxGridCellAttr_SetAlignment(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -3436,10 +3445,10 @@ static PyObject *_wrap_wxGridCellAttr_SetReadOnly(PyObject *self, PyObject *args
      }
      _arg1 = (bool ) tempbool1;
  {
      }
      _arg1 = (bool ) tempbool1;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellAttr_SetReadOnly(_arg0,_arg1);
  
          wxGridCellAttr_SetReadOnly(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -3473,10 +3482,10 @@ static PyObject *_wrap_wxGridCellAttr_SetRenderer(PyObject *self, PyObject *args
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellAttr_SetRenderer(_arg0,_arg1);
  
          wxGridCellAttr_SetRenderer(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -3510,10 +3519,10 @@ static PyObject *_wrap_wxGridCellAttr_SetEditor(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellAttr_SetEditor(_arg0,_arg1);
  
          wxGridCellAttr_SetEditor(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -3539,10 +3548,10 @@ static PyObject *_wrap_wxGridCellAttr_SetKind(PyObject *self, PyObject *args, Py
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellAttr_SetKind(_arg0,_arg1);
  
          wxGridCellAttr_SetKind(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -3568,10 +3577,10 @@ static PyObject *_wrap_wxGridCellAttr_HasTextColour(PyObject *self, PyObject *ar
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridCellAttr_HasTextColour(_arg0);
  
          _result = (bool )wxGridCellAttr_HasTextColour(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -3596,10 +3605,10 @@ static PyObject *_wrap_wxGridCellAttr_HasBackgroundColour(PyObject *self, PyObje
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridCellAttr_HasBackgroundColour(_arg0);
  
          _result = (bool )wxGridCellAttr_HasBackgroundColour(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -3624,10 +3633,10 @@ static PyObject *_wrap_wxGridCellAttr_HasFont(PyObject *self, PyObject *args, Py
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridCellAttr_HasFont(_arg0);
  
          _result = (bool )wxGridCellAttr_HasFont(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -3652,10 +3661,10 @@ static PyObject *_wrap_wxGridCellAttr_HasAlignment(PyObject *self, PyObject *arg
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridCellAttr_HasAlignment(_arg0);
  
          _result = (bool )wxGridCellAttr_HasAlignment(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -3680,10 +3689,10 @@ static PyObject *_wrap_wxGridCellAttr_HasRenderer(PyObject *self, PyObject *args
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridCellAttr_HasRenderer(_arg0);
  
          _result = (bool )wxGridCellAttr_HasRenderer(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -3708,10 +3717,10 @@ static PyObject *_wrap_wxGridCellAttr_HasEditor(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridCellAttr_HasEditor(_arg0);
  
          _result = (bool )wxGridCellAttr_HasEditor(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -3736,10 +3745,10 @@ static PyObject *_wrap_wxGridCellAttr_HasReadWriteMode(PyObject *self, PyObject
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridCellAttr_HasReadWriteMode(_arg0);
  
          _result = (bool )wxGridCellAttr_HasReadWriteMode(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -3765,19 +3774,13 @@ static PyObject *_wrap_wxGridCellAttr_GetTextColour(PyObject *self, PyObject *ar
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
-        const wxColour & _result_ref = wxGridCellAttr_GetTextColour(_arg0);
-    _result = (wxColour *) &_result_ref;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+        _result = new wxColour (wxGridCellAttr_GetTextColour(_arg0));
  
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
      if (PyErr_Occurred()) return NULL;
-}    if (_result) {
-        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
-        _resultobj = Py_BuildValue("s",_ptemp);
-    } else {
-        Py_INCREF(Py_None);
-        _resultobj = Py_None;
-    }
+}    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
  }
  
      return _resultobj;
  }
  
@@ -3801,19 +3804,13 @@ static PyObject *_wrap_wxGridCellAttr_GetBackgroundColour(PyObject *self, PyObje
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
-        const wxColour & _result_ref = wxGridCellAttr_GetBackgroundColour(_arg0);
-    _result = (wxColour *) &_result_ref;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+        _result = new wxColour (wxGridCellAttr_GetBackgroundColour(_arg0));
  
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
      if (PyErr_Occurred()) return NULL;
-}    if (_result) {
-        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
-        _resultobj = Py_BuildValue("s",_ptemp);
-    } else {
-        Py_INCREF(Py_None);
-        _resultobj = Py_None;
-    }
+}    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
  }
  
      return _resultobj;
  }
  
@@ -3837,19 +3834,13 @@ static PyObject *_wrap_wxGridCellAttr_GetFont(PyObject *self, PyObject *args, Py
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
-        const wxFont & _result_ref = wxGridCellAttr_GetFont(_arg0);
-    _result = (wxFont *) &_result_ref;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+        _result = new wxFont (wxGridCellAttr_GetFont(_arg0));
  
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
      if (PyErr_Occurred()) return NULL;
-}    if (_result) {
-        SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
-        _resultobj = Py_BuildValue("s",_ptemp);
-    } else {
-        Py_INCREF(Py_None);
-        _resultobj = Py_None;
-    }
+}    SWIG_MakePtr(_ptemp, (void *) _result,"_wxFont_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
      return _resultobj;
  }
  
      return _resultobj;
  }
  
@@ -3881,10 +3872,10 @@ static PyObject *_wrap_wxGridCellAttr_GetAlignment(PyObject *self, PyObject *arg
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellAttr_GetAlignment(_arg0,_arg1,_arg2);
  
          wxGridCellAttr_GetAlignment(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -3932,10 +3923,10 @@ static PyObject *_wrap_wxGridCellAttr_GetRenderer(PyObject *self, PyObject *args
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellRenderer *)wxGridCellAttr_GetRenderer(_arg0,_arg1,_arg2,_arg3);
  
          _result = (wxGridCellRenderer *)wxGridCellAttr_GetRenderer(_arg0,_arg1,_arg2,_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellRenderer_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellRenderer_p");
@@ -3978,10 +3969,10 @@ static PyObject *_wrap_wxGridCellAttr_GetEditor(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellEditor *)wxGridCellAttr_GetEditor(_arg0,_arg1,_arg2,_arg3);
  
          _result = (wxGridCellEditor *)wxGridCellAttr_GetEditor(_arg0,_arg1,_arg2,_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellEditor_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellEditor_p");
@@ -4012,10 +4003,10 @@ static PyObject *_wrap_wxGridCellAttr_IsReadOnly(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridCellAttr_IsReadOnly(_arg0);
  
          _result = (bool )wxGridCellAttr_IsReadOnly(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -4048,10 +4039,10 @@ static PyObject *_wrap_wxGridCellAttr_SetDefAttr(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellAttr_SetDefAttr(_arg0,_arg1);
  
          wxGridCellAttr_SetDefAttr(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -4069,10 +4060,10 @@ static PyObject *_wrap_new_wxGridCellAttrProvider(PyObject *self, PyObject *args
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxGridCellAttrProvider",_kwnames)) 
          return NULL;
  {
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxGridCellAttrProvider",_kwnames)) 
          return NULL;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellAttrProvider *)new_wxGridCellAttrProvider();
  
          _result = (wxGridCellAttrProvider *)new_wxGridCellAttrProvider();
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAttrProvider_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAttrProvider_p");
@@ -4107,10 +4098,10 @@ static PyObject *_wrap_wxGridCellAttrProvider_GetAttr(PyObject *self, PyObject *
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellAttr *)wxGridCellAttrProvider_GetAttr(_arg0,_arg1,_arg2,_arg3);
  
          _result = (wxGridCellAttr *)wxGridCellAttrProvider_GetAttr(_arg0,_arg1,_arg2,_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAttr_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAttr_p");
@@ -4151,10 +4142,10 @@ static PyObject *_wrap_wxGridCellAttrProvider_SetAttr(PyObject *self, PyObject *
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellAttrProvider_SetAttr(_arg0,_arg1,_arg2,_arg3);
  
          wxGridCellAttrProvider_SetAttr(_arg0,_arg1,_arg2,_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -4189,10 +4180,10 @@ static PyObject *_wrap_wxGridCellAttrProvider_SetRowAttr(PyObject *self, PyObjec
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellAttrProvider_SetRowAttr(_arg0,_arg1,_arg2);
  
          wxGridCellAttrProvider_SetRowAttr(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -4227,10 +4218,10 @@ static PyObject *_wrap_wxGridCellAttrProvider_SetColAttr(PyObject *self, PyObjec
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellAttrProvider_SetColAttr(_arg0,_arg1,_arg2);
  
          wxGridCellAttrProvider_SetColAttr(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -4257,10 +4248,10 @@ static PyObject *_wrap_wxGridCellAttrProvider_UpdateAttrRows(PyObject *self, PyO
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellAttrProvider_UpdateAttrRows(_arg0,_arg1,_arg2);
  
          wxGridCellAttrProvider_UpdateAttrRows(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -4287,10 +4278,10 @@ static PyObject *_wrap_wxGridCellAttrProvider_UpdateAttrCols(PyObject *self, PyO
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellAttrProvider_UpdateAttrCols(_arg0,_arg1,_arg2);
  
          wxGridCellAttrProvider_UpdateAttrCols(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -4316,10 +4307,10 @@ static PyObject *_wrap_new_wxPyGridCellAttrProvider(PyObject *self, PyObject *ar
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxPyGridCellAttrProvider",_kwnames)) 
          return NULL;
  {
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxPyGridCellAttrProvider",_kwnames)) 
          return NULL;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxPyGridCellAttrProvider *)new_wxPyGridCellAttrProvider();
  
          _result = (wxPyGridCellAttrProvider *)new_wxPyGridCellAttrProvider();
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyGridCellAttrProvider_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyGridCellAttrProvider_p");
@@ -4331,8 +4322,8 @@ static PyObject *_wrap_new_wxPyGridCellAttrProvider(PyObject *self, PyObject *ar
      return _resultobj;
  }
  
      return _resultobj;
  }
  
-#define wxPyGridCellAttrProvider__setSelf(_swigobj,_swigarg0,_swigarg1)  (_swigobj->_setSelf(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxPyGridCellAttrProvider__setSelf(PyObject *self, PyObject *args, PyObject *kwargs) {
+#define wxPyGridCellAttrProvider__setCallbackInfo(_swigobj,_swigarg0,_swigarg1)  (_swigobj->_setCallbackInfo(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxPyGridCellAttrProvider__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
      wxPyGridCellAttrProvider * _arg0;
      PyObject * _arg1;
      PyObject * _resultobj;
      wxPyGridCellAttrProvider * _arg0;
      PyObject * _arg1;
@@ -4343,12 +4334,12 @@ static PyObject *_wrap_wxPyGridCellAttrProvider__setSelf(PyObject *self, PyObjec
      char *_kwnames[] = { "self","self","_class", NULL };
  
      self = self;
      char *_kwnames[] = { "self","self","_class", NULL };
  
      self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPyGridCellAttrProvider__setSelf",_kwnames,&_argo0,&_obj1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPyGridCellAttrProvider__setCallbackInfo",_kwnames,&_argo0,&_obj1,&_obj2)) 
          return NULL;
      if (_argo0) {
          if (_argo0 == Py_None) { _arg0 = NULL; }
          else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyGridCellAttrProvider_p")) {
          return NULL;
      if (_argo0) {
          if (_argo0 == Py_None) { _arg0 = NULL; }
          else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyGridCellAttrProvider_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyGridCellAttrProvider__setSelf. Expected _wxPyGridCellAttrProvider_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyGridCellAttrProvider__setCallbackInfo. Expected _wxPyGridCellAttrProvider_p.");
          return NULL;
          }
      }
          return NULL;
          }
      }
@@ -4359,10 +4350,10 @@ static PyObject *_wrap_wxPyGridCellAttrProvider__setSelf(PyObject *self, PyObjec
    _arg2 = _obj2;
  }
  {
    _arg2 = _obj2;
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
-        wxPyGridCellAttrProvider__setSelf(_arg0,_arg1,_arg2);
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+        wxPyGridCellAttrProvider__setCallbackInfo(_arg0,_arg1,_arg2);
  
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -4392,10 +4383,10 @@ static PyObject *_wrap_wxPyGridCellAttrProvider_base_GetAttr(PyObject *self, PyO
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellAttr *)wxPyGridCellAttrProvider_base_GetAttr(_arg0,_arg1,_arg2,_arg3);
  
          _result = (wxGridCellAttr *)wxPyGridCellAttrProvider_base_GetAttr(_arg0,_arg1,_arg2,_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAttr_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAttr_p");
@@ -4436,10 +4427,10 @@ static PyObject *_wrap_wxPyGridCellAttrProvider_base_SetAttr(PyObject *self, PyO
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxPyGridCellAttrProvider_base_SetAttr(_arg0,_arg1,_arg2,_arg3);
  
          wxPyGridCellAttrProvider_base_SetAttr(_arg0,_arg1,_arg2,_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -4474,10 +4465,10 @@ static PyObject *_wrap_wxPyGridCellAttrProvider_base_SetRowAttr(PyObject *self,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxPyGridCellAttrProvider_base_SetRowAttr(_arg0,_arg1,_arg2);
  
          wxPyGridCellAttrProvider_base_SetRowAttr(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -4512,10 +4503,10 @@ static PyObject *_wrap_wxPyGridCellAttrProvider_base_SetColAttr(PyObject *self,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxPyGridCellAttrProvider_base_SetColAttr(_arg0,_arg1,_arg2);
  
          wxPyGridCellAttrProvider_base_SetColAttr(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -4557,10 +4548,10 @@ static PyObject *_wrap_wxGridTableBase_SetAttrProvider(PyObject *self, PyObject
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridTableBase_SetAttrProvider(_arg0,_arg1);
  
          wxGridTableBase_SetAttrProvider(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -4587,10 +4578,10 @@ static PyObject *_wrap_wxGridTableBase_GetAttrProvider(PyObject *self, PyObject
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellAttrProvider *)wxGridTableBase_GetAttrProvider(_arg0);
  
          _result = (wxGridCellAttrProvider *)wxGridTableBase_GetAttrProvider(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAttrProvider_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAttrProvider_p");
@@ -4629,10 +4620,10 @@ static PyObject *_wrap_wxGridTableBase_SetView(PyObject *self, PyObject *args, P
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridTableBase_SetView(_arg0,_arg1);
  
          wxGridTableBase_SetView(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -4658,10 +4649,10 @@ static PyObject *_wrap_wxGridTableBase_GetView(PyObject *self, PyObject *args, P
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGrid *)wxGridTableBase_GetView(_arg0);
  
          _result = (wxGrid *)wxGridTableBase_GetView(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }{ _resultobj = wxPyMake_wxObject(_result); }
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }{ _resultobj = wxPyMake_wxObject(_result); }
      return _resultobj;
@@ -4686,10 +4677,10 @@ static PyObject *_wrap_wxGridTableBase_GetNumberRows(PyObject *self, PyObject *a
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGridTableBase_GetNumberRows(_arg0);
  
          _result = (int )wxGridTableBase_GetNumberRows(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -4714,10 +4705,10 @@ static PyObject *_wrap_wxGridTableBase_GetNumberCols(PyObject *self, PyObject *a
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGridTableBase_GetNumberCols(_arg0);
  
          _result = (int )wxGridTableBase_GetNumberCols(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -4744,10 +4735,10 @@ static PyObject *_wrap_wxGridTableBase_IsEmptyCell(PyObject *self, PyObject *arg
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridTableBase_IsEmptyCell(_arg0,_arg1,_arg2);
  
          _result = (bool )wxGridTableBase_IsEmptyCell(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -4774,10 +4765,10 @@ static PyObject *_wrap_wxGridTableBase_GetValue(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = new wxString (wxGridTableBase_GetValue(_arg0,_arg1,_arg2));
  
          _result = new wxString (wxGridTableBase_GetValue(_arg0,_arg1,_arg2));
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
      if (PyErr_Occurred()) return NULL;
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
@@ -4828,10 +4819,10 @@ static PyObject *_wrap_wxGridTableBase_SetValue(PyObject *self, PyObject *args,
  #endif
  }
  {
  #endif
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridTableBase_SetValue(_arg0,_arg1,_arg2,*_arg3);
  
          wxGridTableBase_SetValue(_arg0,_arg1,_arg2,*_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -4863,10 +4854,10 @@ static PyObject *_wrap_wxGridTableBase_GetTypeName(PyObject *self, PyObject *arg
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = new wxString (wxGridTableBase_GetTypeName(_arg0,_arg1,_arg2));
  
          _result = new wxString (wxGridTableBase_GetTypeName(_arg0,_arg1,_arg2));
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
      if (PyErr_Occurred()) return NULL;
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
@@ -4918,10 +4909,10 @@ static PyObject *_wrap_wxGridTableBase_CanGetValueAs(PyObject *self, PyObject *a
  #endif
  }
  {
  #endif
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridTableBase_CanGetValueAs(_arg0,_arg1,_arg2,*_arg3);
  
          _result = (bool )wxGridTableBase_CanGetValueAs(_arg0,_arg1,_arg2,*_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
  {
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
  {
@@ -4972,10 +4963,10 @@ static PyObject *_wrap_wxGridTableBase_CanSetValueAs(PyObject *self, PyObject *a
  #endif
  }
  {
  #endif
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridTableBase_CanSetValueAs(_arg0,_arg1,_arg2,*_arg3);
  
          _result = (bool )wxGridTableBase_CanSetValueAs(_arg0,_arg1,_arg2,*_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
  {
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
  {
@@ -5006,10 +4997,10 @@ static PyObject *_wrap_wxGridTableBase_GetValueAsLong(PyObject *self, PyObject *
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (long )wxGridTableBase_GetValueAsLong(_arg0,_arg1,_arg2);
  
          _result = (long )wxGridTableBase_GetValueAsLong(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("l",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("l",_result);
      return _resultobj;
@@ -5036,10 +5027,10 @@ static PyObject *_wrap_wxGridTableBase_GetValueAsDouble(PyObject *self, PyObject
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (double )wxGridTableBase_GetValueAsDouble(_arg0,_arg1,_arg2);
  
          _result = (double )wxGridTableBase_GetValueAsDouble(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("d",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("d",_result);
      return _resultobj;
@@ -5066,10 +5057,10 @@ static PyObject *_wrap_wxGridTableBase_GetValueAsBool(PyObject *self, PyObject *
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridTableBase_GetValueAsBool(_arg0,_arg1,_arg2);
  
          _result = (bool )wxGridTableBase_GetValueAsBool(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -5096,10 +5087,10 @@ static PyObject *_wrap_wxGridTableBase_SetValueAsLong(PyObject *self, PyObject *
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridTableBase_SetValueAsLong(_arg0,_arg1,_arg2,_arg3);
  
          wxGridTableBase_SetValueAsLong(_arg0,_arg1,_arg2,_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -5127,10 +5118,10 @@ static PyObject *_wrap_wxGridTableBase_SetValueAsDouble(PyObject *self, PyObject
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridTableBase_SetValueAsDouble(_arg0,_arg1,_arg2,_arg3);
  
          wxGridTableBase_SetValueAsDouble(_arg0,_arg1,_arg2,_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -5160,10 +5151,10 @@ static PyObject *_wrap_wxGridTableBase_SetValueAsBool(PyObject *self, PyObject *
      }
      _arg3 = (bool ) tempbool3;
  {
      }
      _arg3 = (bool ) tempbool3;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridTableBase_SetValueAsBool(_arg0,_arg1,_arg2,_arg3);
  
          wxGridTableBase_SetValueAsBool(_arg0,_arg1,_arg2,_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -5188,10 +5179,10 @@ static PyObject *_wrap_wxGridTableBase_Clear(PyObject *self, PyObject *args, PyO
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridTableBase_Clear(_arg0);
  
          wxGridTableBase_Clear(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -5219,10 +5210,10 @@ static PyObject *_wrap_wxGridTableBase_InsertRows(PyObject *self, PyObject *args
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridTableBase_InsertRows(_arg0,_arg1,_arg2);
  
          _result = (bool )wxGridTableBase_InsertRows(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -5248,10 +5239,10 @@ static PyObject *_wrap_wxGridTableBase_AppendRows(PyObject *self, PyObject *args
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridTableBase_AppendRows(_arg0,_arg1);
  
          _result = (bool )wxGridTableBase_AppendRows(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -5278,10 +5269,10 @@ static PyObject *_wrap_wxGridTableBase_DeleteRows(PyObject *self, PyObject *args
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridTableBase_DeleteRows(_arg0,_arg1,_arg2);
  
          _result = (bool )wxGridTableBase_DeleteRows(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -5308,10 +5299,10 @@ static PyObject *_wrap_wxGridTableBase_InsertCols(PyObject *self, PyObject *args
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridTableBase_InsertCols(_arg0,_arg1,_arg2);
  
          _result = (bool )wxGridTableBase_InsertCols(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -5337,10 +5328,10 @@ static PyObject *_wrap_wxGridTableBase_AppendCols(PyObject *self, PyObject *args
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridTableBase_AppendCols(_arg0,_arg1);
  
          _result = (bool )wxGridTableBase_AppendCols(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -5367,10 +5358,10 @@ static PyObject *_wrap_wxGridTableBase_DeleteCols(PyObject *self, PyObject *args
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridTableBase_DeleteCols(_arg0,_arg1,_arg2);
  
          _result = (bool )wxGridTableBase_DeleteCols(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -5396,10 +5387,10 @@ static PyObject *_wrap_wxGridTableBase_GetRowLabelValue(PyObject *self, PyObject
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = new wxString (wxGridTableBase_GetRowLabelValue(_arg0,_arg1));
  
          _result = new wxString (wxGridTableBase_GetRowLabelValue(_arg0,_arg1));
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
      if (PyErr_Occurred()) return NULL;
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
@@ -5430,10 +5421,10 @@ static PyObject *_wrap_wxGridTableBase_GetColLabelValue(PyObject *self, PyObject
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = new wxString (wxGridTableBase_GetColLabelValue(_arg0,_arg1));
  
          _result = new wxString (wxGridTableBase_GetColLabelValue(_arg0,_arg1));
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
      if (PyErr_Occurred()) return NULL;
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
@@ -5483,10 +5474,10 @@ static PyObject *_wrap_wxGridTableBase_SetRowLabelValue(PyObject *self, PyObject
  #endif
  }
  {
  #endif
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridTableBase_SetRowLabelValue(_arg0,_arg1,*_arg2);
  
          wxGridTableBase_SetRowLabelValue(_arg0,_arg1,*_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -5536,10 +5527,10 @@ static PyObject *_wrap_wxGridTableBase_SetColLabelValue(PyObject *self, PyObject
  #endif
  }
  {
  #endif
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridTableBase_SetColLabelValue(_arg0,_arg1,*_arg2);
  
          wxGridTableBase_SetColLabelValue(_arg0,_arg1,*_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -5569,10 +5560,10 @@ static PyObject *_wrap_wxGridTableBase_CanHaveAttributes(PyObject *self, PyObjec
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridTableBase_CanHaveAttributes(_arg0);
  
          _result = (bool )wxGridTableBase_CanHaveAttributes(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -5601,10 +5592,10 @@ static PyObject *_wrap_wxGridTableBase_GetAttr(PyObject *self, PyObject *args, P
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellAttr *)wxGridTableBase_GetAttr(_arg0,_arg1,_arg2,_arg3);
  
          _result = (wxGridCellAttr *)wxGridTableBase_GetAttr(_arg0,_arg1,_arg2,_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAttr_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAttr_p");
@@ -5645,10 +5636,10 @@ static PyObject *_wrap_wxGridTableBase_SetAttr(PyObject *self, PyObject *args, P
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridTableBase_SetAttr(_arg0,_arg1,_arg2,_arg3);
  
          wxGridTableBase_SetAttr(_arg0,_arg1,_arg2,_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -5683,10 +5674,10 @@ static PyObject *_wrap_wxGridTableBase_SetRowAttr(PyObject *self, PyObject *args
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridTableBase_SetRowAttr(_arg0,_arg1,_arg2);
  
          wxGridTableBase_SetRowAttr(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -5721,10 +5712,10 @@ static PyObject *_wrap_wxGridTableBase_SetColAttr(PyObject *self, PyObject *args
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridTableBase_SetColAttr(_arg0,_arg1,_arg2);
  
          wxGridTableBase_SetColAttr(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -5758,10 +5749,10 @@ static PyObject *_wrap_new_wxPyGridTableBase(PyObject *self, PyObject *args, PyO
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxPyGridTableBase",_kwnames)) 
          return NULL;
  {
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxPyGridTableBase",_kwnames)) 
          return NULL;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxPyGridTableBase *)new_wxPyGridTableBase();
  
          _result = (wxPyGridTableBase *)new_wxPyGridTableBase();
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyGridTableBase_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyGridTableBase_p");
@@ -5773,8 +5764,8 @@ static PyObject *_wrap_new_wxPyGridTableBase(PyObject *self, PyObject *args, PyO
      return _resultobj;
  }
  
      return _resultobj;
  }
  
-#define wxPyGridTableBase__setSelf(_swigobj,_swigarg0,_swigarg1)  (_swigobj->_setSelf(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxPyGridTableBase__setSelf(PyObject *self, PyObject *args, PyObject *kwargs) {
+#define wxPyGridTableBase__setCallbackInfo(_swigobj,_swigarg0,_swigarg1)  (_swigobj->_setCallbackInfo(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxPyGridTableBase__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
      wxPyGridTableBase * _arg0;
      PyObject * _arg1;
      PyObject * _resultobj;
      wxPyGridTableBase * _arg0;
      PyObject * _arg1;
@@ -5785,12 +5776,12 @@ static PyObject *_wrap_wxPyGridTableBase__setSelf(PyObject *self, PyObject *args
      char *_kwnames[] = { "self","self","_class", NULL };
  
      self = self;
      char *_kwnames[] = { "self","self","_class", NULL };
  
      self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPyGridTableBase__setSelf",_kwnames,&_argo0,&_obj1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPyGridTableBase__setCallbackInfo",_kwnames,&_argo0,&_obj1,&_obj2)) 
          return NULL;
      if (_argo0) {
          if (_argo0 == Py_None) { _arg0 = NULL; }
          else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyGridTableBase_p")) {
          return NULL;
      if (_argo0) {
          if (_argo0 == Py_None) { _arg0 = NULL; }
          else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyGridTableBase_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyGridTableBase__setSelf. Expected _wxPyGridTableBase_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyGridTableBase__setCallbackInfo. Expected _wxPyGridTableBase_p.");
          return NULL;
          }
      }
          return NULL;
          }
      }
@@ -5801,10 +5792,10 @@ static PyObject *_wrap_wxPyGridTableBase__setSelf(PyObject *self, PyObject *args
    _arg2 = _obj2;
  }
  {
    _arg2 = _obj2;
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
-        wxPyGridTableBase__setSelf(_arg0,_arg1,_arg2);
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+        wxPyGridTableBase__setCallbackInfo(_arg0,_arg1,_arg2);
  
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -5829,10 +5820,10 @@ static PyObject *_wrap_wxPyGridTableBase_Destroy(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxPyGridTableBase_Destroy(_arg0);
  
          wxPyGridTableBase_Destroy(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -5860,10 +5851,10 @@ static PyObject *_wrap_wxPyGridTableBase_base_GetTypeName(PyObject *self, PyObje
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = new wxString (wxPyGridTableBase_base_GetTypeName(_arg0,_arg1,_arg2));
  
          _result = new wxString (wxPyGridTableBase_base_GetTypeName(_arg0,_arg1,_arg2));
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
      if (PyErr_Occurred()) return NULL;
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
@@ -5915,10 +5906,10 @@ static PyObject *_wrap_wxPyGridTableBase_base_CanGetValueAs(PyObject *self, PyOb
  #endif
  }
  {
  #endif
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxPyGridTableBase_base_CanGetValueAs(_arg0,_arg1,_arg2,*_arg3);
  
          _result = (bool )wxPyGridTableBase_base_CanGetValueAs(_arg0,_arg1,_arg2,*_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
  {
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
  {
@@ -5969,10 +5960,10 @@ static PyObject *_wrap_wxPyGridTableBase_base_CanSetValueAs(PyObject *self, PyOb
  #endif
  }
  {
  #endif
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxPyGridTableBase_base_CanSetValueAs(_arg0,_arg1,_arg2,*_arg3);
  
          _result = (bool )wxPyGridTableBase_base_CanSetValueAs(_arg0,_arg1,_arg2,*_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
  {
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
  {
@@ -6000,10 +5991,10 @@ static PyObject *_wrap_wxPyGridTableBase_base_Clear(PyObject *self, PyObject *ar
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxPyGridTableBase_base_Clear(_arg0);
  
          wxPyGridTableBase_base_Clear(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -6031,10 +6022,10 @@ static PyObject *_wrap_wxPyGridTableBase_base_InsertRows(PyObject *self, PyObjec
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxPyGridTableBase_base_InsertRows(_arg0,_arg1,_arg2);
  
          _result = (bool )wxPyGridTableBase_base_InsertRows(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -6060,10 +6051,10 @@ static PyObject *_wrap_wxPyGridTableBase_base_AppendRows(PyObject *self, PyObjec
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxPyGridTableBase_base_AppendRows(_arg0,_arg1);
  
          _result = (bool )wxPyGridTableBase_base_AppendRows(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -6090,10 +6081,10 @@ static PyObject *_wrap_wxPyGridTableBase_base_DeleteRows(PyObject *self, PyObjec
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxPyGridTableBase_base_DeleteRows(_arg0,_arg1,_arg2);
  
          _result = (bool )wxPyGridTableBase_base_DeleteRows(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -6120,10 +6111,10 @@ static PyObject *_wrap_wxPyGridTableBase_base_InsertCols(PyObject *self, PyObjec
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxPyGridTableBase_base_InsertCols(_arg0,_arg1,_arg2);
  
          _result = (bool )wxPyGridTableBase_base_InsertCols(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -6149,10 +6140,10 @@ static PyObject *_wrap_wxPyGridTableBase_base_AppendCols(PyObject *self, PyObjec
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxPyGridTableBase_base_AppendCols(_arg0,_arg1);
  
          _result = (bool )wxPyGridTableBase_base_AppendCols(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -6179,10 +6170,10 @@ static PyObject *_wrap_wxPyGridTableBase_base_DeleteCols(PyObject *self, PyObjec
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxPyGridTableBase_base_DeleteCols(_arg0,_arg1,_arg2);
  
          _result = (bool )wxPyGridTableBase_base_DeleteCols(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -6208,10 +6199,10 @@ static PyObject *_wrap_wxPyGridTableBase_base_GetRowLabelValue(PyObject *self, P
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = new wxString (wxPyGridTableBase_base_GetRowLabelValue(_arg0,_arg1));
  
          _result = new wxString (wxPyGridTableBase_base_GetRowLabelValue(_arg0,_arg1));
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
      if (PyErr_Occurred()) return NULL;
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
@@ -6242,10 +6233,10 @@ static PyObject *_wrap_wxPyGridTableBase_base_GetColLabelValue(PyObject *self, P
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = new wxString (wxPyGridTableBase_base_GetColLabelValue(_arg0,_arg1));
  
          _result = new wxString (wxPyGridTableBase_base_GetColLabelValue(_arg0,_arg1));
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
      if (PyErr_Occurred()) return NULL;
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
@@ -6295,10 +6286,10 @@ static PyObject *_wrap_wxPyGridTableBase_base_SetRowLabelValue(PyObject *self, P
  #endif
  }
  {
  #endif
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxPyGridTableBase_base_SetRowLabelValue(_arg0,_arg1,*_arg2);
  
          wxPyGridTableBase_base_SetRowLabelValue(_arg0,_arg1,*_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -6348,10 +6339,10 @@ static PyObject *_wrap_wxPyGridTableBase_base_SetColLabelValue(PyObject *self, P
  #endif
  }
  {
  #endif
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxPyGridTableBase_base_SetColLabelValue(_arg0,_arg1,*_arg2);
  
          wxPyGridTableBase_base_SetColLabelValue(_arg0,_arg1,*_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -6381,10 +6372,10 @@ static PyObject *_wrap_wxPyGridTableBase_base_CanHaveAttributes(PyObject *self,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxPyGridTableBase_base_CanHaveAttributes(_arg0);
  
          _result = (bool )wxPyGridTableBase_base_CanHaveAttributes(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -6413,10 +6404,10 @@ static PyObject *_wrap_wxPyGridTableBase_base_GetAttr(PyObject *self, PyObject *
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellAttr *)wxPyGridTableBase_base_GetAttr(_arg0,_arg1,_arg2,_arg3);
  
          _result = (wxGridCellAttr *)wxPyGridTableBase_base_GetAttr(_arg0,_arg1,_arg2,_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAttr_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellAttr_p");
@@ -6457,10 +6448,10 @@ static PyObject *_wrap_wxPyGridTableBase_base_SetAttr(PyObject *self, PyObject *
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxPyGridTableBase_base_SetAttr(_arg0,_arg1,_arg2,_arg3);
  
          wxPyGridTableBase_base_SetAttr(_arg0,_arg1,_arg2,_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -6495,10 +6486,10 @@ static PyObject *_wrap_wxPyGridTableBase_base_SetRowAttr(PyObject *self, PyObjec
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxPyGridTableBase_base_SetRowAttr(_arg0,_arg1,_arg2);
  
          wxPyGridTableBase_base_SetRowAttr(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -6533,10 +6524,10 @@ static PyObject *_wrap_wxPyGridTableBase_base_SetColAttr(PyObject *self, PyObjec
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxPyGridTableBase_base_SetColAttr(_arg0,_arg1,_arg2);
  
          wxPyGridTableBase_base_SetColAttr(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -6572,10 +6563,10 @@ static PyObject *_wrap_new_wxGridStringTable(PyObject *self, PyObject *args, PyO
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|ii:new_wxGridStringTable",_kwnames,&_arg0,&_arg1)) 
          return NULL;
  {
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|ii:new_wxGridStringTable",_kwnames,&_arg0,&_arg1)) 
          return NULL;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridStringTable *)new_wxGridStringTable(_arg0,_arg1);
  
          _result = (wxGridStringTable *)new_wxGridStringTable(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridStringTable_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridStringTable_p");
@@ -6610,10 +6601,10 @@ static PyObject *_wrap_new_wxGridTableMessage(PyObject *self, PyObject *args, Py
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridTableMessage *)new_wxGridTableMessage(_arg0,_arg1,_arg2,_arg3);
  
          _result = (wxGridTableMessage *)new_wxGridTableMessage(_arg0,_arg1,_arg2,_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridTableMessage_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridTableMessage_p");
@@ -6643,10 +6634,10 @@ static PyObject *_wrap_delete_wxGridTableMessage(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          delete_wxGridTableMessage(_arg0);
  
          delete_wxGridTableMessage(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -6680,10 +6671,10 @@ static PyObject *_wrap_wxGridTableMessage_SetTableObject(PyObject *self, PyObjec
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridTableMessage_SetTableObject(_arg0,_arg1);
  
          wxGridTableMessage_SetTableObject(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -6709,10 +6700,10 @@ static PyObject *_wrap_wxGridTableMessage_GetTableObject(PyObject *self, PyObjec
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridTableBase *)wxGridTableMessage_GetTableObject(_arg0);
  
          _result = (wxGridTableBase *)wxGridTableMessage_GetTableObject(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }{ _resultobj = wxPyMake_wxObject(_result); }
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }{ _resultobj = wxPyMake_wxObject(_result); }
      return _resultobj;
@@ -6737,10 +6728,10 @@ static PyObject *_wrap_wxGridTableMessage_SetId(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridTableMessage_SetId(_arg0,_arg1);
  
          wxGridTableMessage_SetId(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -6766,10 +6757,10 @@ static PyObject *_wrap_wxGridTableMessage_GetId(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGridTableMessage_GetId(_arg0);
  
          _result = (int )wxGridTableMessage_GetId(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -6794,10 +6785,10 @@ static PyObject *_wrap_wxGridTableMessage_SetCommandInt(PyObject *self, PyObject
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridTableMessage_SetCommandInt(_arg0,_arg1);
  
          wxGridTableMessage_SetCommandInt(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -6823,10 +6814,10 @@ static PyObject *_wrap_wxGridTableMessage_GetCommandInt(PyObject *self, PyObject
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGridTableMessage_GetCommandInt(_arg0);
  
          _result = (int )wxGridTableMessage_GetCommandInt(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -6851,10 +6842,10 @@ static PyObject *_wrap_wxGridTableMessage_SetCommandInt2(PyObject *self, PyObjec
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridTableMessage_SetCommandInt2(_arg0,_arg1);
  
          wxGridTableMessage_SetCommandInt2(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -6880,10 +6871,10 @@ static PyObject *_wrap_wxGridTableMessage_GetCommandInt2(PyObject *self, PyObjec
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGridTableMessage_GetCommandInt2(_arg0);
  
          _result = (int )wxGridTableMessage_GetCommandInt2(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -6902,10 +6893,10 @@ static PyObject *_wrap_new_wxGridCellCoords(PyObject *self, PyObject *args, PyOb
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|ii:new_wxGridCellCoords",_kwnames,&_arg0,&_arg1)) 
          return NULL;
  {
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|ii:new_wxGridCellCoords",_kwnames,&_arg0,&_arg1)) 
          return NULL;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellCoords *)new_wxGridCellCoords(_arg0,_arg1);
  
          _result = (wxGridCellCoords *)new_wxGridCellCoords(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellCoords_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellCoords_p");
@@ -6935,10 +6926,10 @@ static PyObject *_wrap_delete_wxGridCellCoords(PyObject *self, PyObject *args, P
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          delete_wxGridCellCoords(_arg0);
  
          delete_wxGridCellCoords(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -6964,10 +6955,10 @@ static PyObject *_wrap_wxGridCellCoords_GetRow(PyObject *self, PyObject *args, P
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGridCellCoords_GetRow(_arg0);
  
          _result = (int )wxGridCellCoords_GetRow(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -6992,10 +6983,10 @@ static PyObject *_wrap_wxGridCellCoords_SetRow(PyObject *self, PyObject *args, P
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellCoords_SetRow(_arg0,_arg1);
  
          wxGridCellCoords_SetRow(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -7021,10 +7012,10 @@ static PyObject *_wrap_wxGridCellCoords_GetCol(PyObject *self, PyObject *args, P
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGridCellCoords_GetCol(_arg0);
  
          _result = (int )wxGridCellCoords_GetCol(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -7049,10 +7040,10 @@ static PyObject *_wrap_wxGridCellCoords_SetCol(PyObject *self, PyObject *args, P
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellCoords_SetCol(_arg0,_arg1);
  
          wxGridCellCoords_SetCol(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -7079,10 +7070,10 @@ static PyObject *_wrap_wxGridCellCoords_Set(PyObject *self, PyObject *args, PyOb
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridCellCoords_Set(_arg0,_arg1,_arg2);
  
          wxGridCellCoords_Set(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -7113,10 +7104,10 @@ static PyObject *_wrap_wxGridCellCoords_asTuple(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (PyObject *)wxGridCellCoords_asTuple(_arg0);
  
          _result = (PyObject *)wxGridCellCoords_asTuple(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }{
    _resultobj = _result;
      if (PyErr_Occurred()) return NULL;
  }{
    _resultobj = _result;
@@ -7154,10 +7145,10 @@ static PyObject *_wrap_wxGridCellCoords___cmp__(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGridCellCoords___cmp__(_arg0,*_arg1);
  
          _result = (int )wxGridCellCoords___cmp__(_arg0,*_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -7244,10 +7235,10 @@ static PyObject *_wrap_new_wxGrid(PyObject *self, PyObject *args, PyObject *kwar
          return NULL;
  }
  {
          return NULL;
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGrid *)new_wxGrid(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
  
          _result = (wxGrid *)new_wxGrid(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGrid_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGrid_p");
@@ -7281,10 +7272,10 @@ static PyObject *_wrap_wxGrid_CreateGrid(PyObject *self, PyObject *args, PyObjec
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGrid_CreateGrid(_arg0,_arg1,_arg2,_arg3);
  
          _result = (bool )wxGrid_CreateGrid(_arg0,_arg1,_arg2,_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -7309,10 +7300,10 @@ static PyObject *_wrap_wxGrid_SetSelectionMode(PyObject *self, PyObject *args, P
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetSelectionMode(_arg0,_arg1);
  
          wxGrid_SetSelectionMode(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -7338,10 +7329,10 @@ static PyObject *_wrap_wxGrid_GetNumberRows(PyObject *self, PyObject *args, PyOb
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGrid_GetNumberRows(_arg0);
  
          _result = (int )wxGrid_GetNumberRows(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -7366,10 +7357,10 @@ static PyObject *_wrap_wxGrid_GetNumberCols(PyObject *self, PyObject *args, PyOb
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGrid_GetNumberCols(_arg0);
  
          _result = (int )wxGrid_GetNumberCols(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -7403,10 +7394,10 @@ static PyObject *_wrap_wxGrid_ProcessTableMessage(PyObject *self, PyObject *args
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGrid_ProcessTableMessage(_arg0,*_arg1);
  
          _result = (bool )wxGrid_ProcessTableMessage(_arg0,*_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -7431,10 +7422,10 @@ static PyObject *_wrap_wxGrid_GetTable(PyObject *self, PyObject *args, PyObject
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridTableBase *)wxGrid_GetTable(_arg0);
  
          _result = (wxGridTableBase *)wxGrid_GetTable(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }{ _resultobj = wxPyMake_wxObject(_result); }
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }{ _resultobj = wxPyMake_wxObject(_result); }
      return _resultobj;
@@ -7472,10 +7463,10 @@ static PyObject *_wrap_wxGrid_SetTable(PyObject *self, PyObject *args, PyObject
      }
      _arg2 = (bool ) tempbool2;
  {
      }
      _arg2 = (bool ) tempbool2;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGrid_SetTable(_arg0,_arg1,_arg2,_arg3);
  
          _result = (bool )wxGrid_SetTable(_arg0,_arg1,_arg2,_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -7499,10 +7490,10 @@ static PyObject *_wrap_wxGrid_ClearGrid(PyObject *self, PyObject *args, PyObject
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_ClearGrid(_arg0);
  
          wxGrid_ClearGrid(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -7533,10 +7524,10 @@ static PyObject *_wrap_wxGrid_InsertRows(PyObject *self, PyObject *args, PyObjec
      }
      _arg3 = (bool ) tempbool3;
  {
      }
      _arg3 = (bool ) tempbool3;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGrid_InsertRows(_arg0,_arg1,_arg2,_arg3);
  
          _result = (bool )wxGrid_InsertRows(_arg0,_arg1,_arg2,_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -7565,10 +7556,10 @@ static PyObject *_wrap_wxGrid_AppendRows(PyObject *self, PyObject *args, PyObjec
      }
      _arg2 = (bool ) tempbool2;
  {
      }
      _arg2 = (bool ) tempbool2;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGrid_AppendRows(_arg0,_arg1,_arg2);
  
          _result = (bool )wxGrid_AppendRows(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -7598,10 +7589,10 @@ static PyObject *_wrap_wxGrid_DeleteRows(PyObject *self, PyObject *args, PyObjec
      }
      _arg3 = (bool ) tempbool3;
  {
      }
      _arg3 = (bool ) tempbool3;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGrid_DeleteRows(_arg0,_arg1,_arg2,_arg3);
  
          _result = (bool )wxGrid_DeleteRows(_arg0,_arg1,_arg2,_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -7631,10 +7622,10 @@ static PyObject *_wrap_wxGrid_InsertCols(PyObject *self, PyObject *args, PyObjec
      }
      _arg3 = (bool ) tempbool3;
  {
      }
      _arg3 = (bool ) tempbool3;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGrid_InsertCols(_arg0,_arg1,_arg2,_arg3);
  
          _result = (bool )wxGrid_InsertCols(_arg0,_arg1,_arg2,_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -7663,10 +7654,10 @@ static PyObject *_wrap_wxGrid_AppendCols(PyObject *self, PyObject *args, PyObjec
      }
      _arg2 = (bool ) tempbool2;
  {
      }
      _arg2 = (bool ) tempbool2;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGrid_AppendCols(_arg0,_arg1,_arg2);
  
          _result = (bool )wxGrid_AppendCols(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -7696,10 +7687,10 @@ static PyObject *_wrap_wxGrid_DeleteCols(PyObject *self, PyObject *args, PyObjec
      }
      _arg3 = (bool ) tempbool3;
  {
      }
      _arg3 = (bool ) tempbool3;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGrid_DeleteCols(_arg0,_arg1,_arg2,_arg3);
  
          _result = (bool )wxGrid_DeleteCols(_arg0,_arg1,_arg2,_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -7741,10 +7732,10 @@ static PyObject *_wrap_wxGrid_DrawCellHighlight(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_DrawCellHighlight(_arg0,*_arg1,_arg2);
  
          wxGrid_DrawCellHighlight(_arg0,*_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -7808,10 +7799,10 @@ static PyObject *_wrap_wxGrid_DrawTextRectangle(PyObject *self, PyObject *args,
          return NULL;
  }
  {
          return NULL;
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_DrawTextRectangle(_arg0,*_arg1,*_arg2,*_arg3,_arg4,_arg5);
  
          wxGrid_DrawTextRectangle(_arg0,*_arg1,*_arg2,*_arg3,_arg4,_arg5);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -7822,67 +7813,6 @@ static PyObject *_wrap_wxGrid_DrawTextRectangle(PyObject *self, PyObject *args,
      return _resultobj;
  }
  
      return _resultobj;
  }
  
-#define wxGrid_StringToLines(_swigobj,_swigarg0,_swigarg1)  (_swigobj->StringToLines(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxGrid_StringToLines(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject * _resultobj;
-    wxGrid * _arg0;
-    wxString * _arg1;
-    wxArrayString * _arg2;
-    PyObject * _argo0 = 0;
-    PyObject * _obj1 = 0;
-    PyObject * _argo2 = 0;
-    char *_kwnames[] = { "self","value","lines", NULL };
-
-    self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxGrid_StringToLines",_kwnames,&_argo0,&_obj1,&_argo2)) 
-        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_StringToLines. Expected _wxGrid_p.");
-        return NULL;
-        }
-    }
-{
-#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
-}
-    if (_argo2) {
-        if (_argo2 == Py_None) { _arg2 = NULL; }
-        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxArrayString_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxGrid_StringToLines. Expected _wxArrayString_p.");
-        return NULL;
-        }
-    }
-{
-    wxPy_BEGIN_ALLOW_THREADS;
-        wxGrid_StringToLines(_arg0,*_arg1,*_arg2);
-
-    wxPy_END_ALLOW_THREADS;
-    if (PyErr_Occurred()) return NULL;
-}    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-{
-    if (_obj1)
-        delete _arg1;
-}
-    return _resultobj;
-}
-
  #define wxGrid_GetTextBoxSize(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3)  (_swigobj->GetTextBoxSize(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
  static PyObject *_wrap_wxGrid_GetTextBoxSize(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
  #define wxGrid_GetTextBoxSize(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3)  (_swigobj->GetTextBoxSize(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
  static PyObject *_wrap_wxGrid_GetTextBoxSize(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject * _resultobj;
@@ -7895,7 +7825,7 @@ static PyObject *_wrap_wxGrid_GetTextBoxSize(PyObject *self, PyObject *args, PyO
      long  temp0;
      PyObject * _argo0 = 0;
      PyObject * _argo1 = 0;
      long  temp0;
      PyObject * _argo0 = 0;
      PyObject * _argo1 = 0;
-    PyObject * _argo2 = 0;
+    PyObject * _obj2 = 0;
      char *_kwnames[] = { "self","dc","lines", NULL };
  
      self = self;
      char *_kwnames[] = { "self","dc","lines", NULL };
  
      self = self;
@@ -7905,7 +7835,7 @@ static PyObject *_wrap_wxGrid_GetTextBoxSize(PyObject *self, PyObject *args, PyO
  {
    _arg4 = &temp0;
  }
  {
    _arg4 = &temp0;
  }
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxGrid_GetTextBoxSize",_kwnames,&_argo0,&_argo1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxGrid_GetTextBoxSize",_kwnames,&_argo0,&_argo1,&_obj2)) 
          return NULL;
      if (_argo0) {
          if (_argo0 == Py_None) { _arg0 = NULL; }
          return NULL;
      if (_argo0) {
          if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -7921,18 +7851,26 @@ static PyObject *_wrap_wxGrid_GetTextBoxSize(PyObject *self, PyObject *args, PyO
          return NULL;
          }
      }
          return NULL;
          }
      }
-    if (_argo2) {
-        if (_argo2 == Py_None) { _arg2 = NULL; }
-        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxArrayString_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxGrid_GetTextBoxSize. Expected _wxArrayString_p.");
+{
+    if (! PySequence_Check(_obj2)) {
+        PyErr_SetString(PyExc_TypeError, "Sequence of strings expected.");
          return NULL;
          return NULL;
-        }
      }
      }
+    _arg2 = new wxArrayString;
+    int i, len=PySequence_Length(_obj2);
+    for (i=0; i<len; i++) {
+        PyObject* item = PySequence_GetItem(_obj2, i);
+        PyObject* str  = PyObject_Str(item);
+        _arg2->Add(PyString_AsString(str));
+        Py_DECREF(item);
+        Py_DECREF(str);
+    }
+}
  {
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_GetTextBoxSize(_arg0,*_arg1,*_arg2,_arg3,_arg4);
  
          wxGrid_GetTextBoxSize(_arg0,*_arg1,*_arg2,_arg3,_arg4);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -7945,6 +7883,10 @@ static PyObject *_wrap_wxGrid_GetTextBoxSize(PyObject *self, PyObject *args, PyO
      PyObject *o;
      o = PyInt_FromLong((long) (*_arg4));
      _resultobj = t_output_helper(_resultobj, o);
      PyObject *o;
      o = PyInt_FromLong((long) (*_arg4));
      _resultobj = t_output_helper(_resultobj, o);
+}
+{
+    if (_obj2)
+        delete _arg2;
  }
      return _resultobj;
  }
  }
      return _resultobj;
  }
@@ -7967,10 +7909,10 @@ static PyObject *_wrap_wxGrid_BeginBatch(PyObject *self, PyObject *args, PyObjec
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_BeginBatch(_arg0);
  
          wxGrid_BeginBatch(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -7995,10 +7937,10 @@ static PyObject *_wrap_wxGrid_EndBatch(PyObject *self, PyObject *args, PyObject
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_EndBatch(_arg0);
  
          wxGrid_EndBatch(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -8024,10 +7966,10 @@ static PyObject *_wrap_wxGrid_GetBatchCount(PyObject *self, PyObject *args, PyOb
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGrid_GetBatchCount(_arg0);
  
          _result = (int )wxGrid_GetBatchCount(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -8051,10 +7993,10 @@ static PyObject *_wrap_wxGrid_ForceRefresh(PyObject *self, PyObject *args, PyObj
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_ForceRefresh(_arg0);
  
          wxGrid_ForceRefresh(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -8080,10 +8022,10 @@ static PyObject *_wrap_wxGrid_IsEditable(PyObject *self, PyObject *args, PyObjec
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGrid_IsEditable(_arg0);
  
          _result = (bool )wxGrid_IsEditable(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -8110,10 +8052,10 @@ static PyObject *_wrap_wxGrid_EnableEditing(PyObject *self, PyObject *args, PyOb
      }
      _arg1 = (bool ) tempbool1;
  {
      }
      _arg1 = (bool ) tempbool1;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_EnableEditing(_arg0,_arg1);
  
          wxGrid_EnableEditing(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -8141,10 +8083,10 @@ static PyObject *_wrap_wxGrid_EnableCellEditControl(PyObject *self, PyObject *ar
      }
      _arg1 = (bool ) tempbool1;
  {
      }
      _arg1 = (bool ) tempbool1;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_EnableCellEditControl(_arg0,_arg1);
  
          wxGrid_EnableCellEditControl(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -8169,10 +8111,10 @@ static PyObject *_wrap_wxGrid_DisableCellEditControl(PyObject *self, PyObject *a
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_DisableCellEditControl(_arg0);
  
          wxGrid_DisableCellEditControl(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -8198,10 +8140,10 @@ static PyObject *_wrap_wxGrid_CanEnableCellControl(PyObject *self, PyObject *arg
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGrid_CanEnableCellControl(_arg0);
  
          _result = (bool )wxGrid_CanEnableCellControl(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -8226,10 +8168,10 @@ static PyObject *_wrap_wxGrid_IsCellEditControlEnabled(PyObject *self, PyObject
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGrid_IsCellEditControlEnabled(_arg0);
  
          _result = (bool )wxGrid_IsCellEditControlEnabled(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -8254,10 +8196,10 @@ static PyObject *_wrap_wxGrid_IsCellEditControlShown(PyObject *self, PyObject *a
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGrid_IsCellEditControlShown(_arg0);
  
          _result = (bool )wxGrid_IsCellEditControlShown(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -8282,10 +8224,10 @@ static PyObject *_wrap_wxGrid_IsCurrentCellReadOnly(PyObject *self, PyObject *ar
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGrid_IsCurrentCellReadOnly(_arg0);
  
          _result = (bool )wxGrid_IsCurrentCellReadOnly(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -8309,10 +8251,10 @@ static PyObject *_wrap_wxGrid_ShowCellEditControl(PyObject *self, PyObject *args
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_ShowCellEditControl(_arg0);
  
          wxGrid_ShowCellEditControl(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -8337,10 +8279,10 @@ static PyObject *_wrap_wxGrid_HideCellEditControl(PyObject *self, PyObject *args
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_HideCellEditControl(_arg0);
  
          wxGrid_HideCellEditControl(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -8365,10 +8307,10 @@ static PyObject *_wrap_wxGrid_SaveEditControlValue(PyObject *self, PyObject *arg
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SaveEditControlValue(_arg0);
  
          wxGrid_SaveEditControlValue(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -8401,10 +8343,10 @@ static PyObject *_wrap_wxGrid_XYToCell(PyObject *self, PyObject *args, PyObject
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellCoords *)wxGrid_XYToCell(_arg0,_arg1,_arg2);
  
          _result = (wxGridCellCoords *)wxGrid_XYToCell(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellCoords_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellCoords_p");
@@ -8436,10 +8378,10 @@ static PyObject *_wrap_wxGrid_YToRow(PyObject *self, PyObject *args, PyObject *k
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGrid_YToRow(_arg0,_arg1);
  
          _result = (int )wxGrid_YToRow(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -8465,10 +8407,10 @@ static PyObject *_wrap_wxGrid_XToCol(PyObject *self, PyObject *args, PyObject *k
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGrid_XToCol(_arg0,_arg1);
  
          _result = (int )wxGrid_XToCol(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -8494,10 +8436,10 @@ static PyObject *_wrap_wxGrid_YToEdgeOfRow(PyObject *self, PyObject *args, PyObj
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGrid_YToEdgeOfRow(_arg0,_arg1);
  
          _result = (int )wxGrid_YToEdgeOfRow(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -8523,10 +8465,10 @@ static PyObject *_wrap_wxGrid_XToEdgeOfCol(PyObject *self, PyObject *args, PyObj
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGrid_XToEdgeOfCol(_arg0,_arg1);
  
          _result = (int )wxGrid_XToEdgeOfCol(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -8554,10 +8496,10 @@ static PyObject *_wrap_wxGrid_CellToRect(PyObject *self, PyObject *args, PyObjec
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = new wxRect (wxGrid_CellToRect(_arg0,_arg1,_arg2));
  
          _result = new wxRect (wxGrid_CellToRect(_arg0,_arg1,_arg2));
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxRect_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxRect_p");
      _resultobj = Py_BuildValue("s",_ptemp);
@@ -8583,10 +8525,10 @@ static PyObject *_wrap_wxGrid_GetGridCursorRow(PyObject *self, PyObject *args, P
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGrid_GetGridCursorRow(_arg0);
  
          _result = (int )wxGrid_GetGridCursorRow(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -8611,10 +8553,10 @@ static PyObject *_wrap_wxGrid_GetGridCursorCol(PyObject *self, PyObject *args, P
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGrid_GetGridCursorCol(_arg0);
  
          _result = (int )wxGrid_GetGridCursorCol(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -8644,10 +8586,10 @@ static PyObject *_wrap_wxGrid_IsVisible(PyObject *self, PyObject *args, PyObject
      }
      _arg3 = (bool ) tempbool3;
  {
      }
      _arg3 = (bool ) tempbool3;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGrid_IsVisible(_arg0,_arg1,_arg2,_arg3);
  
          _result = (bool )wxGrid_IsVisible(_arg0,_arg1,_arg2,_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -8673,10 +8615,10 @@ static PyObject *_wrap_wxGrid_MakeCellVisible(PyObject *self, PyObject *args, Py
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_MakeCellVisible(_arg0,_arg1,_arg2);
  
          wxGrid_MakeCellVisible(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -8703,10 +8645,10 @@ static PyObject *_wrap_wxGrid_SetGridCursor(PyObject *self, PyObject *args, PyOb
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetGridCursor(_arg0,_arg1,_arg2);
  
          wxGrid_SetGridCursor(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -8735,10 +8677,10 @@ static PyObject *_wrap_wxGrid_MoveCursorUp(PyObject *self, PyObject *args, PyObj
      }
      _arg1 = (bool ) tempbool1;
  {
      }
      _arg1 = (bool ) tempbool1;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGrid_MoveCursorUp(_arg0,_arg1);
  
          _result = (bool )wxGrid_MoveCursorUp(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -8766,10 +8708,10 @@ static PyObject *_wrap_wxGrid_MoveCursorDown(PyObject *self, PyObject *args, PyO
      }
      _arg1 = (bool ) tempbool1;
  {
      }
      _arg1 = (bool ) tempbool1;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGrid_MoveCursorDown(_arg0,_arg1);
  
          _result = (bool )wxGrid_MoveCursorDown(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -8797,10 +8739,10 @@ static PyObject *_wrap_wxGrid_MoveCursorLeft(PyObject *self, PyObject *args, PyO
      }
      _arg1 = (bool ) tempbool1;
  {
      }
      _arg1 = (bool ) tempbool1;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGrid_MoveCursorLeft(_arg0,_arg1);
  
          _result = (bool )wxGrid_MoveCursorLeft(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -8828,10 +8770,10 @@ static PyObject *_wrap_wxGrid_MoveCursorRight(PyObject *self, PyObject *args, Py
      }
      _arg1 = (bool ) tempbool1;
  {
      }
      _arg1 = (bool ) tempbool1;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGrid_MoveCursorRight(_arg0,_arg1);
  
          _result = (bool )wxGrid_MoveCursorRight(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -8856,10 +8798,10 @@ static PyObject *_wrap_wxGrid_MovePageDown(PyObject *self, PyObject *args, PyObj
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGrid_MovePageDown(_arg0);
  
          _result = (bool )wxGrid_MovePageDown(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -8884,10 +8826,10 @@ static PyObject *_wrap_wxGrid_MovePageUp(PyObject *self, PyObject *args, PyObjec
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGrid_MovePageUp(_arg0);
  
          _result = (bool )wxGrid_MovePageUp(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -8915,10 +8857,10 @@ static PyObject *_wrap_wxGrid_MoveCursorUpBlock(PyObject *self, PyObject *args,
      }
      _arg1 = (bool ) tempbool1;
  {
      }
      _arg1 = (bool ) tempbool1;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGrid_MoveCursorUpBlock(_arg0,_arg1);
  
          _result = (bool )wxGrid_MoveCursorUpBlock(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -8946,10 +8888,10 @@ static PyObject *_wrap_wxGrid_MoveCursorDownBlock(PyObject *self, PyObject *args
      }
      _arg1 = (bool ) tempbool1;
  {
      }
      _arg1 = (bool ) tempbool1;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGrid_MoveCursorDownBlock(_arg0,_arg1);
  
          _result = (bool )wxGrid_MoveCursorDownBlock(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -8977,10 +8919,10 @@ static PyObject *_wrap_wxGrid_MoveCursorLeftBlock(PyObject *self, PyObject *args
      }
      _arg1 = (bool ) tempbool1;
  {
      }
      _arg1 = (bool ) tempbool1;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGrid_MoveCursorLeftBlock(_arg0,_arg1);
  
          _result = (bool )wxGrid_MoveCursorLeftBlock(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -9008,10 +8950,10 @@ static PyObject *_wrap_wxGrid_MoveCursorRightBlock(PyObject *self, PyObject *arg
      }
      _arg1 = (bool ) tempbool1;
  {
      }
      _arg1 = (bool ) tempbool1;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGrid_MoveCursorRightBlock(_arg0,_arg1);
  
          _result = (bool )wxGrid_MoveCursorRightBlock(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -9036,10 +8978,10 @@ static PyObject *_wrap_wxGrid_GetDefaultRowLabelSize(PyObject *self, PyObject *a
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGrid_GetDefaultRowLabelSize(_arg0);
  
          _result = (int )wxGrid_GetDefaultRowLabelSize(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -9064,10 +9006,10 @@ static PyObject *_wrap_wxGrid_GetRowLabelSize(PyObject *self, PyObject *args, Py
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGrid_GetRowLabelSize(_arg0);
  
          _result = (int )wxGrid_GetRowLabelSize(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -9092,10 +9034,10 @@ static PyObject *_wrap_wxGrid_GetDefaultColLabelSize(PyObject *self, PyObject *a
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGrid_GetDefaultColLabelSize(_arg0);
  
          _result = (int )wxGrid_GetDefaultColLabelSize(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -9120,10 +9062,10 @@ static PyObject *_wrap_wxGrid_GetColLabelSize(PyObject *self, PyObject *args, Py
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGrid_GetColLabelSize(_arg0);
  
          _result = (int )wxGrid_GetColLabelSize(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -9149,10 +9091,10 @@ static PyObject *_wrap_wxGrid_GetLabelBackgroundColour(PyObject *self, PyObject
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = new wxColour (wxGrid_GetLabelBackgroundColour(_arg0));
  
          _result = new wxColour (wxGrid_GetLabelBackgroundColour(_arg0));
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
@@ -9179,10 +9121,10 @@ static PyObject *_wrap_wxGrid_GetLabelTextColour(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = new wxColour (wxGrid_GetLabelTextColour(_arg0));
  
          _result = new wxColour (wxGrid_GetLabelTextColour(_arg0));
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
@@ -9209,10 +9151,10 @@ static PyObject *_wrap_wxGrid_GetLabelFont(PyObject *self, PyObject *args, PyObj
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = new wxFont (wxGrid_GetLabelFont(_arg0));
  
          _result = new wxFont (wxGrid_GetLabelFont(_arg0));
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxFont_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxFont_p");
      _resultobj = Py_BuildValue("s",_ptemp);
@@ -9247,10 +9189,10 @@ static PyObject *_wrap_wxGrid_GetRowLabelAlignment(PyObject *self, PyObject *arg
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_GetRowLabelAlignment(_arg0,_arg1,_arg2);
  
          wxGrid_GetRowLabelAlignment(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -9295,10 +9237,10 @@ static PyObject *_wrap_wxGrid_GetColLabelAlignment(PyObject *self, PyObject *arg
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_GetColLabelAlignment(_arg0,_arg1,_arg2);
  
          wxGrid_GetColLabelAlignment(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -9335,10 +9277,10 @@ static PyObject *_wrap_wxGrid_GetRowLabelValue(PyObject *self, PyObject *args, P
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = new wxString (wxGrid_GetRowLabelValue(_arg0,_arg1));
  
          _result = new wxString (wxGrid_GetRowLabelValue(_arg0,_arg1));
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
      if (PyErr_Occurred()) return NULL;
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
@@ -9369,10 +9311,10 @@ static PyObject *_wrap_wxGrid_GetColLabelValue(PyObject *self, PyObject *args, P
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = new wxString (wxGrid_GetColLabelValue(_arg0,_arg1));
  
          _result = new wxString (wxGrid_GetColLabelValue(_arg0,_arg1));
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
      if (PyErr_Occurred()) return NULL;
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
@@ -9403,10 +9345,10 @@ static PyObject *_wrap_wxGrid_GetGridLineColour(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = new wxColour (wxGrid_GetGridLineColour(_arg0));
  
          _result = new wxColour (wxGrid_GetGridLineColour(_arg0));
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
@@ -9433,10 +9375,10 @@ static PyObject *_wrap_wxGrid_GetCellHighlightColour(PyObject *self, PyObject *a
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = new wxColour (wxGrid_GetCellHighlightColour(_arg0));
  
          _result = new wxColour (wxGrid_GetCellHighlightColour(_arg0));
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
@@ -9462,10 +9404,10 @@ static PyObject *_wrap_wxGrid_GetCellHighlightPenWidth(PyObject *self, PyObject
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGrid_GetCellHighlightPenWidth(_arg0);
  
          _result = (int )wxGrid_GetCellHighlightPenWidth(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -9490,10 +9432,10 @@ static PyObject *_wrap_wxGrid_GetCellHighlightROPenWidth(PyObject *self, PyObjec
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGrid_GetCellHighlightROPenWidth(_arg0);
  
          _result = (int )wxGrid_GetCellHighlightROPenWidth(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -9518,10 +9460,10 @@ static PyObject *_wrap_wxGrid_SetRowLabelSize(PyObject *self, PyObject *args, Py
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetRowLabelSize(_arg0,_arg1);
  
          wxGrid_SetRowLabelSize(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -9547,10 +9489,10 @@ static PyObject *_wrap_wxGrid_SetColLabelSize(PyObject *self, PyObject *args, Py
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetColLabelSize(_arg0,_arg1);
  
          wxGrid_SetColLabelSize(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -9583,10 +9525,10 @@ static PyObject *_wrap_wxGrid_SetLabelBackgroundColour(PyObject *self, PyObject
          return NULL;
  }
  {
          return NULL;
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetLabelBackgroundColour(_arg0,*_arg1);
  
          wxGrid_SetLabelBackgroundColour(_arg0,*_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -9619,10 +9561,10 @@ static PyObject *_wrap_wxGrid_SetLabelTextColour(PyObject *self, PyObject *args,
          return NULL;
  }
  {
          return NULL;
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetLabelTextColour(_arg0,*_arg1);
  
          wxGrid_SetLabelTextColour(_arg0,*_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -9656,10 +9598,10 @@ static PyObject *_wrap_wxGrid_SetLabelFont(PyObject *self, PyObject *args, PyObj
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetLabelFont(_arg0,*_arg1);
  
          wxGrid_SetLabelFont(_arg0,*_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -9686,10 +9628,10 @@ static PyObject *_wrap_wxGrid_SetRowLabelAlignment(PyObject *self, PyObject *arg
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetRowLabelAlignment(_arg0,_arg1,_arg2);
  
          wxGrid_SetRowLabelAlignment(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -9716,10 +9658,10 @@ static PyObject *_wrap_wxGrid_SetColLabelAlignment(PyObject *self, PyObject *arg
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetColLabelAlignment(_arg0,_arg1,_arg2);
  
          wxGrid_SetColLabelAlignment(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -9765,10 +9707,10 @@ static PyObject *_wrap_wxGrid_SetRowLabelValue(PyObject *self, PyObject *args, P
  #endif
  }
  {
  #endif
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetRowLabelValue(_arg0,_arg1,*_arg2);
  
          wxGrid_SetRowLabelValue(_arg0,_arg1,*_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -9818,10 +9760,10 @@ static PyObject *_wrap_wxGrid_SetColLabelValue(PyObject *self, PyObject *args, P
  #endif
  }
  {
  #endif
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetColLabelValue(_arg0,_arg1,*_arg2);
  
          wxGrid_SetColLabelValue(_arg0,_arg1,*_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -9858,10 +9800,10 @@ static PyObject *_wrap_wxGrid_SetGridLineColour(PyObject *self, PyObject *args,
          return NULL;
  }
  {
          return NULL;
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetGridLineColour(_arg0,*_arg1);
  
          wxGrid_SetGridLineColour(_arg0,*_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -9894,10 +9836,10 @@ static PyObject *_wrap_wxGrid_SetCellHighlightColour(PyObject *self, PyObject *a
          return NULL;
  }
  {
          return NULL;
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetCellHighlightColour(_arg0,*_arg1);
  
          wxGrid_SetCellHighlightColour(_arg0,*_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -9923,10 +9865,10 @@ static PyObject *_wrap_wxGrid_SetCellHighlightPenWidth(PyObject *self, PyObject
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetCellHighlightPenWidth(_arg0,_arg1);
  
          wxGrid_SetCellHighlightPenWidth(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -9952,10 +9894,10 @@ static PyObject *_wrap_wxGrid_SetCellHighlightROPenWidth(PyObject *self, PyObjec
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetCellHighlightROPenWidth(_arg0,_arg1);
  
          wxGrid_SetCellHighlightROPenWidth(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -9983,10 +9925,10 @@ static PyObject *_wrap_wxGrid_EnableDragRowSize(PyObject *self, PyObject *args,
      }
      _arg1 = (bool ) tempbool1;
  {
      }
      _arg1 = (bool ) tempbool1;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_EnableDragRowSize(_arg0,_arg1);
  
          wxGrid_EnableDragRowSize(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -10011,10 +9953,10 @@ static PyObject *_wrap_wxGrid_DisableDragRowSize(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_DisableDragRowSize(_arg0);
  
          wxGrid_DisableDragRowSize(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -10040,10 +9982,10 @@ static PyObject *_wrap_wxGrid_CanDragRowSize(PyObject *self, PyObject *args, PyO
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGrid_CanDragRowSize(_arg0);
  
          _result = (bool )wxGrid_CanDragRowSize(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -10070,10 +10012,10 @@ static PyObject *_wrap_wxGrid_EnableDragColSize(PyObject *self, PyObject *args,
      }
      _arg1 = (bool ) tempbool1;
  {
      }
      _arg1 = (bool ) tempbool1;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_EnableDragColSize(_arg0,_arg1);
  
          wxGrid_EnableDragColSize(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -10098,10 +10040,10 @@ static PyObject *_wrap_wxGrid_DisableDragColSize(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_DisableDragColSize(_arg0);
  
          wxGrid_DisableDragColSize(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -10127,10 +10069,10 @@ static PyObject *_wrap_wxGrid_CanDragColSize(PyObject *self, PyObject *args, PyO
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGrid_CanDragColSize(_arg0);
  
          _result = (bool )wxGrid_CanDragColSize(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -10157,10 +10099,10 @@ static PyObject *_wrap_wxGrid_EnableDragGridSize(PyObject *self, PyObject *args,
      }
      _arg1 = (bool ) tempbool1;
  {
      }
      _arg1 = (bool ) tempbool1;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_EnableDragGridSize(_arg0,_arg1);
  
          wxGrid_EnableDragGridSize(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -10185,10 +10127,10 @@ static PyObject *_wrap_wxGrid_DisableDragGridSize(PyObject *self, PyObject *args
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_DisableDragGridSize(_arg0);
  
          wxGrid_DisableDragGridSize(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -10214,10 +10156,10 @@ static PyObject *_wrap_wxGrid_CanDragGridSize(PyObject *self, PyObject *args, Py
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGrid_CanDragGridSize(_arg0);
  
          _result = (bool )wxGrid_CanDragGridSize(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -10251,10 +10193,10 @@ static PyObject *_wrap_wxGrid_SetRowAttr(PyObject *self, PyObject *args, PyObjec
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetRowAttr(_arg0,_arg1,_arg2);
  
          wxGrid_SetRowAttr(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -10289,10 +10231,10 @@ static PyObject *_wrap_wxGrid_SetColAttr(PyObject *self, PyObject *args, PyObjec
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetColAttr(_arg0,_arg1,_arg2);
  
          wxGrid_SetColAttr(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -10318,10 +10260,10 @@ static PyObject *_wrap_wxGrid_SetColFormatBool(PyObject *self, PyObject *args, P
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetColFormatBool(_arg0,_arg1);
  
          wxGrid_SetColFormatBool(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -10347,10 +10289,10 @@ static PyObject *_wrap_wxGrid_SetColFormatNumber(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetColFormatNumber(_arg0,_arg1);
  
          wxGrid_SetColFormatNumber(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -10378,10 +10320,10 @@ static PyObject *_wrap_wxGrid_SetColFormatFloat(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetColFormatFloat(_arg0,_arg1,_arg2,_arg3);
  
          wxGrid_SetColFormatFloat(_arg0,_arg1,_arg2,_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -10427,10 +10369,10 @@ static PyObject *_wrap_wxGrid_SetColFormatCustom(PyObject *self, PyObject *args,
  #endif
  }
  {
  #endif
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetColFormatCustom(_arg0,_arg1,*_arg2);
  
          wxGrid_SetColFormatCustom(_arg0,_arg1,*_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -10462,10 +10404,10 @@ static PyObject *_wrap_wxGrid_EnableGridLines(PyObject *self, PyObject *args, Py
      }
      _arg1 = (bool ) tempbool1;
  {
      }
      _arg1 = (bool ) tempbool1;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_EnableGridLines(_arg0,_arg1);
  
          wxGrid_EnableGridLines(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -10491,10 +10433,10 @@ static PyObject *_wrap_wxGrid_GridLinesEnabled(PyObject *self, PyObject *args, P
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGrid_GridLinesEnabled(_arg0);
  
          _result = (bool )wxGrid_GridLinesEnabled(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -10519,10 +10461,10 @@ static PyObject *_wrap_wxGrid_GetDefaultRowSize(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGrid_GetDefaultRowSize(_arg0);
  
          _result = (int )wxGrid_GetDefaultRowSize(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -10548,10 +10490,10 @@ static PyObject *_wrap_wxGrid_GetRowSize(PyObject *self, PyObject *args, PyObjec
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGrid_GetRowSize(_arg0,_arg1);
  
          _result = (int )wxGrid_GetRowSize(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -10576,10 +10518,10 @@ static PyObject *_wrap_wxGrid_GetDefaultColSize(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGrid_GetDefaultColSize(_arg0);
  
          _result = (int )wxGrid_GetDefaultColSize(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -10605,10 +10547,10 @@ static PyObject *_wrap_wxGrid_GetColSize(PyObject *self, PyObject *args, PyObjec
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGrid_GetColSize(_arg0,_arg1);
  
          _result = (int )wxGrid_GetColSize(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -10634,10 +10576,10 @@ static PyObject *_wrap_wxGrid_GetDefaultCellBackgroundColour(PyObject *self, PyO
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = new wxColour (wxGrid_GetDefaultCellBackgroundColour(_arg0));
  
          _result = new wxColour (wxGrid_GetDefaultCellBackgroundColour(_arg0));
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
@@ -10666,10 +10608,10 @@ static PyObject *_wrap_wxGrid_GetCellBackgroundColour(PyObject *self, PyObject *
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = new wxColour (wxGrid_GetCellBackgroundColour(_arg0,_arg1,_arg2));
  
          _result = new wxColour (wxGrid_GetCellBackgroundColour(_arg0,_arg1,_arg2));
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
@@ -10696,10 +10638,10 @@ static PyObject *_wrap_wxGrid_GetDefaultCellTextColour(PyObject *self, PyObject
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = new wxColour (wxGrid_GetDefaultCellTextColour(_arg0));
  
          _result = new wxColour (wxGrid_GetDefaultCellTextColour(_arg0));
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
@@ -10728,10 +10670,10 @@ static PyObject *_wrap_wxGrid_GetCellTextColour(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = new wxColour (wxGrid_GetCellTextColour(_arg0,_arg1,_arg2));
  
          _result = new wxColour (wxGrid_GetCellTextColour(_arg0,_arg1,_arg2));
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
@@ -10758,10 +10700,10 @@ static PyObject *_wrap_wxGrid_GetDefaultCellFont(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = new wxFont (wxGrid_GetDefaultCellFont(_arg0));
  
          _result = new wxFont (wxGrid_GetDefaultCellFont(_arg0));
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxFont_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxFont_p");
      _resultobj = Py_BuildValue("s",_ptemp);
@@ -10790,10 +10732,10 @@ static PyObject *_wrap_wxGrid_GetCellFont(PyObject *self, PyObject *args, PyObje
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = new wxFont (wxGrid_GetCellFont(_arg0,_arg1,_arg2));
  
          _result = new wxFont (wxGrid_GetCellFont(_arg0,_arg1,_arg2));
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxFont_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxFont_p");
      _resultobj = Py_BuildValue("s",_ptemp);
@@ -10836,10 +10778,10 @@ static PyObject *_wrap_wxGrid_GetDefaultCellAlignment(PyObject *self, PyObject *
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_GetDefaultCellAlignment(_arg0,_arg1,_arg2);
  
          wxGrid_GetDefaultCellAlignment(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -10884,10 +10826,10 @@ static PyObject *_wrap_wxGrid_GetCellAlignment(PyObject *self, PyObject *args, P
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_GetCellAlignment(_arg0,_arg1,_arg2,_arg3,_arg4);
  
          wxGrid_GetCellAlignment(_arg0,_arg1,_arg2,_arg3,_arg4);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -10916,10 +10858,10 @@ static PyObject *_wrap_wxGrid_SetDefaultRowSize(PyObject *self, PyObject *args,
      }
      _arg2 = (bool ) tempbool2;
  {
      }
      _arg2 = (bool ) tempbool2;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetDefaultRowSize(_arg0,_arg1,_arg2);
  
          wxGrid_SetDefaultRowSize(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -10946,10 +10888,10 @@ static PyObject *_wrap_wxGrid_SetRowSize(PyObject *self, PyObject *args, PyObjec
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetRowSize(_arg0,_arg1,_arg2);
  
          wxGrid_SetRowSize(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -10978,10 +10920,10 @@ static PyObject *_wrap_wxGrid_SetDefaultColSize(PyObject *self, PyObject *args,
      }
      _arg2 = (bool ) tempbool2;
  {
      }
      _arg2 = (bool ) tempbool2;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetDefaultColSize(_arg0,_arg1,_arg2);
  
          wxGrid_SetDefaultColSize(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -11008,10 +10950,10 @@ static PyObject *_wrap_wxGrid_SetColSize(PyObject *self, PyObject *args, PyObjec
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetColSize(_arg0,_arg1,_arg2);
  
          wxGrid_SetColSize(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -11040,10 +10982,10 @@ static PyObject *_wrap_wxGrid_AutoSizeColumn(PyObject *self, PyObject *args, PyO
      }
      _arg2 = (bool ) tempbool2;
  {
      }
      _arg2 = (bool ) tempbool2;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_AutoSizeColumn(_arg0,_arg1,_arg2);
  
          wxGrid_AutoSizeColumn(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -11072,10 +11014,10 @@ static PyObject *_wrap_wxGrid_AutoSizeRow(PyObject *self, PyObject *args, PyObje
      }
      _arg2 = (bool ) tempbool2;
  {
      }
      _arg2 = (bool ) tempbool2;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_AutoSizeRow(_arg0,_arg1,_arg2);
  
          wxGrid_AutoSizeRow(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -11103,10 +11045,10 @@ static PyObject *_wrap_wxGrid_AutoSizeColumns(PyObject *self, PyObject *args, Py
      }
      _arg1 = (bool ) tempbool1;
  {
      }
      _arg1 = (bool ) tempbool1;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_AutoSizeColumns(_arg0,_arg1);
  
          wxGrid_AutoSizeColumns(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -11134,10 +11076,10 @@ static PyObject *_wrap_wxGrid_AutoSizeRows(PyObject *self, PyObject *args, PyObj
      }
      _arg1 = (bool ) tempbool1;
  {
      }
      _arg1 = (bool ) tempbool1;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_AutoSizeRows(_arg0,_arg1);
  
          wxGrid_AutoSizeRows(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -11162,10 +11104,10 @@ static PyObject *_wrap_wxGrid_AutoSize(PyObject *self, PyObject *args, PyObject
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_AutoSize(_arg0);
  
          wxGrid_AutoSize(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -11192,10 +11134,10 @@ static PyObject *_wrap_wxGrid_SetColMinimalWidth(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetColMinimalWidth(_arg0,_arg1,_arg2);
  
          wxGrid_SetColMinimalWidth(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -11222,10 +11164,10 @@ static PyObject *_wrap_wxGrid_SetRowMinimalHeight(PyObject *self, PyObject *args
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetRowMinimalHeight(_arg0,_arg1,_arg2);
  
          wxGrid_SetRowMinimalHeight(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -11258,10 +11200,10 @@ static PyObject *_wrap_wxGrid_SetDefaultCellBackgroundColour(PyObject *self, PyO
          return NULL;
  }
  {
          return NULL;
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetDefaultCellBackgroundColour(_arg0,*_arg1);
  
          wxGrid_SetDefaultCellBackgroundColour(_arg0,*_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -11296,10 +11238,10 @@ static PyObject *_wrap_wxGrid_SetCellBackgroundColour(PyObject *self, PyObject *
          return NULL;
  }
  {
          return NULL;
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetCellBackgroundColour(_arg0,_arg1,_arg2,*_arg3);
  
          wxGrid_SetCellBackgroundColour(_arg0,_arg1,_arg2,*_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -11332,10 +11274,10 @@ static PyObject *_wrap_wxGrid_SetDefaultCellTextColour(PyObject *self, PyObject
          return NULL;
  }
  {
          return NULL;
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetDefaultCellTextColour(_arg0,*_arg1);
  
          wxGrid_SetDefaultCellTextColour(_arg0,*_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -11370,10 +11312,10 @@ static PyObject *_wrap_wxGrid_SetCellTextColour(PyObject *self, PyObject *args,
          return NULL;
  }
  {
          return NULL;
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetCellTextColour(_arg0,_arg1,_arg2,*_arg3);
  
          wxGrid_SetCellTextColour(_arg0,_arg1,_arg2,*_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -11407,10 +11349,10 @@ static PyObject *_wrap_wxGrid_SetDefaultCellFont(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetDefaultCellFont(_arg0,*_arg1);
  
          wxGrid_SetDefaultCellFont(_arg0,*_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -11446,10 +11388,10 @@ static PyObject *_wrap_wxGrid_SetCellFont(PyObject *self, PyObject *args, PyObje
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetCellFont(_arg0,_arg1,_arg2,*_arg3);
  
          wxGrid_SetCellFont(_arg0,_arg1,_arg2,*_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -11476,10 +11418,10 @@ static PyObject *_wrap_wxGrid_SetDefaultCellAlignment(PyObject *self, PyObject *
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetDefaultCellAlignment(_arg0,_arg1,_arg2);
  
          wxGrid_SetDefaultCellAlignment(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -11508,10 +11450,10 @@ static PyObject *_wrap_wxGrid_SetCellAlignment(PyObject *self, PyObject *args, P
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetCellAlignment(_arg0,_arg1,_arg2,_arg3,_arg4);
  
          wxGrid_SetCellAlignment(_arg0,_arg1,_arg2,_arg3,_arg4);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -11545,10 +11487,10 @@ static PyObject *_wrap_wxGrid_SetDefaultRenderer(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetDefaultRenderer(_arg0,_arg1);
  
          wxGrid_SetDefaultRenderer(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -11584,10 +11526,10 @@ static PyObject *_wrap_wxGrid_SetCellRenderer(PyObject *self, PyObject *args, Py
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetCellRenderer(_arg0,_arg1,_arg2,_arg3);
  
          wxGrid_SetCellRenderer(_arg0,_arg1,_arg2,_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -11614,10 +11556,10 @@ static PyObject *_wrap_wxGrid_GetDefaultRenderer(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellRenderer *)wxGrid_GetDefaultRenderer(_arg0);
  
          _result = (wxGridCellRenderer *)wxGrid_GetDefaultRenderer(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellRenderer_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellRenderer_p");
@@ -11651,10 +11593,10 @@ static PyObject *_wrap_wxGrid_GetCellRenderer(PyObject *self, PyObject *args, Py
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellRenderer *)wxGrid_GetCellRenderer(_arg0,_arg1,_arg2);
  
          _result = (wxGridCellRenderer *)wxGrid_GetCellRenderer(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellRenderer_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellRenderer_p");
@@ -11693,10 +11635,10 @@ static PyObject *_wrap_wxGrid_SetDefaultEditor(PyObject *self, PyObject *args, P
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetDefaultEditor(_arg0,_arg1);
  
          wxGrid_SetDefaultEditor(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -11732,10 +11674,10 @@ static PyObject *_wrap_wxGrid_SetCellEditor(PyObject *self, PyObject *args, PyOb
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetCellEditor(_arg0,_arg1,_arg2,_arg3);
  
          wxGrid_SetCellEditor(_arg0,_arg1,_arg2,_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -11762,10 +11704,10 @@ static PyObject *_wrap_wxGrid_GetDefaultEditor(PyObject *self, PyObject *args, P
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellEditor *)wxGrid_GetDefaultEditor(_arg0);
  
          _result = (wxGridCellEditor *)wxGrid_GetDefaultEditor(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellEditor_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellEditor_p");
@@ -11799,10 +11741,10 @@ static PyObject *_wrap_wxGrid_GetCellEditor(PyObject *self, PyObject *args, PyOb
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellEditor *)wxGrid_GetCellEditor(_arg0,_arg1,_arg2);
  
          _result = (wxGridCellEditor *)wxGrid_GetCellEditor(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellEditor_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellEditor_p");
@@ -11835,10 +11777,10 @@ static PyObject *_wrap_wxGrid_GetCellValue(PyObject *self, PyObject *args, PyObj
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = new wxString (wxGrid_GetCellValue(_arg0,_arg1,_arg2));
  
          _result = new wxString (wxGrid_GetCellValue(_arg0,_arg1,_arg2));
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
      if (PyErr_Occurred()) return NULL;
  }{
      _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
@@ -11889,10 +11831,10 @@ static PyObject *_wrap_wxGrid_SetCellValue(PyObject *self, PyObject *args, PyObj
  #endif
  }
  {
  #endif
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetCellValue(_arg0,_arg1,_arg2,*_arg3);
  
          wxGrid_SetCellValue(_arg0,_arg1,_arg2,*_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -11924,10 +11866,10 @@ static PyObject *_wrap_wxGrid_IsReadOnly(PyObject *self, PyObject *args, PyObjec
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGrid_IsReadOnly(_arg0,_arg1,_arg2);
  
          _result = (bool )wxGrid_IsReadOnly(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -11956,10 +11898,10 @@ static PyObject *_wrap_wxGrid_SetReadOnly(PyObject *self, PyObject *args, PyObje
      }
      _arg3 = (bool ) tempbool3;
  {
      }
      _arg3 = (bool ) tempbool3;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetReadOnly(_arg0,_arg1,_arg2,_arg3);
  
          wxGrid_SetReadOnly(_arg0,_arg1,_arg2,_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -11988,10 +11930,10 @@ static PyObject *_wrap_wxGrid_SelectRow(PyObject *self, PyObject *args, PyObject
      }
      _arg2 = (bool ) tempbool2;
  {
      }
      _arg2 = (bool ) tempbool2;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SelectRow(_arg0,_arg1,_arg2);
  
          wxGrid_SelectRow(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -12020,10 +11962,10 @@ static PyObject *_wrap_wxGrid_SelectCol(PyObject *self, PyObject *args, PyObject
      }
      _arg2 = (bool ) tempbool2;
  {
      }
      _arg2 = (bool ) tempbool2;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SelectCol(_arg0,_arg1,_arg2);
  
          wxGrid_SelectCol(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -12055,10 +11997,10 @@ static PyObject *_wrap_wxGrid_SelectBlock(PyObject *self, PyObject *args, PyObje
      }
      _arg5 = (bool ) tempbool5;
  {
      }
      _arg5 = (bool ) tempbool5;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SelectBlock(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5);
  
          wxGrid_SelectBlock(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -12083,10 +12025,10 @@ static PyObject *_wrap_wxGrid_SelectAll(PyObject *self, PyObject *args, PyObject
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SelectAll(_arg0);
  
          wxGrid_SelectAll(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -12112,10 +12054,10 @@ static PyObject *_wrap_wxGrid_IsSelection(PyObject *self, PyObject *args, PyObje
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGrid_IsSelection(_arg0);
  
          _result = (bool )wxGrid_IsSelection(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -12139,10 +12081,10 @@ static PyObject *_wrap_wxGrid_ClearSelection(PyObject *self, PyObject *args, PyO
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_ClearSelection(_arg0);
  
          wxGrid_ClearSelection(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -12170,10 +12112,10 @@ static PyObject *_wrap_wxGrid_IsInSelection(PyObject *self, PyObject *args, PyOb
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGrid_IsInSelection(_arg0,_arg1,_arg2);
  
          _result = (bool )wxGrid_IsInSelection(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -12215,10 +12157,10 @@ static PyObject *_wrap_wxGrid_BlockToDeviceRect(PyObject *self, PyObject *args,
          return NULL;
  }
  {
          return NULL;
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = new wxRect (wxGrid_BlockToDeviceRect(_arg0,*_arg1,*_arg2));
  
          _result = new wxRect (wxGrid_BlockToDeviceRect(_arg0,*_arg1,*_arg2));
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxRect_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxRect_p");
      _resultobj = Py_BuildValue("s",_ptemp);
@@ -12245,10 +12187,10 @@ static PyObject *_wrap_wxGrid_GetSelectionBackground(PyObject *self, PyObject *a
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = new wxColour (wxGrid_GetSelectionBackground(_arg0));
  
          _result = new wxColour (wxGrid_GetSelectionBackground(_arg0));
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
@@ -12275,10 +12217,10 @@ static PyObject *_wrap_wxGrid_GetSelectionForeground(PyObject *self, PyObject *a
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = new wxColour (wxGrid_GetSelectionForeground(_arg0));
  
          _result = new wxColour (wxGrid_GetSelectionForeground(_arg0));
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
      _resultobj = Py_BuildValue("s",_ptemp);
@@ -12311,10 +12253,10 @@ static PyObject *_wrap_wxGrid_SetSelectionBackground(PyObject *self, PyObject *a
          return NULL;
  }
  {
          return NULL;
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetSelectionBackground(_arg0,*_arg1);
  
          wxGrid_SetSelectionBackground(_arg0,*_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -12347,10 +12289,10 @@ static PyObject *_wrap_wxGrid_SetSelectionForeground(PyObject *self, PyObject *a
          return NULL;
  }
  {
          return NULL;
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetSelectionForeground(_arg0,*_arg1);
  
          wxGrid_SetSelectionForeground(_arg0,*_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -12413,10 +12355,10 @@ static PyObject *_wrap_wxGrid_RegisterDataType(PyObject *self, PyObject *args, P
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_RegisterDataType(_arg0,*_arg1,_arg2,_arg3);
  
          wxGrid_RegisterDataType(_arg0,*_arg1,_arg2,_arg3);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -12449,10 +12391,10 @@ static PyObject *_wrap_wxGrid_GetDefaultEditorForCell(PyObject *self, PyObject *
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellEditor *)wxGrid_GetDefaultEditorForCell(_arg0,_arg1,_arg2);
  
          _result = (wxGridCellEditor *)wxGrid_GetDefaultEditorForCell(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellEditor_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellEditor_p");
@@ -12486,10 +12428,10 @@ static PyObject *_wrap_wxGrid_GetDefaultRendererForCell(PyObject *self, PyObject
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellRenderer *)wxGrid_GetDefaultRendererForCell(_arg0,_arg1,_arg2);
  
          _result = (wxGridCellRenderer *)wxGrid_GetDefaultRendererForCell(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellRenderer_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellRenderer_p");
@@ -12541,10 +12483,10 @@ static PyObject *_wrap_wxGrid_GetDefaultEditorForType(PyObject *self, PyObject *
  #endif
  }
  {
  #endif
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellEditor *)wxGrid_GetDefaultEditorForType(_arg0,*_arg1);
  
          _result = (wxGridCellEditor *)wxGrid_GetDefaultEditorForType(_arg0,*_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellEditor_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellEditor_p");
@@ -12600,10 +12542,10 @@ static PyObject *_wrap_wxGrid_GetDefaultRendererForType(PyObject *self, PyObject
  #endif
  }
  {
  #endif
  }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridCellRenderer *)wxGrid_GetDefaultRendererForType(_arg0,*_arg1);
  
          _result = (wxGridCellRenderer *)wxGrid_GetDefaultRendererForType(_arg0,*_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellRenderer_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCellRenderer_p");
@@ -12639,10 +12581,10 @@ static PyObject *_wrap_wxGrid_SetMargins(PyObject *self, PyObject *args, PyObjec
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGrid_SetMargins(_arg0,_arg1,_arg2);
  
          wxGrid_SetMargins(_arg0,_arg1,_arg2);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -12668,10 +12610,10 @@ static PyObject *_wrap_wxGrid_GetGridWindow(PyObject *self, PyObject *args, PyOb
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxWindow *)wxGrid_GetGridWindow(_arg0);
  
          _result = (wxWindow *)wxGrid_GetGridWindow(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }{ _resultobj = wxPyMake_wxObject(_result); }
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }{ _resultobj = wxPyMake_wxObject(_result); }
      return _resultobj;
@@ -12696,10 +12638,10 @@ static PyObject *_wrap_wxGrid_GetGridRowLabelWindow(PyObject *self, PyObject *ar
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxWindow *)wxGrid_GetGridRowLabelWindow(_arg0);
  
          _result = (wxWindow *)wxGrid_GetGridRowLabelWindow(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }{ _resultobj = wxPyMake_wxObject(_result); }
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }{ _resultobj = wxPyMake_wxObject(_result); }
      return _resultobj;
@@ -12724,10 +12666,10 @@ static PyObject *_wrap_wxGrid_GetGridColLabelWindow(PyObject *self, PyObject *ar
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxWindow *)wxGrid_GetGridColLabelWindow(_arg0);
  
          _result = (wxWindow *)wxGrid_GetGridColLabelWindow(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }{ _resultobj = wxPyMake_wxObject(_result); }
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }{ _resultobj = wxPyMake_wxObject(_result); }
      return _resultobj;
@@ -12752,10 +12694,10 @@ static PyObject *_wrap_wxGrid_GetGridCornerLabelWindow(PyObject *self, PyObject
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxWindow *)wxGrid_GetGridCornerLabelWindow(_arg0);
  
          _result = (wxWindow *)wxGrid_GetGridCornerLabelWindow(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }{ _resultobj = wxPyMake_wxObject(_result); }
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }{ _resultobj = wxPyMake_wxObject(_result); }
      return _resultobj;
@@ -12834,10 +12776,10 @@ static PyObject *_wrap_new_wxGridEvent(PyObject *self, PyObject *args, PyObject
      _arg10 = (bool ) tempbool10;
      _arg11 = (bool ) tempbool11;
  {
      _arg10 = (bool ) tempbool10;
      _arg11 = (bool ) tempbool11;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridEvent *)new_wxGridEvent(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8,_arg9,_arg10,_arg11);
  
          _result = (wxGridEvent *)new_wxGridEvent(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8,_arg9,_arg10,_arg11);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridEvent_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridEvent_p");
@@ -12868,10 +12810,10 @@ static PyObject *_wrap_wxGridEvent_GetRow(PyObject *self, PyObject *args, PyObje
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGridEvent_GetRow(_arg0);
  
          _result = (int )wxGridEvent_GetRow(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -12896,10 +12838,10 @@ static PyObject *_wrap_wxGridEvent_GetCol(PyObject *self, PyObject *args, PyObje
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGridEvent_GetCol(_arg0);
  
          _result = (int )wxGridEvent_GetCol(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -12925,10 +12867,10 @@ static PyObject *_wrap_wxGridEvent_GetPosition(PyObject *self, PyObject *args, P
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = new wxPoint (wxGridEvent_GetPosition(_arg0));
  
          _result = new wxPoint (wxGridEvent_GetPosition(_arg0));
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxPoint_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxPoint_p");
      _resultobj = Py_BuildValue("s",_ptemp);
@@ -12954,10 +12896,10 @@ static PyObject *_wrap_wxGridEvent_Selecting(PyObject *self, PyObject *args, PyO
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridEvent_Selecting(_arg0);
  
          _result = (bool )wxGridEvent_Selecting(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -12982,10 +12924,10 @@ static PyObject *_wrap_wxGridEvent_ControlDown(PyObject *self, PyObject *args, P
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridEvent_ControlDown(_arg0);
  
          _result = (bool )wxGridEvent_ControlDown(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -13010,10 +12952,10 @@ static PyObject *_wrap_wxGridEvent_MetaDown(PyObject *self, PyObject *args, PyOb
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridEvent_MetaDown(_arg0);
  
          _result = (bool )wxGridEvent_MetaDown(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -13038,10 +12980,10 @@ static PyObject *_wrap_wxGridEvent_ShiftDown(PyObject *self, PyObject *args, PyO
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridEvent_ShiftDown(_arg0);
  
          _result = (bool )wxGridEvent_ShiftDown(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -13066,10 +13008,10 @@ static PyObject *_wrap_wxGridEvent_AltDown(PyObject *self, PyObject *args, PyObj
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridEvent_AltDown(_arg0);
  
          _result = (bool )wxGridEvent_AltDown(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -13144,10 +13086,10 @@ static PyObject *_wrap_new_wxGridSizeEvent(PyObject *self, PyObject *args, PyObj
      _arg8 = (bool ) tempbool8;
      _arg9 = (bool ) tempbool9;
  {
      _arg8 = (bool ) tempbool8;
      _arg9 = (bool ) tempbool9;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridSizeEvent *)new_wxGridSizeEvent(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8,_arg9);
  
          _result = (wxGridSizeEvent *)new_wxGridSizeEvent(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8,_arg9);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridSizeEvent_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridSizeEvent_p");
@@ -13178,10 +13120,10 @@ static PyObject *_wrap_wxGridSizeEvent_GetRowOrCol(PyObject *self, PyObject *arg
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGridSizeEvent_GetRowOrCol(_arg0);
  
          _result = (int )wxGridSizeEvent_GetRowOrCol(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -13207,10 +13149,10 @@ static PyObject *_wrap_wxGridSizeEvent_GetPosition(PyObject *self, PyObject *arg
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = new wxPoint (wxGridSizeEvent_GetPosition(_arg0));
  
          _result = new wxPoint (wxGridSizeEvent_GetPosition(_arg0));
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxPoint_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxPoint_p");
      _resultobj = Py_BuildValue("s",_ptemp);
@@ -13236,10 +13178,10 @@ static PyObject *_wrap_wxGridSizeEvent_ControlDown(PyObject *self, PyObject *arg
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridSizeEvent_ControlDown(_arg0);
  
          _result = (bool )wxGridSizeEvent_ControlDown(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -13264,10 +13206,10 @@ static PyObject *_wrap_wxGridSizeEvent_MetaDown(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridSizeEvent_MetaDown(_arg0);
  
          _result = (bool )wxGridSizeEvent_MetaDown(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -13292,10 +13234,10 @@ static PyObject *_wrap_wxGridSizeEvent_ShiftDown(PyObject *self, PyObject *args,
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridSizeEvent_ShiftDown(_arg0);
  
          _result = (bool )wxGridSizeEvent_ShiftDown(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -13320,10 +13262,10 @@ static PyObject *_wrap_wxGridSizeEvent_AltDown(PyObject *self, PyObject *args, P
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridSizeEvent_AltDown(_arg0);
  
          _result = (bool )wxGridSizeEvent_AltDown(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -13414,10 +13356,10 @@ static PyObject *_wrap_new_wxGridRangeSelectEvent(PyObject *self, PyObject *args
      _arg8 = (bool ) tempbool8;
      _arg9 = (bool ) tempbool9;
  {
      _arg8 = (bool ) tempbool8;
      _arg9 = (bool ) tempbool9;
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridRangeSelectEvent *)new_wxGridRangeSelectEvent(_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5,_arg6,_arg7,_arg8,_arg9);
  
          _result = (wxGridRangeSelectEvent *)new_wxGridRangeSelectEvent(_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5,_arg6,_arg7,_arg8,_arg9);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridRangeSelectEvent_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridRangeSelectEvent_p");
@@ -13449,10 +13391,10 @@ static PyObject *_wrap_wxGridRangeSelectEvent_GetTopLeftCoords(PyObject *self, P
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = new wxGridCellCoords (wxGridRangeSelectEvent_GetTopLeftCoords(_arg0));
  
          _result = new wxGridCellCoords (wxGridRangeSelectEvent_GetTopLeftCoords(_arg0));
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxGridCellCoords_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxGridCellCoords_p");
      _resultobj = Py_BuildValue("s",_ptemp);
@@ -13479,10 +13421,10 @@ static PyObject *_wrap_wxGridRangeSelectEvent_GetBottomRightCoords(PyObject *sel
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = new wxGridCellCoords (wxGridRangeSelectEvent_GetBottomRightCoords(_arg0));
  
          _result = new wxGridCellCoords (wxGridRangeSelectEvent_GetBottomRightCoords(_arg0));
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxGridCellCoords_p");
      _resultobj = Py_BuildValue("s",_ptemp);
      if (PyErr_Occurred()) return NULL;
  }    SWIG_MakePtr(_ptemp, (void *) _result,"_wxGridCellCoords_p");
      _resultobj = Py_BuildValue("s",_ptemp);
@@ -13508,10 +13450,10 @@ static PyObject *_wrap_wxGridRangeSelectEvent_GetTopRow(PyObject *self, PyObject
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGridRangeSelectEvent_GetTopRow(_arg0);
  
          _result = (int )wxGridRangeSelectEvent_GetTopRow(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -13536,10 +13478,10 @@ static PyObject *_wrap_wxGridRangeSelectEvent_GetBottomRow(PyObject *self, PyObj
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGridRangeSelectEvent_GetBottomRow(_arg0);
  
          _result = (int )wxGridRangeSelectEvent_GetBottomRow(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -13564,10 +13506,10 @@ static PyObject *_wrap_wxGridRangeSelectEvent_GetLeftCol(PyObject *self, PyObjec
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGridRangeSelectEvent_GetLeftCol(_arg0);
  
          _result = (int )wxGridRangeSelectEvent_GetLeftCol(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -13592,10 +13534,10 @@ static PyObject *_wrap_wxGridRangeSelectEvent_GetRightCol(PyObject *self, PyObje
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGridRangeSelectEvent_GetRightCol(_arg0);
  
          _result = (int )wxGridRangeSelectEvent_GetRightCol(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -13620,10 +13562,10 @@ static PyObject *_wrap_wxGridRangeSelectEvent_Selecting(PyObject *self, PyObject
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridRangeSelectEvent_Selecting(_arg0);
  
          _result = (bool )wxGridRangeSelectEvent_Selecting(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -13648,10 +13590,10 @@ static PyObject *_wrap_wxGridRangeSelectEvent_ControlDown(PyObject *self, PyObje
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridRangeSelectEvent_ControlDown(_arg0);
  
          _result = (bool )wxGridRangeSelectEvent_ControlDown(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -13676,10 +13618,10 @@ static PyObject *_wrap_wxGridRangeSelectEvent_MetaDown(PyObject *self, PyObject
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridRangeSelectEvent_MetaDown(_arg0);
  
          _result = (bool )wxGridRangeSelectEvent_MetaDown(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -13704,10 +13646,10 @@ static PyObject *_wrap_wxGridRangeSelectEvent_ShiftDown(PyObject *self, PyObject
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridRangeSelectEvent_ShiftDown(_arg0);
  
          _result = (bool )wxGridRangeSelectEvent_ShiftDown(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -13732,10 +13674,10 @@ static PyObject *_wrap_wxGridRangeSelectEvent_AltDown(PyObject *self, PyObject *
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (bool )wxGridRangeSelectEvent_AltDown(_arg0);
  
          _result = (bool )wxGridRangeSelectEvent_AltDown(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -13798,10 +13740,10 @@ static PyObject *_wrap_new_wxGridEditorCreatedEvent(PyObject *self, PyObject *ar
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxGridEditorCreatedEvent *)new_wxGridEditorCreatedEvent(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5);
  
          _result = (wxGridEditorCreatedEvent *)new_wxGridEditorCreatedEvent(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridEditorCreatedEvent_p");
      if (PyErr_Occurred()) return NULL;
  }    if (_result) {
          SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridEditorCreatedEvent_p");
@@ -13832,10 +13774,10 @@ static PyObject *_wrap_wxGridEditorCreatedEvent_GetRow(PyObject *self, PyObject
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGridEditorCreatedEvent_GetRow(_arg0);
  
          _result = (int )wxGridEditorCreatedEvent_GetRow(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -13860,10 +13802,10 @@ static PyObject *_wrap_wxGridEditorCreatedEvent_GetCol(PyObject *self, PyObject
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (int )wxGridEditorCreatedEvent_GetCol(_arg0);
  
          _result = (int )wxGridEditorCreatedEvent_GetCol(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }    _resultobj = Py_BuildValue("i",_result);
      return _resultobj;
@@ -13888,10 +13830,10 @@ static PyObject *_wrap_wxGridEditorCreatedEvent_GetControl(PyObject *self, PyObj
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          _result = (wxControl *)wxGridEditorCreatedEvent_GetControl(_arg0);
  
          _result = (wxControl *)wxGridEditorCreatedEvent_GetControl(_arg0);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }{ _resultobj = wxPyMake_wxObject(_result); }
      return _resultobj;
      if (PyErr_Occurred()) return NULL;
  }{ _resultobj = wxPyMake_wxObject(_result); }
      return _resultobj;
@@ -13916,10 +13858,10 @@ static PyObject *_wrap_wxGridEditorCreatedEvent_SetRow(PyObject *self, PyObject
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridEditorCreatedEvent_SetRow(_arg0,_arg1);
  
          wxGridEditorCreatedEvent_SetRow(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -13945,10 +13887,10 @@ static PyObject *_wrap_wxGridEditorCreatedEvent_SetCol(PyObject *self, PyObject
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridEditorCreatedEvent_SetCol(_arg0,_arg1);
  
          wxGridEditorCreatedEvent_SetCol(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -13982,10 +13924,10 @@ static PyObject *_wrap_wxGridEditorCreatedEvent_SetControl(PyObject *self, PyObj
          }
      }
  {
          }
      }
  {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxGridEditorCreatedEvent_SetControl(_arg0,_arg1);
  
          wxGridEditorCreatedEvent_SetControl(_arg0,_arg1);
  
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
      if (PyErr_Occurred()) return NULL;
  }    Py_INCREF(Py_None);
      _resultobj = Py_None;
@@ -14175,7 +14117,6 @@ static PyMethodDef gridcMethods[] = {
          { "wxGrid_EndBatch", (PyCFunction) _wrap_wxGrid_EndBatch, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_BeginBatch", (PyCFunction) _wrap_wxGrid_BeginBatch, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_GetTextBoxSize", (PyCFunction) _wrap_wxGrid_GetTextBoxSize, 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_GetTextBoxSize", (PyCFunction) _wrap_wxGrid_GetTextBoxSize, METH_VARARGS | METH_KEYWORDS },
-        { "wxGrid_StringToLines", (PyCFunction) _wrap_wxGrid_StringToLines, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_DrawTextRectangle", (PyCFunction) _wrap_wxGrid_DrawTextRectangle, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_DrawCellHighlight", (PyCFunction) _wrap_wxGrid_DrawCellHighlight, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_DeleteCols", (PyCFunction) _wrap_wxGrid_DeleteCols, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_DrawTextRectangle", (PyCFunction) _wrap_wxGrid_DrawTextRectangle, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_DrawCellHighlight", (PyCFunction) _wrap_wxGrid_DrawCellHighlight, METH_VARARGS | METH_KEYWORDS },
          { "wxGrid_DeleteCols", (PyCFunction) _wrap_wxGrid_DeleteCols, METH_VARARGS | METH_KEYWORDS },
@@ -14233,7 +14174,7 @@ static PyMethodDef gridcMethods[] = {
          { "wxPyGridTableBase_base_CanGetValueAs", (PyCFunction) _wrap_wxPyGridTableBase_base_CanGetValueAs, METH_VARARGS | METH_KEYWORDS },
          { "wxPyGridTableBase_base_GetTypeName", (PyCFunction) _wrap_wxPyGridTableBase_base_GetTypeName, METH_VARARGS | METH_KEYWORDS },
          { "wxPyGridTableBase_Destroy", (PyCFunction) _wrap_wxPyGridTableBase_Destroy, METH_VARARGS | METH_KEYWORDS },
          { "wxPyGridTableBase_base_CanGetValueAs", (PyCFunction) _wrap_wxPyGridTableBase_base_CanGetValueAs, METH_VARARGS | METH_KEYWORDS },
          { "wxPyGridTableBase_base_GetTypeName", (PyCFunction) _wrap_wxPyGridTableBase_base_GetTypeName, METH_VARARGS | METH_KEYWORDS },
          { "wxPyGridTableBase_Destroy", (PyCFunction) _wrap_wxPyGridTableBase_Destroy, METH_VARARGS | METH_KEYWORDS },
-        { "wxPyGridTableBase__setSelf", (PyCFunction) _wrap_wxPyGridTableBase__setSelf, METH_VARARGS | METH_KEYWORDS },
+        { "wxPyGridTableBase__setCallbackInfo", (PyCFunction) _wrap_wxPyGridTableBase__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
          { "new_wxPyGridTableBase", (PyCFunction) _wrap_new_wxPyGridTableBase, METH_VARARGS | METH_KEYWORDS },
          { "wxGridTableBase_SetColAttr", (PyCFunction) _wrap_wxGridTableBase_SetColAttr, METH_VARARGS | METH_KEYWORDS },
          { "wxGridTableBase_SetRowAttr", (PyCFunction) _wrap_wxGridTableBase_SetRowAttr, METH_VARARGS | METH_KEYWORDS },
          { "new_wxPyGridTableBase", (PyCFunction) _wrap_new_wxPyGridTableBase, METH_VARARGS | METH_KEYWORDS },
          { "wxGridTableBase_SetColAttr", (PyCFunction) _wrap_wxGridTableBase_SetColAttr, METH_VARARGS | METH_KEYWORDS },
          { "wxGridTableBase_SetRowAttr", (PyCFunction) _wrap_wxGridTableBase_SetRowAttr, METH_VARARGS | METH_KEYWORDS },
@@ -14273,7 +14214,7 @@ static PyMethodDef gridcMethods[] = {
          { "wxPyGridCellAttrProvider_base_SetRowAttr", (PyCFunction) _wrap_wxPyGridCellAttrProvider_base_SetRowAttr, METH_VARARGS | METH_KEYWORDS },
          { "wxPyGridCellAttrProvider_base_SetAttr", (PyCFunction) _wrap_wxPyGridCellAttrProvider_base_SetAttr, METH_VARARGS | METH_KEYWORDS },
          { "wxPyGridCellAttrProvider_base_GetAttr", (PyCFunction) _wrap_wxPyGridCellAttrProvider_base_GetAttr, METH_VARARGS | METH_KEYWORDS },
          { "wxPyGridCellAttrProvider_base_SetRowAttr", (PyCFunction) _wrap_wxPyGridCellAttrProvider_base_SetRowAttr, METH_VARARGS | METH_KEYWORDS },
          { "wxPyGridCellAttrProvider_base_SetAttr", (PyCFunction) _wrap_wxPyGridCellAttrProvider_base_SetAttr, METH_VARARGS | METH_KEYWORDS },
          { "wxPyGridCellAttrProvider_base_GetAttr", (PyCFunction) _wrap_wxPyGridCellAttrProvider_base_GetAttr, METH_VARARGS | METH_KEYWORDS },
-        { "wxPyGridCellAttrProvider__setSelf", (PyCFunction) _wrap_wxPyGridCellAttrProvider__setSelf, METH_VARARGS | METH_KEYWORDS },
+        { "wxPyGridCellAttrProvider__setCallbackInfo", (PyCFunction) _wrap_wxPyGridCellAttrProvider__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
          { "new_wxPyGridCellAttrProvider", (PyCFunction) _wrap_new_wxPyGridCellAttrProvider, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellAttrProvider_UpdateAttrCols", (PyCFunction) _wrap_wxGridCellAttrProvider_UpdateAttrCols, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellAttrProvider_UpdateAttrRows", (PyCFunction) _wrap_wxGridCellAttrProvider_UpdateAttrRows, METH_VARARGS | METH_KEYWORDS },
          { "new_wxPyGridCellAttrProvider", (PyCFunction) _wrap_new_wxPyGridCellAttrProvider, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellAttrProvider_UpdateAttrCols", (PyCFunction) _wrap_wxGridCellAttrProvider_UpdateAttrCols, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellAttrProvider_UpdateAttrRows", (PyCFunction) _wrap_wxGridCellAttrProvider_UpdateAttrRows, METH_VARARGS | METH_KEYWORDS },
@@ -14326,7 +14267,7 @@ static PyMethodDef gridcMethods[] = {
          { "wxPyGridCellEditor_base_PaintBackground", (PyCFunction) _wrap_wxPyGridCellEditor_base_PaintBackground, METH_VARARGS | METH_KEYWORDS },
          { "wxPyGridCellEditor_base_Show", (PyCFunction) _wrap_wxPyGridCellEditor_base_Show, METH_VARARGS | METH_KEYWORDS },
          { "wxPyGridCellEditor_base_SetSize", (PyCFunction) _wrap_wxPyGridCellEditor_base_SetSize, METH_VARARGS | METH_KEYWORDS },
          { "wxPyGridCellEditor_base_PaintBackground", (PyCFunction) _wrap_wxPyGridCellEditor_base_PaintBackground, METH_VARARGS | METH_KEYWORDS },
          { "wxPyGridCellEditor_base_Show", (PyCFunction) _wrap_wxPyGridCellEditor_base_Show, METH_VARARGS | METH_KEYWORDS },
          { "wxPyGridCellEditor_base_SetSize", (PyCFunction) _wrap_wxPyGridCellEditor_base_SetSize, METH_VARARGS | METH_KEYWORDS },
-        { "wxPyGridCellEditor__setSelf", (PyCFunction) _wrap_wxPyGridCellEditor__setSelf, METH_VARARGS | METH_KEYWORDS },
+        { "wxPyGridCellEditor__setCallbackInfo", (PyCFunction) _wrap_wxPyGridCellEditor__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
          { "new_wxPyGridCellEditor", (PyCFunction) _wrap_new_wxPyGridCellEditor, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellEditor_Destroy", (PyCFunction) _wrap_wxGridCellEditor_Destroy, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellEditor_HandleReturn", (PyCFunction) _wrap_wxGridCellEditor_HandleReturn, METH_VARARGS | METH_KEYWORDS },
          { "new_wxPyGridCellEditor", (PyCFunction) _wrap_new_wxPyGridCellEditor, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellEditor_Destroy", (PyCFunction) _wrap_wxGridCellEditor_Destroy, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellEditor_HandleReturn", (PyCFunction) _wrap_wxGridCellEditor_HandleReturn, METH_VARARGS | METH_KEYWORDS },
@@ -14359,7 +14300,7 @@ static PyMethodDef gridcMethods[] = {
          { "new_wxGridCellNumberRenderer", (PyCFunction) _wrap_new_wxGridCellNumberRenderer, METH_VARARGS | METH_KEYWORDS },
          { "new_wxGridCellStringRenderer", (PyCFunction) _wrap_new_wxGridCellStringRenderer, METH_VARARGS | METH_KEYWORDS },
          { "wxPyGridCellRenderer_base_SetParameters", (PyCFunction) _wrap_wxPyGridCellRenderer_base_SetParameters, METH_VARARGS | METH_KEYWORDS },
          { "new_wxGridCellNumberRenderer", (PyCFunction) _wrap_new_wxGridCellNumberRenderer, METH_VARARGS | METH_KEYWORDS },
          { "new_wxGridCellStringRenderer", (PyCFunction) _wrap_new_wxGridCellStringRenderer, METH_VARARGS | METH_KEYWORDS },
          { "wxPyGridCellRenderer_base_SetParameters", (PyCFunction) _wrap_wxPyGridCellRenderer_base_SetParameters, METH_VARARGS | METH_KEYWORDS },
-        { "wxPyGridCellRenderer__setSelf", (PyCFunction) _wrap_wxPyGridCellRenderer__setSelf, METH_VARARGS | METH_KEYWORDS },
+        { "wxPyGridCellRenderer__setCallbackInfo", (PyCFunction) _wrap_wxPyGridCellRenderer__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
          { "new_wxPyGridCellRenderer", (PyCFunction) _wrap_new_wxPyGridCellRenderer, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellRenderer_Clone", (PyCFunction) _wrap_wxGridCellRenderer_Clone, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellRenderer_GetBestSize", (PyCFunction) _wrap_wxGridCellRenderer_GetBestSize, METH_VARARGS | METH_KEYWORDS },
          { "new_wxPyGridCellRenderer", (PyCFunction) _wrap_new_wxPyGridCellRenderer, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellRenderer_Clone", (PyCFunction) _wrap_wxGridCellRenderer_Clone, METH_VARARGS | METH_KEYWORDS },
          { "wxGridCellRenderer_GetBestSize", (PyCFunction) _wrap_wxGridCellRenderer_GetBestSize, METH_VARARGS | METH_KEYWORDS },
@@ -14376,32 +14317,11 @@ static PyMethodDef gridcMethods[] = {
   * This table is used by the pointer type-checker
   */
  static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
   * This table is used by the pointer type-checker
   */
  static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
-    { "_wxEvent","_class_wxGridEditorCreatedEvent",SwigwxGridEditorCreatedEventTowxEvent},
      { "_wxEvent","_wxGridEditorCreatedEvent",SwigwxGridEditorCreatedEventTowxEvent},
      { "_wxEvent","_wxGridEditorCreatedEvent",SwigwxGridEditorCreatedEventTowxEvent},
-    { "_wxEvent","_class_wxGridRangeSelectEvent",SwigwxGridRangeSelectEventTowxEvent},
      { "_wxEvent","_wxGridRangeSelectEvent",SwigwxGridRangeSelectEventTowxEvent},
      { "_wxEvent","_wxGridRangeSelectEvent",SwigwxGridRangeSelectEventTowxEvent},
-    { "_wxEvent","_class_wxGridSizeEvent",SwigwxGridSizeEventTowxEvent},
      { "_wxEvent","_wxGridSizeEvent",SwigwxGridSizeEventTowxEvent},
      { "_wxEvent","_wxGridSizeEvent",SwigwxGridSizeEventTowxEvent},
-    { "_wxEvent","_class_wxGridEvent",SwigwxGridEventTowxEvent},
      { "_wxEvent","_wxGridEvent",SwigwxGridEventTowxEvent},
      { "_signed_long","_long",0},
      { "_wxEvent","_wxGridEvent",SwigwxGridEventTowxEvent},
      { "_signed_long","_long",0},
-    { "_class_wxGridCellRenderer","_class_wxGridCellAutoWrapStringRenderer",SwigwxGridCellAutoWrapStringRendererTowxGridCellRenderer},
-    { "_class_wxGridCellRenderer","_wxGridCellAutoWrapStringRenderer",SwigwxGridCellAutoWrapStringRendererTowxGridCellRenderer},
-    { "_class_wxGridCellRenderer","_class_wxGridCellEnumRenderer",SwigwxGridCellEnumRendererTowxGridCellRenderer},
-    { "_class_wxGridCellRenderer","_wxGridCellEnumRenderer",SwigwxGridCellEnumRendererTowxGridCellRenderer},
-    { "_class_wxGridCellRenderer","_class_wxGridCellDateTimeRenderer",SwigwxGridCellDateTimeRendererTowxGridCellRenderer},
-    { "_class_wxGridCellRenderer","_wxGridCellDateTimeRenderer",SwigwxGridCellDateTimeRendererTowxGridCellRenderer},
-    { "_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},
-    { "_wxGridCellChoiceEditor","_class_wxGridCellEnumEditor",SwigwxGridCellEnumEditorTowxGridCellChoiceEditor},
      { "_wxGridCellChoiceEditor","_wxGridCellEnumEditor",SwigwxGridCellEnumEditorTowxGridCellChoiceEditor},
      { "_wxPrintQuality","_WXGRIDSELECTIONMODES",0},
      { "_wxPrintQuality","_wxCoord",0},
      { "_wxGridCellChoiceEditor","_wxGridCellEnumEditor",SwigwxGridCellEnumEditorTowxGridCellChoiceEditor},
      { "_wxPrintQuality","_WXGRIDSELECTIONMODES",0},
      { "_wxPrintQuality","_wxCoord",0},
@@ -14413,33 +14333,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_wxEvtHandler","_class_wxGrid",SwigwxGridTowxEvtHandler},
-    { "_class_wxEvtHandler","_wxGrid",SwigwxGridTowxEvtHandler},
-    { "_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},
      { "_byte","_unsigned_char",0},
      { "_long","_unsigned_long",0},
      { "_long","_signed_long",0},
      { "_wxNotifyEvent","_wxGridEvent",SwigwxGridEventTowxNotifyEvent},
      { "_byte","_unsigned_char",0},
      { "_long","_unsigned_long",0},
      { "_long","_signed_long",0},
-    { "_class_wxObject","_class_wxGridEditorCreatedEvent",SwigwxGridEditorCreatedEventTowxObject},
-    { "_class_wxObject","_wxGridEditorCreatedEvent",SwigwxGridEditorCreatedEventTowxObject},
-    { "_class_wxObject","_class_wxGridRangeSelectEvent",SwigwxGridRangeSelectEventTowxObject},
-    { "_class_wxObject","_wxGridRangeSelectEvent",SwigwxGridRangeSelectEventTowxObject},
-    { "_class_wxObject","_class_wxGridSizeEvent",SwigwxGridSizeEventTowxObject},
-    { "_class_wxObject","_wxGridSizeEvent",SwigwxGridSizeEventTowxObject},
-    { "_class_wxObject","_class_wxGridEvent",SwigwxGridEventTowxObject},
-    { "_class_wxObject","_wxGridEvent",SwigwxGridEventTowxObject},
-    { "_class_wxObject","_class_wxGrid",SwigwxGridTowxObject},
-    { "_class_wxObject","_wxGrid",SwigwxGridTowxObject},
-    { "_class_wxObject","_class_wxGridStringTable",SwigwxGridStringTableTowxObject},
-    { "_class_wxObject","_wxGridStringTable",SwigwxGridStringTableTowxObject},
-    { "_class_wxObject","_class_wxPyGridTableBase",SwigwxPyGridTableBaseTowxObject},
-    { "_class_wxObject","_wxPyGridTableBase",SwigwxPyGridTableBaseTowxObject},
-    { "_class_wxObject","_class_wxGridTableBase",SwigwxGridTableBaseTowxObject},
-    { "_class_wxObject","_wxGridTableBase",SwigwxGridTableBaseTowxObject},
      { "_size_t","_WXGRIDSELECTIONMODES",0},
      { "_size_t","_wxCoord",0},
      { "_size_t","_wxPrintQuality",0},
      { "_size_t","_WXGRIDSELECTIONMODES",0},
      { "_size_t","_wxCoord",0},
      { "_size_t","_wxPrintQuality",0},
@@ -14448,7 +14347,6 @@ 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},
-    { "_wxPanel","_class_wxGrid",SwigwxGridTowxPanel},
      { "_wxPanel","_wxGrid",SwigwxGridTowxPanel},
      { "_uint","_WXGRIDSELECTIONMODES",0},
      { "_uint","_wxCoord",0},
      { "_wxPanel","_wxGrid",SwigwxGridTowxPanel},
      { "_uint","_WXGRIDSELECTIONMODES",0},
      { "_uint","_wxCoord",0},
@@ -14459,45 +14357,18 @@ 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},
-    { "_class_wxEvent","_class_wxGridEditorCreatedEvent",SwigwxGridEditorCreatedEventTowxEvent},
-    { "_class_wxEvent","_wxGridEditorCreatedEvent",SwigwxGridEditorCreatedEventTowxEvent},
-    { "_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_wxGridCellChoiceEditor","_class_wxGridCellEnumEditor",SwigwxGridCellEnumEditorTowxGridCellChoiceEditor},
-    { "_class_wxGridCellChoiceEditor","_wxGridCellEnumEditor",SwigwxGridCellEnumEditorTowxGridCellChoiceEditor},
-    { "_wxCommandEvent","_class_wxGridEditorCreatedEvent",SwigwxGridEditorCreatedEventTowxCommandEvent},
      { "_wxCommandEvent","_wxGridEditorCreatedEvent",SwigwxGridEditorCreatedEventTowxCommandEvent},
      { "_wxCommandEvent","_wxGridEditorCreatedEvent",SwigwxGridEditorCreatedEventTowxCommandEvent},
-    { "_wxCommandEvent","_class_wxGridRangeSelectEvent",SwigwxGridRangeSelectEventTowxCommandEvent},
      { "_wxCommandEvent","_wxGridRangeSelectEvent",SwigwxGridRangeSelectEventTowxCommandEvent},
      { "_wxCommandEvent","_wxGridRangeSelectEvent",SwigwxGridRangeSelectEventTowxCommandEvent},
-    { "_wxCommandEvent","_class_wxGridSizeEvent",SwigwxGridSizeEventTowxCommandEvent},
      { "_wxCommandEvent","_wxGridSizeEvent",SwigwxGridSizeEventTowxCommandEvent},
      { "_wxCommandEvent","_wxGridSizeEvent",SwigwxGridSizeEventTowxCommandEvent},
-    { "_wxCommandEvent","_class_wxGridEvent",SwigwxGridEventTowxCommandEvent},
      { "_wxCommandEvent","_wxGridEvent",SwigwxGridEventTowxCommandEvent},
      { "_char","_wxChar",0},
      { "_wxCommandEvent","_wxGridEvent",SwigwxGridEventTowxCommandEvent},
      { "_char","_wxChar",0},
-    { "_wxGridCellStringRenderer","_class_wxGridCellAutoWrapStringRenderer",SwigwxGridCellAutoWrapStringRendererTowxGridCellStringRenderer},
      { "_wxGridCellStringRenderer","_wxGridCellAutoWrapStringRenderer",SwigwxGridCellAutoWrapStringRendererTowxGridCellStringRenderer},
      { "_wxGridCellStringRenderer","_wxGridCellAutoWrapStringRenderer",SwigwxGridCellAutoWrapStringRendererTowxGridCellStringRenderer},
-    { "_wxGridCellStringRenderer","_class_wxGridCellEnumRenderer",SwigwxGridCellEnumRendererTowxGridCellStringRenderer},
      { "_wxGridCellStringRenderer","_wxGridCellEnumRenderer",SwigwxGridCellEnumRendererTowxGridCellStringRenderer},
      { "_wxGridCellStringRenderer","_wxGridCellEnumRenderer",SwigwxGridCellEnumRendererTowxGridCellStringRenderer},
-    { "_wxGridCellStringRenderer","_class_wxGridCellDateTimeRenderer",SwigwxGridCellDateTimeRendererTowxGridCellStringRenderer},
      { "_wxGridCellStringRenderer","_wxGridCellDateTimeRenderer",SwigwxGridCellDateTimeRendererTowxGridCellStringRenderer},
      { "_wxGridCellStringRenderer","_wxGridCellDateTimeRenderer",SwigwxGridCellDateTimeRendererTowxGridCellStringRenderer},
-    { "_wxGridCellStringRenderer","_class_wxGridCellFloatRenderer",SwigwxGridCellFloatRendererTowxGridCellStringRenderer},
      { "_wxGridCellStringRenderer","_wxGridCellFloatRenderer",SwigwxGridCellFloatRendererTowxGridCellStringRenderer},
      { "_wxGridCellStringRenderer","_wxGridCellFloatRenderer",SwigwxGridCellFloatRendererTowxGridCellStringRenderer},
-    { "_wxGridCellStringRenderer","_class_wxGridCellNumberRenderer",SwigwxGridCellNumberRendererTowxGridCellStringRenderer},
      { "_wxGridCellStringRenderer","_wxGridCellNumberRenderer",SwigwxGridCellNumberRendererTowxGridCellStringRenderer},
      { "_wxGridCellStringRenderer","_wxGridCellNumberRenderer",SwigwxGridCellNumberRendererTowxGridCellStringRenderer},
-    { "_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},
      { "_struct_wxNativeFontInfo","_wxNativeFontInfo",0},
      { "_struct_wxNativeFontInfo","_wxNativeFontInfo",0},
-    { "_wxGridTableBase","_class_wxGridStringTable",SwigwxGridStringTableTowxGridTableBase},
      { "_wxGridTableBase","_wxGridStringTable",SwigwxGridStringTableTowxGridTableBase},
      { "_wxGridTableBase","_wxGridStringTable",SwigwxGridStringTableTowxGridTableBase},
-    { "_wxGridTableBase","_class_wxPyGridTableBase",SwigwxPyGridTableBaseTowxGridTableBase},
      { "_wxGridTableBase","_wxPyGridTableBase",SwigwxPyGridTableBaseTowxGridTableBase},
      { "_EBool","_WXGRIDSELECTIONMODES",0},
      { "_EBool","_wxCoord",0},
      { "_wxGridTableBase","_wxPyGridTableBase",SwigwxPyGridTableBaseTowxGridTableBase},
      { "_EBool","_WXGRIDSELECTIONMODES",0},
      { "_EBool","_wxCoord",0},
@@ -14505,12 +14376,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
      { "_EBool","_signed_int",0},
      { "_EBool","_int",0},
      { "_EBool","_wxWindowID",0},
      { "_EBool","_signed_int",0},
      { "_EBool","_int",0},
      { "_EBool","_wxWindowID",0},
-    { "_class_wxGridCellTextEditor","_class_wxGridCellAutoWrapStringEditor",SwigwxGridCellAutoWrapStringEditorTowxGridCellTextEditor},
-    { "_class_wxGridCellTextEditor","_wxGridCellAutoWrapStringEditor",SwigwxGridCellAutoWrapStringEditorTowxGridCellTextEditor},
-    { "_class_wxGridCellTextEditor","_class_wxGridCellFloatEditor",SwigwxGridCellFloatEditorTowxGridCellTextEditor},
-    { "_class_wxGridCellTextEditor","_wxGridCellFloatEditor",SwigwxGridCellFloatEditorTowxGridCellTextEditor},
-    { "_class_wxGridCellTextEditor","_class_wxGridCellNumberEditor",SwigwxGridCellNumberEditorTowxGridCellTextEditor},
-    { "_class_wxGridCellTextEditor","_wxGridCellNumberEditor",SwigwxGridCellNumberEditorTowxGridCellTextEditor},
      { "_unsigned_long","_long",0},
      { "_WXGRIDSELECTIONMODES","_int",0},
      { "_WXGRIDSELECTIONMODES","_signed_int",0},
      { "_unsigned_long","_long",0},
      { "_WXGRIDSELECTIONMODES","_int",0},
      { "_WXGRIDSELECTIONMODES","_signed_int",0},
@@ -14523,72 +14388,36 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
      { "_WXGRIDSELECTIONMODES","_wxPrintQuality",0},
      { "_WXGRIDSELECTIONMODES","_wxCoord",0},
      { "_wxNativeFontInfo","_struct_wxNativeFontInfo",0},
      { "_WXGRIDSELECTIONMODES","_wxPrintQuality",0},
      { "_WXGRIDSELECTIONMODES","_wxCoord",0},
      { "_wxNativeFontInfo","_struct_wxNativeFontInfo",0},
-    { "_class_wxGridCellStringRenderer","_class_wxGridCellAutoWrapStringRenderer",SwigwxGridCellAutoWrapStringRendererTowxGridCellStringRenderer},
-    { "_class_wxGridCellStringRenderer","_wxGridCellAutoWrapStringRenderer",SwigwxGridCellAutoWrapStringRendererTowxGridCellStringRenderer},
-    { "_class_wxGridCellStringRenderer","_class_wxGridCellEnumRenderer",SwigwxGridCellEnumRendererTowxGridCellStringRenderer},
-    { "_class_wxGridCellStringRenderer","_wxGridCellEnumRenderer",SwigwxGridCellEnumRendererTowxGridCellStringRenderer},
-    { "_class_wxGridCellStringRenderer","_class_wxGridCellDateTimeRenderer",SwigwxGridCellDateTimeRendererTowxGridCellStringRenderer},
-    { "_class_wxGridCellStringRenderer","_wxGridCellDateTimeRenderer",SwigwxGridCellDateTimeRendererTowxGridCellStringRenderer},
-    { "_class_wxGridCellStringRenderer","_class_wxGridCellFloatRenderer",SwigwxGridCellFloatRendererTowxGridCellStringRenderer},
-    { "_class_wxGridCellStringRenderer","_wxGridCellFloatRenderer",SwigwxGridCellFloatRendererTowxGridCellStringRenderer},
-    { "_class_wxGridCellStringRenderer","_class_wxGridCellNumberRenderer",SwigwxGridCellNumberRendererTowxGridCellStringRenderer},
-    { "_class_wxGridCellStringRenderer","_wxGridCellNumberRenderer",SwigwxGridCellNumberRendererTowxGridCellStringRenderer},
-    { "_class_wxPanel","_class_wxGrid",SwigwxGridTowxPanel},
-    { "_class_wxPanel","_wxGrid",SwigwxGridTowxPanel},
      { "_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},
-    { "_wxGridCellEditor","_class_wxGridCellAutoWrapStringEditor",SwigwxGridCellAutoWrapStringEditorTowxGridCellEditor},
      { "_wxGridCellEditor","_wxGridCellAutoWrapStringEditor",SwigwxGridCellAutoWrapStringEditorTowxGridCellEditor},
      { "_wxGridCellEditor","_wxGridCellAutoWrapStringEditor",SwigwxGridCellAutoWrapStringEditorTowxGridCellEditor},
-    { "_wxGridCellEditor","_class_wxGridCellEnumEditor",SwigwxGridCellEnumEditorTowxGridCellEditor},
      { "_wxGridCellEditor","_wxGridCellEnumEditor",SwigwxGridCellEnumEditorTowxGridCellEditor},
      { "_wxGridCellEditor","_wxGridCellEnumEditor",SwigwxGridCellEnumEditorTowxGridCellEditor},
-    { "_wxGridCellEditor","_class_wxGridCellChoiceEditor",SwigwxGridCellChoiceEditorTowxGridCellEditor},
      { "_wxGridCellEditor","_wxGridCellChoiceEditor",SwigwxGridCellChoiceEditorTowxGridCellEditor},
      { "_wxGridCellEditor","_wxGridCellChoiceEditor",SwigwxGridCellChoiceEditorTowxGridCellEditor},
-    { "_wxGridCellEditor","_class_wxGridCellBoolEditor",SwigwxGridCellBoolEditorTowxGridCellEditor},
      { "_wxGridCellEditor","_wxGridCellBoolEditor",SwigwxGridCellBoolEditorTowxGridCellEditor},
      { "_wxGridCellEditor","_wxGridCellBoolEditor",SwigwxGridCellBoolEditorTowxGridCellEditor},
-    { "_wxGridCellEditor","_class_wxGridCellFloatEditor",SwigwxGridCellFloatEditorTowxGridCellEditor},
      { "_wxGridCellEditor","_wxGridCellFloatEditor",SwigwxGridCellFloatEditorTowxGridCellEditor},
      { "_wxGridCellEditor","_wxGridCellFloatEditor",SwigwxGridCellFloatEditorTowxGridCellEditor},
-    { "_wxGridCellEditor","_class_wxGridCellNumberEditor",SwigwxGridCellNumberEditorTowxGridCellEditor},
      { "_wxGridCellEditor","_wxGridCellNumberEditor",SwigwxGridCellNumberEditorTowxGridCellEditor},
      { "_wxGridCellEditor","_wxGridCellNumberEditor",SwigwxGridCellNumberEditorTowxGridCellEditor},
-    { "_wxGridCellEditor","_class_wxGridCellTextEditor",SwigwxGridCellTextEditorTowxGridCellEditor},
      { "_wxGridCellEditor","_wxGridCellTextEditor",SwigwxGridCellTextEditorTowxGridCellEditor},
      { "_wxGridCellEditor","_wxGridCellTextEditor",SwigwxGridCellTextEditorTowxGridCellEditor},
-    { "_wxGridCellEditor","_class_wxPyGridCellEditor",SwigwxPyGridCellEditorTowxGridCellEditor},
      { "_wxGridCellEditor","_wxPyGridCellEditor",SwigwxPyGridCellEditorTowxGridCellEditor},
      { "_WXTYPE","_short",0},
      { "_WXTYPE","_signed_short",0},
      { "_WXTYPE","_unsigned_short",0},
      { "_wxGridCellEditor","_wxPyGridCellEditor",SwigwxPyGridCellEditorTowxGridCellEditor},
      { "_WXTYPE","_short",0},
      { "_WXTYPE","_signed_short",0},
      { "_WXTYPE","_unsigned_short",0},
-    { "_wxGridCellAttrProvider","_class_wxPyGridCellAttrProvider",SwigwxPyGridCellAttrProviderTowxGridCellAttrProvider},
      { "_wxGridCellAttrProvider","_wxPyGridCellAttrProvider",SwigwxPyGridCellAttrProviderTowxGridCellAttrProvider},
      { "_wxGridCellAttrProvider","_wxPyGridCellAttrProvider",SwigwxPyGridCellAttrProviderTowxGridCellAttrProvider},
-    { "_class_wxGridTableBase","_class_wxGridStringTable",SwigwxGridStringTableTowxGridTableBase},
-    { "_class_wxGridTableBase","_wxGridStringTable",SwigwxGridStringTableTowxGridTableBase},
-    { "_class_wxGridTableBase","_class_wxPyGridTableBase",SwigwxPyGridTableBaseTowxGridTableBase},
-    { "_class_wxGridTableBase","_wxPyGridTableBase",SwigwxPyGridTableBaseTowxGridTableBase},
      { "_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},
-    { "_wxObject","_class_wxGridEditorCreatedEvent",SwigwxGridEditorCreatedEventTowxObject},
      { "_wxObject","_wxGridEditorCreatedEvent",SwigwxGridEditorCreatedEventTowxObject},
      { "_wxObject","_wxGridEditorCreatedEvent",SwigwxGridEditorCreatedEventTowxObject},
-    { "_wxObject","_class_wxGridRangeSelectEvent",SwigwxGridRangeSelectEventTowxObject},
      { "_wxObject","_wxGridRangeSelectEvent",SwigwxGridRangeSelectEventTowxObject},
      { "_wxObject","_wxGridRangeSelectEvent",SwigwxGridRangeSelectEventTowxObject},
-    { "_wxObject","_class_wxGridSizeEvent",SwigwxGridSizeEventTowxObject},
      { "_wxObject","_wxGridSizeEvent",SwigwxGridSizeEventTowxObject},
      { "_wxObject","_wxGridSizeEvent",SwigwxGridSizeEventTowxObject},
-    { "_wxObject","_class_wxGridEvent",SwigwxGridEventTowxObject},
      { "_wxObject","_wxGridEvent",SwigwxGridEventTowxObject},
      { "_wxObject","_wxGridEvent",SwigwxGridEventTowxObject},
-    { "_wxObject","_class_wxGrid",SwigwxGridTowxObject},
      { "_wxObject","_wxGrid",SwigwxGridTowxObject},
      { "_wxObject","_wxGrid",SwigwxGridTowxObject},
-    { "_wxObject","_class_wxGridStringTable",SwigwxGridStringTableTowxObject},
      { "_wxObject","_wxGridStringTable",SwigwxGridStringTableTowxObject},
      { "_wxObject","_wxGridStringTable",SwigwxGridStringTableTowxObject},
-    { "_wxObject","_class_wxPyGridTableBase",SwigwxPyGridTableBaseTowxObject},
      { "_wxObject","_wxPyGridTableBase",SwigwxPyGridTableBaseTowxObject},
      { "_wxObject","_wxPyGridTableBase",SwigwxPyGridTableBaseTowxObject},
-    { "_wxObject","_class_wxGridTableBase",SwigwxGridTableBaseTowxObject},
      { "_wxObject","_wxGridTableBase",SwigwxGridTableBaseTowxObject},
      { "_signed_short","_WXTYPE",0},
      { "_signed_short","_short",0},
      { "_wxObject","_wxGridTableBase",SwigwxGridTableBaseTowxObject},
      { "_signed_short","_WXTYPE",0},
      { "_signed_short","_short",0},
-    { "_wxScrolledWindow","_class_wxGrid",SwigwxGridTowxScrolledWindow},
      { "_wxScrolledWindow","_wxGrid",SwigwxGridTowxScrolledWindow},
      { "_unsigned_char","_byte",0},
      { "_unsigned_int","_WXGRIDSELECTIONMODES",0},
      { "_wxScrolledWindow","_wxGrid",SwigwxGridTowxScrolledWindow},
      { "_unsigned_char","_byte",0},
      { "_unsigned_int","_WXGRIDSELECTIONMODES",0},
@@ -14630,24 +14459,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_wxGridCellEditor","_class_wxGridCellAutoWrapStringEditor",SwigwxGridCellAutoWrapStringEditorTowxGridCellEditor},
-    { "_class_wxGridCellEditor","_wxGridCellAutoWrapStringEditor",SwigwxGridCellAutoWrapStringEditorTowxGridCellEditor},
-    { "_class_wxGridCellEditor","_class_wxGridCellEnumEditor",SwigwxGridCellEnumEditorTowxGridCellEditor},
-    { "_class_wxGridCellEditor","_wxGridCellEnumEditor",SwigwxGridCellEnumEditorTowxGridCellEditor},
-    { "_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_wxGridCellAttrProvider","_class_wxPyGridCellAttrProvider",SwigwxPyGridCellAttrProviderTowxGridCellAttrProvider},
-    { "_class_wxGridCellAttrProvider","_wxPyGridCellAttrProvider",SwigwxPyGridCellAttrProviderTowxGridCellAttrProvider},
      { "_wxCoord","_WXGRIDSELECTIONMODES",0},
      { "_wxCoord","_int",0},
      { "_wxCoord","_signed_int",0},
      { "_wxCoord","_WXGRIDSELECTIONMODES",0},
      { "_wxCoord","_int",0},
      { "_wxCoord","_signed_int",0},
@@ -14658,41 +14469,18 @@ 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},
-    { "_wxGridCellRenderer","_class_wxGridCellAutoWrapStringRenderer",SwigwxGridCellAutoWrapStringRendererTowxGridCellRenderer},
      { "_wxGridCellRenderer","_wxGridCellAutoWrapStringRenderer",SwigwxGridCellAutoWrapStringRendererTowxGridCellRenderer},
      { "_wxGridCellRenderer","_wxGridCellAutoWrapStringRenderer",SwigwxGridCellAutoWrapStringRendererTowxGridCellRenderer},
-    { "_wxGridCellRenderer","_class_wxGridCellEnumRenderer",SwigwxGridCellEnumRendererTowxGridCellRenderer},
      { "_wxGridCellRenderer","_wxGridCellEnumRenderer",SwigwxGridCellEnumRendererTowxGridCellRenderer},
      { "_wxGridCellRenderer","_wxGridCellEnumRenderer",SwigwxGridCellEnumRendererTowxGridCellRenderer},
-    { "_wxGridCellRenderer","_class_wxGridCellDateTimeRenderer",SwigwxGridCellDateTimeRendererTowxGridCellRenderer},
      { "_wxGridCellRenderer","_wxGridCellDateTimeRenderer",SwigwxGridCellDateTimeRendererTowxGridCellRenderer},
      { "_wxGridCellRenderer","_wxGridCellDateTimeRenderer",SwigwxGridCellDateTimeRendererTowxGridCellRenderer},
-    { "_wxGridCellRenderer","_class_wxGridCellBoolRenderer",SwigwxGridCellBoolRendererTowxGridCellRenderer},
      { "_wxGridCellRenderer","_wxGridCellBoolRenderer",SwigwxGridCellBoolRendererTowxGridCellRenderer},
      { "_wxGridCellRenderer","_wxGridCellBoolRenderer",SwigwxGridCellBoolRendererTowxGridCellRenderer},
-    { "_wxGridCellRenderer","_class_wxGridCellFloatRenderer",SwigwxGridCellFloatRendererTowxGridCellRenderer},
      { "_wxGridCellRenderer","_wxGridCellFloatRenderer",SwigwxGridCellFloatRendererTowxGridCellRenderer},
      { "_wxGridCellRenderer","_wxGridCellFloatRenderer",SwigwxGridCellFloatRendererTowxGridCellRenderer},
-    { "_wxGridCellRenderer","_class_wxGridCellNumberRenderer",SwigwxGridCellNumberRendererTowxGridCellRenderer},
      { "_wxGridCellRenderer","_wxGridCellNumberRenderer",SwigwxGridCellNumberRendererTowxGridCellRenderer},
      { "_wxGridCellRenderer","_wxGridCellNumberRenderer",SwigwxGridCellNumberRendererTowxGridCellRenderer},
-    { "_wxGridCellRenderer","_class_wxGridCellStringRenderer",SwigwxGridCellStringRendererTowxGridCellRenderer},
      { "_wxGridCellRenderer","_wxGridCellStringRenderer",SwigwxGridCellStringRendererTowxGridCellRenderer},
      { "_wxGridCellRenderer","_wxGridCellStringRenderer",SwigwxGridCellStringRendererTowxGridCellRenderer},
-    { "_wxGridCellRenderer","_class_wxPyGridCellRenderer",SwigwxPyGridCellRendererTowxGridCellRenderer},
      { "_wxGridCellRenderer","_wxPyGridCellRenderer",SwigwxPyGridCellRendererTowxGridCellRenderer},
      { "_wxGridCellRenderer","_wxPyGridCellRenderer",SwigwxPyGridCellRendererTowxGridCellRenderer},
-    { "_wxGridCellTextEditor","_class_wxGridCellAutoWrapStringEditor",SwigwxGridCellAutoWrapStringEditorTowxGridCellTextEditor},
      { "_wxGridCellTextEditor","_wxGridCellAutoWrapStringEditor",SwigwxGridCellAutoWrapStringEditorTowxGridCellTextEditor},
      { "_wxGridCellTextEditor","_wxGridCellAutoWrapStringEditor",SwigwxGridCellAutoWrapStringEditorTowxGridCellTextEditor},
-    { "_wxGridCellTextEditor","_class_wxGridCellFloatEditor",SwigwxGridCellFloatEditorTowxGridCellTextEditor},
      { "_wxGridCellTextEditor","_wxGridCellFloatEditor",SwigwxGridCellFloatEditorTowxGridCellTextEditor},
      { "_wxGridCellTextEditor","_wxGridCellFloatEditor",SwigwxGridCellFloatEditorTowxGridCellTextEditor},
-    { "_wxGridCellTextEditor","_class_wxGridCellNumberEditor",SwigwxGridCellNumberEditorTowxGridCellTextEditor},
      { "_wxGridCellTextEditor","_wxGridCellNumberEditor",SwigwxGridCellNumberEditorTowxGridCellTextEditor},
      { "_wxGridCellTextEditor","_wxGridCellNumberEditor",SwigwxGridCellNumberEditorTowxGridCellTextEditor},
-    { "_class_wxCommandEvent","_class_wxGridEditorCreatedEvent",SwigwxGridEditorCreatedEventTowxCommandEvent},
-    { "_class_wxCommandEvent","_wxGridEditorCreatedEvent",SwigwxGridEditorCreatedEventTowxCommandEvent},
-    { "_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},
-    { "_wxEvtHandler","_class_wxGrid",SwigwxGridTowxEvtHandler},
      { "_wxEvtHandler","_wxGrid",SwigwxGridTowxEvtHandler},
      { "_wxEvtHandler","_wxGrid",SwigwxGridTowxEvtHandler},
-    { "_class_wxScrolledWindow","_class_wxGrid",SwigwxGridTowxScrolledWindow},
-    { "_class_wxScrolledWindow","_wxGrid",SwigwxGridTowxScrolledWindow},
-    { "_wxWindow","_class_wxGrid",SwigwxGridTowxWindow},
      { "_wxWindow","_wxGrid",SwigwxGridTowxWindow},
  {0,0,0}};
  
      { "_wxWindow","_wxGrid",SwigwxGridTowxWindow},
  {0,0,0}};