Removed some old, outdated, unfinished, or unstarted docs and the

[wxWidgets.git] / wxPython / include / wx / wxPython / wxPython_int.h
diff --git a/wxPython/include/wx/wxPython/wxPython_int.h b/wxPython/include/wx/wxPython/wxPython_int.h

index fd0cb3478d3fdeca0c8c1fb245909ef19ca29273..c3d62ee9b4e2b75e10f3e910136a97c8973edf27 100644 (file)
--- a/wxPython/include/wx/wxPython/wxPython_int.h
+++ b/wxPython/include/wx/wxPython/wxPython_int.h
@@ -24,7 +24,6 @@
  #include <wx/colordlg.h>
  #include <wx/config.h>
  #include <wx/cshelp.h>
  #include <wx/colordlg.h>
  #include <wx/config.h>
  #include <wx/cshelp.h>
-#include <wx/dcbuffer.h>
  #include <wx/dcmirror.h>
  #include <wx/dcps.h>
  #include <wx/dirctrl.h>
  #include <wx/dcmirror.h>
  #include <wx/dcps.h>
  #include <wx/dirctrl.h>
@@ -140,13 +139,25 @@ PyThreadState* wxPyBeginAllowThreads();
  void           wxPyEndAllowThreads(PyThreadState* state);
  
  // For C++ --> Python
  void           wxPyEndAllowThreads(PyThreadState* state);
  
  // For C++ --> Python
-void wxPyBeginBlockThreads();
-void wxPyEndBlockThreads();
+bool wxPyBeginBlockThreads();
+void wxPyEndBlockThreads(bool blocked);
  
  #endif // wxPyUSE_EXPORTED_API
  
  
  #endif // wxPyUSE_EXPORTED_API
  
-#define wxPyBLOCK_THREADS(stmt) { wxPyBeginBlockThreads(); stmt; wxPyEndBlockThreads(); }
-#define wxPyRaiseNotImplemented() wxPyBLOCK_THREADS(PyErr_SetNone(PyExc_NotImplementedError))
+
+// A macro that will help to execute simple statments wrapped in
+// StartBlock/EndBlockThreads calls
+#define wxPyBLOCK_THREADS(stmt) \
+    { bool blocked = wxPyBeginBlockThreads(); stmt; wxPyEndBlockThreads(blocked); }
+
+// Raise the NotImplementedError exception  (blocking threads)
+#define wxPyRaiseNotImplemented() \
+    wxPyBLOCK_THREADS(PyErr_SetNone(PyExc_NotImplementedError))
+
+// Raise any exception witha string value  (blocking threads)
+#define wxPyErr_SetString(err, str) \
+    wxPyBLOCK_THREADS(PyErr_SetString(err, str))
+
  
  //---------------------------------------------------------------------------
  // These are helpers used by the typemaps
  
  //---------------------------------------------------------------------------
  // These are helpers used by the typemaps
@@ -317,6 +328,7 @@ class wxPyCallbackHelper;
  struct swig_type_info;
  struct swig_const_info;
  
  struct swig_type_info;
  struct swig_const_info;
  
+typedef double (*py_objasdbl_conv)(PyObject *obj);
  
  // Make SunCC happy and make typedef's for these that are extern "C"
  typedef swig_type_info* (*p_SWIG_Python_TypeRegister_t)(swig_type_info *);
  
  // Make SunCC happy and make typedef's for these that are extern "C"
  typedef swig_type_info* (*p_SWIG_Python_TypeRegister_t)(swig_type_info *);
@@ -335,7 +347,7 @@ typedef char*           (*p_SWIG_Python_UnpackData_t)(char *c, void *, int);
  typedef PyObject*       (*p_SWIG_Python_NewPointerObj_t)(void *, swig_type_info *,int own);
  typedef PyObject*       (*p_SWIG_Python_NewPackedObj_t)(void *, int sz, swig_type_info *);
  typedef void            (*p_SWIG_Python_InstallConstants_t)(PyObject *d, swig_const_info constants[]);
  typedef PyObject*       (*p_SWIG_Python_NewPointerObj_t)(void *, swig_type_info *,int own);
  typedef PyObject*       (*p_SWIG_Python_NewPackedObj_t)(void *, int sz, swig_type_info *);
  typedef void            (*p_SWIG_Python_InstallConstants_t)(PyObject *d, swig_const_info constants[]);
-typedef void*          (*p_SWIG_Python_MustGetPtr_t)(PyObject *, swig_type_info *, int, int);
+typedef void*           (*p_SWIG_Python_MustGetPtr_t)(PyObject *, swig_type_info *, int, int);
  
  
  struct wxPyCoreAPI {
  
  
  struct wxPyCoreAPI {
@@ -358,7 +370,6 @@ struct wxPyCoreAPI {
      p_SWIG_Python_InstallConstants_t   p_SWIG_Python_InstallConstants;
      p_SWIG_Python_MustGetPtr_t         p_SWIG_Python_MustGetPtr;
      
      p_SWIG_Python_InstallConstants_t   p_SWIG_Python_InstallConstants;
      p_SWIG_Python_MustGetPtr_t         p_SWIG_Python_MustGetPtr;
      
-
      bool                (*p_wxPyCheckSwigType)(const wxChar* className);
      PyObject*           (*p_wxPyConstructObject)(void* ptr, const wxChar* className, int setThisOwn);
      bool                (*p_wxPyConvertSwigPtr)(PyObject* obj, void **ptr, const wxChar* className);
      bool                (*p_wxPyCheckSwigType)(const wxChar* className);
      PyObject*           (*p_wxPyConstructObject)(void* ptr, const wxChar* className, int setThisOwn);
      bool                (*p_wxPyConvertSwigPtr)(PyObject* obj, void **ptr, const wxChar* className);
@@ -366,8 +377,8 @@ struct wxPyCoreAPI {
          
      PyThreadState*      (*p_wxPyBeginAllowThreads)();
      void                (*p_wxPyEndAllowThreads)(PyThreadState* state);
          
      PyThreadState*      (*p_wxPyBeginAllowThreads)();
      void                (*p_wxPyEndAllowThreads)(PyThreadState* state);
-    void                (*p_wxPyBeginBlockThreads)();
-    void                (*p_wxPyEndBlockThreads)();
+    bool                (*p_wxPyBeginBlockThreads)();
+    void                (*p_wxPyEndBlockThreads)(bool blocked);
  
      PyObject*           (*p_wxPy_ConvertList)(wxListBase* list);
  
  
      PyObject*           (*p_wxPy_ConvertList)(wxListBase* list);
  
@@ -580,6 +591,11 @@ public:
  #endif
      // virtual int FilterEvent(wxEvent& event); // This one too????
  
  #endif
      // virtual int FilterEvent(wxEvent& event); // This one too????
  
+    // For catching Apple Events
+    virtual void MacOpenFile(const wxString &fileName);
+    virtual void MacPrintFile(const wxString &fileName);
+    virtual void MacNewFile();
+    virtual void MacReopenApp();
  
      static bool GetMacSupportPCMenuShortcuts();
      static long GetMacAboutMenuItemId();
  
      static bool GetMacSupportPCMenuShortcuts();
      static long GetMacAboutMenuItemId();
@@ -621,10 +637,10 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK__(CLASS, PCLASS, CBNAME)                         \
      void CLASS::CBNAME() {                                              \
          bool found;                                                     \
  #define IMP_PYCALLBACK__(CLASS, PCLASS, CBNAME)                         \
      void CLASS::CBNAME() {                                              \
          bool found;                                                     \
-        wxPyBeginBlockThreads();                                        \
+        bool blocked = 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();                                          \
+        wxPyEndBlockThreads(blocked);                                          \
          if (! found)                                                    \
              PCLASS::CBNAME();                                           \
      }                                                                   \
          if (! found)                                                    \
              PCLASS::CBNAME();                                           \
      }                                                                   \
@@ -642,10 +658,10 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK_BOOL_INTINT(CLASS, PCLASS, CBNAME)               \
      bool CLASS::CBNAME(int a, int b) {                                  \
          bool rval=False, found;                                         \
  #define IMP_PYCALLBACK_BOOL_INTINT(CLASS, PCLASS, CBNAME)               \
      bool CLASS::CBNAME(int a, int b) {                                  \
          bool rval=False, found;                                         \
-        wxPyBeginBlockThreads();                    \
+        bool blocked = 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();                                     \
+        wxPyEndBlockThreads(blocked);                                     \
          if (! found)                                                    \
              rval = PCLASS::CBNAME(a,b);                                 \
          return rval;                                                    \
          if (! found)                                                    \
              rval = PCLASS::CBNAME(a,b);                                 \
          return rval;                                                    \
@@ -664,10 +680,10 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK_VOID_(CLASS, PCLASS, CBNAME)                     \
      void CLASS::CBNAME() {                                              \
          bool found;                                                     \
  #define IMP_PYCALLBACK_VOID_(CLASS, PCLASS, CBNAME)                     \
      void CLASS::CBNAME() {                                              \
          bool found;                                                     \
-        wxPyBeginBlockThreads();                                        \
+        bool blocked = 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();                                          \
+        wxPyEndBlockThreads(blocked);                                          \
          if (! found)                                                    \
              PCLASS::CBNAME();                                           \
      }                                                                   \
          if (! found)                                                    \
              PCLASS::CBNAME();                                           \
      }                                                                   \
@@ -685,10 +701,10 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK_VOID_INTINT(CLASS, PCLASS, CBNAME)               \
      void CLASS::CBNAME(int a, int b) {                                  \
          bool found;                                                     \
  #define IMP_PYCALLBACK_VOID_INTINT(CLASS, PCLASS, CBNAME)               \
      void CLASS::CBNAME(int a, int b) {                                  \
          bool found;                                                     \
-        wxPyBeginBlockThreads();                                        \
+        bool blocked = 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();                                          \
+        wxPyEndBlockThreads(blocked);                                          \
          if (! found)                                                    \
              PCLASS::CBNAME(a,b);                                        \
      }                                                                   \
          if (! found)                                                    \
              PCLASS::CBNAME(a,b);                                        \
      }                                                                   \
@@ -706,10 +722,10 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK_VOID_INT(CLASS, PCLASS, CBNAME)                  \
      void CLASS::CBNAME(int a) {                                         \
          bool found;                                                     \
  #define IMP_PYCALLBACK_VOID_INT(CLASS, PCLASS, CBNAME)                  \
      void CLASS::CBNAME(int a) {                                         \
          bool found;                                                     \
-        wxPyBeginBlockThreads();                                        \
+        bool blocked = wxPyBeginBlockThreads();                                        \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))          \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)",a));     \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))          \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)",a));     \
-        wxPyEndBlockThreads();                                          \
+        wxPyEndBlockThreads(blocked);                                          \
          if (! found)                                                    \
              PCLASS::CBNAME(a);                                          \
      }                                                                   \
          if (! found)                                                    \
              PCLASS::CBNAME(a);                                          \
      }                                                                   \
@@ -727,10 +743,10 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK_VOID_INT4(CLASS, PCLASS, CBNAME)                 \
      void CLASS::CBNAME(int a, int b, int c, int d) {                    \
          bool found;                                                     \
  #define IMP_PYCALLBACK_VOID_INT4(CLASS, PCLASS, CBNAME)                 \
      void CLASS::CBNAME(int a, int b, int c, int d) {                    \
          bool found;                                                     \
-        wxPyBeginBlockThreads();                                        \
+        bool blocked = wxPyBeginBlockThreads();                                        \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))          \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiii)",a,b,c,d));  \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))          \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiii)",a,b,c,d));  \
-        wxPyEndBlockThreads();                                          \
+        wxPyEndBlockThreads(blocked);                                          \
          if (! found)                                                    \
              PCLASS::CBNAME(a,b,c,d);                                    \
      }                                                                   \
          if (! found)                                                    \
              PCLASS::CBNAME(a,b,c,d);                                    \
      }                                                                   \
@@ -747,10 +763,10 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK_VOID_INT5(CLASS, PCLASS, CBNAME)                 \
      void CLASS::CBNAME(int a, int b, int c, int d, int e) {             \
          bool found;                                                     \
  #define IMP_PYCALLBACK_VOID_INT5(CLASS, PCLASS, CBNAME)                 \
      void CLASS::CBNAME(int a, int b, int c, int d, int e) {             \
          bool found;                                                     \
-        wxPyBeginBlockThreads();                                        \
+        bool blocked = wxPyBeginBlockThreads();                                        \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))          \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiiii)",a,b,c,d,e));  \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))          \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiiii)",a,b,c,d,e));  \
-        wxPyEndBlockThreads();                                          \
+        wxPyEndBlockThreads(blocked);                                          \
          if (! found)                                                    \
              PCLASS::CBNAME(a,b,c,d,e);                                  \
      }                                                                   \
          if (! found)                                                    \
              PCLASS::CBNAME(a,b,c,d,e);                                  \
      }                                                                   \
@@ -769,7 +785,7 @@ extern wxPyApp *wxPythonApp;
      void CLASS::CBNAME(int* a, int* b) const {                                  \
          const char* errmsg = #CBNAME " should return a 2-tuple of integers.";   \
          bool found;                                                             \
      void CLASS::CBNAME(int* a, int* b) const {                                  \
          const char* errmsg = #CBNAME " should return a 2-tuple of integers.";   \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));        \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));        \
@@ -791,7 +807,7 @@ extern wxPyApp *wxPythonApp;
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              PCLASS::CBNAME(a,b);                                                \
      }                                                                           \
          if (! found)                                                            \
              PCLASS::CBNAME(a,b);                                                \
      }                                                                           \
@@ -811,7 +827,7 @@ extern wxPyApp *wxPythonApp;
      wxSize CLASS::CBNAME() const {                                              \
          const char* errmsg = #CBNAME " should return a 2-tuple of integers.";   \
          bool found; wxSize rval(0,0);                                           \
      wxSize CLASS::CBNAME() const {                                              \
          const char* errmsg = #CBNAME " should return a 2-tuple of integers.";   \
          bool found; wxSize rval(0,0);                                           \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));        \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));        \
@@ -833,7 +849,7 @@ extern wxPyApp *wxPythonApp;
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              return PCLASS::CBNAME();                                            \
          else                                                                    \
          if (! found)                                                            \
              return PCLASS::CBNAME();                                            \
          else                                                                    \
@@ -854,10 +870,10 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK_BOOL_BOOL(CLASS, PCLASS, CBNAME)                 \
      bool CLASS::CBNAME(bool a) {                                        \
          bool rval=False, found;                                         \
  #define IMP_PYCALLBACK_BOOL_BOOL(CLASS, PCLASS, CBNAME)                 \
      bool CLASS::CBNAME(bool a) {                                        \
          bool rval=False, found;                                         \
-        wxPyBeginBlockThreads();                                        \
+        bool blocked = 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();                                          \
+        wxPyEndBlockThreads(blocked);                                          \
          if (! found)                                                    \
              rval = PCLASS::CBNAME(a);                                   \
          return rval;                                                    \
          if (! found)                                                    \
              rval = PCLASS::CBNAME(a);                                   \
          return rval;                                                    \
@@ -876,10 +892,10 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK_BOOL_INT(CLASS, PCLASS, CBNAME)                  \
      bool CLASS::CBNAME(int a) {                                         \
          bool rval=False, found;                                         \
  #define IMP_PYCALLBACK_BOOL_INT(CLASS, PCLASS, CBNAME)                  \
      bool CLASS::CBNAME(int a) {                                         \
          bool rval=False, found;                                         \
-        wxPyBeginBlockThreads();                                        \
+        bool blocked = 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();                                          \
+        wxPyEndBlockThreads(blocked);                                          \
          if (! found)                                                    \
              rval = PCLASS::CBNAME(a);                                   \
          return rval;                                                    \
          if (! found)                                                    \
              rval = PCLASS::CBNAME(a);                                   \
          return rval;                                                    \
@@ -897,11 +913,11 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK_BOOL_INT_pure(CLASS, PCLASS, CBNAME)             \
      bool CLASS::CBNAME(int a) {                                         \
          bool rval=False;                                                \
  #define IMP_PYCALLBACK_BOOL_INT_pure(CLASS, PCLASS, CBNAME)             \
      bool CLASS::CBNAME(int a) {                                         \
          bool rval=False;                                                \
-        wxPyBeginBlockThreads();                    \
+        bool blocked = wxPyBeginBlockThreads();                    \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME))                    \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)",a));       \
          else rval = False;                                              \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME))                    \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)",a));       \
          else rval = False;                                              \
-        wxPyEndBlockThreads();                                     \
+        wxPyEndBlockThreads(blocked);                                     \
          return rval;                                                    \
      }
  
          return rval;                                                    \
      }
  
@@ -916,13 +932,13 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK__DC(CLASS, PCLASS, CBNAME)                       \
      void CLASS::CBNAME(wxDC& a) {                                       \
          bool found;                                                     \
  #define IMP_PYCALLBACK__DC(CLASS, PCLASS, CBNAME)                       \
      void CLASS::CBNAME(wxDC& a) {                                       \
          bool found;                                                     \
-        wxPyBeginBlockThreads();                                        \
+        bool blocked = wxPyBeginBlockThreads();                                        \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {        \
              PyObject* obj = wxPyMake_wxObject(&a);                      \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj));  \
              Py_DECREF(obj);                                             \
          }                                                               \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {        \
              PyObject* obj = wxPyMake_wxObject(&a);                      \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj));  \
              Py_DECREF(obj);                                             \
          }                                                               \
-        wxPyEndBlockThreads();                                          \
+        wxPyEndBlockThreads(blocked);                                          \
          if (! found)                                                    \
              PCLASS::CBNAME(a);                                          \
      }                                                                   \
          if (! found)                                                    \
              PCLASS::CBNAME(a);                                          \
      }                                                                   \
@@ -942,13 +958,13 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME)                   \
      void CLASS::CBNAME(wxDC& a, bool b) {                               \
          bool found;                                                     \
  #define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME)                   \
      void CLASS::CBNAME(wxDC& a, bool b) {                               \
          bool found;                                                     \
-        wxPyBeginBlockThreads();                    \
+        bool blocked = wxPyBeginBlockThreads();                    \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {        \
              PyObject* obj = wxPyMake_wxObject(&a);                      \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, (int)b));  \
              Py_DECREF(obj);                                             \
          }                                                               \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {        \
              PyObject* obj = wxPyMake_wxObject(&a);                      \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, (int)b));  \
              Py_DECREF(obj);                                             \
          }                                                               \
-        wxPyEndBlockThreads();                                     \
+        wxPyEndBlockThreads(blocked);                                     \
          if (! found)                                                    \
              PCLASS::CBNAME(a, b);                                       \
      }                                                                   \
          if (! found)                                                    \
              PCLASS::CBNAME(a, b);                                       \
      }                                                                   \
@@ -966,13 +982,13 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME)                   \
      void CLASS::CBNAME(wxDC& a, bool b) {                               \
          bool found;                                                     \
  #define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME)                   \
      void CLASS::CBNAME(wxDC& a, bool b) {                               \
          bool found;                                                     \
-        wxPyBeginBlockThreads();                    \
+        bool blocked = wxPyBeginBlockThreads();                    \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {        \
              PyObject* obj = wxPyMake_wxObject(&a);                      \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, (int)b));  \
              Py_DECREF(obj);                                             \
          }                                                               \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {        \
              PyObject* obj = wxPyMake_wxObject(&a);                      \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, (int)b));  \
              Py_DECREF(obj);                                             \
          }                                                               \
-        wxPyEndBlockThreads();                                     \
+        wxPyEndBlockThreads(blocked);                                     \
          if (! found)                                                    \
              PCLASS::CBNAME(a, b);                                       \
      }                                                                   \
          if (! found)                                                    \
              PCLASS::CBNAME(a, b);                                       \
      }                                                                   \
@@ -990,10 +1006,10 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK__2DBL(CLASS, PCLASS, CBNAME)                     \
      void CLASS::CBNAME(double a, double b) {                            \
          bool found;                                                     \
  #define IMP_PYCALLBACK__2DBL(CLASS, PCLASS, CBNAME)                     \
      void CLASS::CBNAME(double a, double b) {                            \
          bool found;                                                     \
-        wxPyBeginBlockThreads();                    \
+        bool blocked = wxPyBeginBlockThreads();                    \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))          \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(dd)",a,b));  \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))          \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(dd)",a,b));  \
-        wxPyEndBlockThreads();                                     \
+        wxPyEndBlockThreads(blocked);                                     \
          if (! found)                                                    \
              PCLASS::CBNAME(a, b);                                       \
      }                                                                   \
          if (! found)                                                    \
              PCLASS::CBNAME(a, b);                                       \
      }                                                                   \
@@ -1011,11 +1027,11 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK__2DBL2INT(CLASS, PCLASS, CBNAME)                 \
      void CLASS::CBNAME(double a, double b, int c, int d) {              \
          bool found;                                                     \
  #define IMP_PYCALLBACK__2DBL2INT(CLASS, PCLASS, CBNAME)                 \
      void CLASS::CBNAME(double a, double b, int c, int d) {              \
          bool found;                                                     \
-        wxPyBeginBlockThreads();                    \
+        bool blocked = wxPyBeginBlockThreads();                    \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))          \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ddii)",      \
                                                         a,b,c,d));       \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))          \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ddii)",      \
                                                         a,b,c,d));       \
-        wxPyEndBlockThreads();                                     \
+        wxPyEndBlockThreads(blocked);                                     \
          if (! found)                                                    \
              PCLASS::CBNAME(a, b, c, d);                                 \
      }                                                                   \
          if (! found)                                                    \
              PCLASS::CBNAME(a, b, c, d);                                 \
      }                                                                   \
@@ -1033,13 +1049,13 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK__DC4DBLBOOL(CLASS, PCLASS, CBNAME)                               \
      void CLASS::CBNAME(wxDC& a, double b, double c, double d, double e, bool f) {       \
          bool found;                                                                     \
  #define IMP_PYCALLBACK__DC4DBLBOOL(CLASS, PCLASS, CBNAME)                               \
      void CLASS::CBNAME(wxDC& a, double b, double c, double d, double e, bool f) {       \
          bool found;                                                                     \
-        wxPyBeginBlockThreads();                                    \
+        bool blocked = wxPyBeginBlockThreads();                                    \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                        \
              PyObject* obj = wxPyMake_wxObject(&a);                                      \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oddddi)", obj, b, c, d, e, (int)f));  \
              Py_DECREF(obj);                                                             \
          }                                                                               \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                        \
              PyObject* obj = wxPyMake_wxObject(&a);                                      \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oddddi)", obj, b, c, d, e, (int)f));  \
              Py_DECREF(obj);                                                             \
          }                                                                               \
-        wxPyEndBlockThreads();                                                     \
+        wxPyEndBlockThreads(blocked);                                                     \
          if (! found)                                                                    \
              PCLASS::CBNAME(a, b, c, d, e, f);                                           \
      }                                                                                   \
          if (! found)                                                                    \
              PCLASS::CBNAME(a, b, c, d, e, f);                                           \
      }                                                                                   \
@@ -1057,14 +1073,14 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK_BOOL_DC4DBLBOOL(CLASS, PCLASS, CBNAME)                           \
      bool CLASS::CBNAME(wxDC& a, double b, double c, double d, double e, bool f) {       \
          bool found;                                                                     \
  #define IMP_PYCALLBACK_BOOL_DC4DBLBOOL(CLASS, PCLASS, CBNAME)                           \
      bool CLASS::CBNAME(wxDC& a, double b, double c, double d, double e, bool f) {       \
          bool found;                                                                     \
-        wxPyBeginBlockThreads();                                    \
+        bool blocked = wxPyBeginBlockThreads();                                    \
          bool rval=False;                                                                \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                        \
              PyObject* obj = wxPyMake_wxObject(&a);                                      \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oddddi)", obj, b, c, d, e, (int)f));\
              Py_DECREF(obj);                                                             \
          }                                                                               \
          bool rval=False;                                                                \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                        \
              PyObject* obj = wxPyMake_wxObject(&a);                                      \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oddddi)", obj, b, c, d, e, (int)f));\
              Py_DECREF(obj);                                                             \
          }                                                                               \
-        wxPyEndBlockThreads();                                                     \
+        wxPyEndBlockThreads(blocked);                                                     \
          if (! found)                                                                    \
              rval = PCLASS::CBNAME(a, b, c, d, e, f);                                    \
          return rval;                                                                    \
          if (! found)                                                                    \
              rval = PCLASS::CBNAME(a, b, c, d, e, f);                                    \
          return rval;                                                                    \
@@ -1083,11 +1099,11 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK__BOOL2DBL2INT(CLASS, PCLASS, CBNAME)                     \
      void CLASS::CBNAME(bool a, double b, double c, int d, int e) {              \
          bool found;                                                             \
  #define IMP_PYCALLBACK__BOOL2DBL2INT(CLASS, PCLASS, CBNAME)                     \
      void CLASS::CBNAME(bool a, double b, double c, int d, int e) {              \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                            \
+        bool blocked = wxPyBeginBlockThreads();                            \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iddii)",             \
                                                  (int)a,b,c,d,e));               \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iddii)",             \
                                                  (int)a,b,c,d,e));               \
-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads(blocked);                                             \
          if (! found)                                                            \
              PCLASS::CBNAME(a, b, c, d, e);                                      \
      }                                                                           \
          if (! found)                                                            \
              PCLASS::CBNAME(a, b, c, d, e);                                      \
      }                                                                           \
@@ -1105,13 +1121,13 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK__DC4DBL(CLASS, PCLASS, CBNAME)                           \
      void CLASS::CBNAME(wxDC& a, double b, double c, double d, double e) {       \
          bool found;                                                             \
  #define IMP_PYCALLBACK__DC4DBL(CLASS, PCLASS, CBNAME)                           \
      void CLASS::CBNAME(wxDC& a, double b, double c, double d, double e) {       \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                            \
+        bool blocked = wxPyBeginBlockThreads();                            \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* obj = wxPyMake_wxObject(&a);                              \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Odddd)", obj, b, c, d, e));   \
              Py_DECREF(obj);                                                     \
          }                                                                       \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* obj = wxPyMake_wxObject(&a);                              \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Odddd)", obj, b, c, d, e));   \
              Py_DECREF(obj);                                                     \
          }                                                                       \
-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads(blocked);                                             \
          if (! found)                                                            \
              PCLASS::CBNAME(a, b, c, d, e);                                      \
      }                                                                           \
          if (! found)                                                            \
              PCLASS::CBNAME(a, b, c, d, e);                                      \
      }                                                                           \
@@ -1129,13 +1145,13 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME)                           \
      void CLASS::CBNAME(wxDC& a, bool b) {                                       \
          bool found;                                                             \
  #define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME)                           \
      void CLASS::CBNAME(wxDC& a, bool b) {                                       \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                            \
+        bool blocked = wxPyBeginBlockThreads();                            \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* obj = wxPyMake_wxObject(&a);                              \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, (int)b)); \
              Py_DECREF(obj);                                                     \
          }                                                                       \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* obj = wxPyMake_wxObject(&a);                              \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, (int)b)); \
              Py_DECREF(obj);                                                     \
          }                                                                       \
-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads(blocked);                                             \
          if (! found)                                                            \
              PCLASS::CBNAME(a, b);                                               \
      }                                                                           \
          if (! found)                                                            \
              PCLASS::CBNAME(a, b);                                               \
      }                                                                           \
@@ -1154,13 +1170,13 @@ extern wxPyApp *wxPythonApp;
      void CLASS::CBNAME(wxControlPoint* a, bool b, double c, double d,           \
                  int e, int f) {                                                 \
          bool found;                                                             \
      void CLASS::CBNAME(wxControlPoint* a, bool b, double c, double d,           \
                  int e, int f) {                                                 \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                            \
+        bool blocked = wxPyBeginBlockThreads();                            \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* obj = wxPyMake_wxObject(a);                               \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oiddii)", obj, (int)b, c, d, e, f));\
              Py_DECREF(obj);                                                     \
          }                                                                       \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* obj = wxPyMake_wxObject(a);                               \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oiddii)", obj, (int)b, c, d, e, f));\
              Py_DECREF(obj);                                                     \
          }                                                                       \
-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads(blocked);                                             \
          if (! found)                                                            \
              PCLASS::CBNAME(a, b, c, d, e, f);                                   \
      }                                                                           \
          if (! found)                                                            \
              PCLASS::CBNAME(a, b, c, d, e, f);                                   \
      }                                                                           \
@@ -1179,13 +1195,13 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK__WXCP2DBL2INT(CLASS, PCLASS, CBNAME)                     \
      void CLASS::CBNAME(wxControlPoint* a, double b, double c, int d, int e) {   \
          bool found;                                                             \
  #define IMP_PYCALLBACK__WXCP2DBL2INT(CLASS, PCLASS, CBNAME)                     \
      void CLASS::CBNAME(wxControlPoint* a, double b, double c, int d, int e) {   \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                            \
+        bool blocked = wxPyBeginBlockThreads();                            \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* obj = wxPyMake_wxObject(a);                               \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oddii)", obj, b, c, d, e));   \
              Py_DECREF(obj);                                                     \
          }                                                                       \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* obj = wxPyMake_wxObject(a);                               \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oddii)", obj, b, c, d, e));   \
              Py_DECREF(obj);                                                     \
          }                                                                       \
-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads(blocked);                                             \
          if (! found)                                                            \
              PCLASS::CBNAME(a, b, c, d, e);                                      \
      }                                                                           \
          if (! found)                                                            \
              PCLASS::CBNAME(a, b, c, d, e);                                      \
      }                                                                           \
@@ -1204,10 +1220,10 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK__2DBLINT(CLASS, PCLASS, CBNAME)                          \
      void CLASS::CBNAME(double a, double b, int c) {                             \
          bool found;                                                             \
  #define IMP_PYCALLBACK__2DBLINT(CLASS, PCLASS, CBNAME)                          \
      void CLASS::CBNAME(double a, double b, int c) {                             \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                            \
+        bool blocked = wxPyBeginBlockThreads();                            \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ddi)", a,b,c));      \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ddi)", a,b,c));      \
-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads(blocked);                                             \
          if (! found)                                                            \
              PCLASS::CBNAME(a, b, c);                                            \
      }                                                                           \
          if (! found)                                                            \
              PCLASS::CBNAME(a, b, c);                                            \
      }                                                                           \
@@ -1225,10 +1241,10 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK__BOOL2DBLINT(CLASS, PCLASS, CBNAME)                      \
      void CLASS::CBNAME(bool a, double b, double c, int d) {                     \
          bool found;                                                             \
  #define IMP_PYCALLBACK__BOOL2DBLINT(CLASS, PCLASS, CBNAME)                      \
      void CLASS::CBNAME(bool a, double b, double c, int d) {                     \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iddi)", (int)a,b,c,d));\
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iddi)", (int)a,b,c,d));\
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              PCLASS::CBNAME(a, b, c, d);                                         \
      }                                                                           \
          if (! found)                                                            \
              PCLASS::CBNAME(a, b, c, d);                                         \
      }                                                                           \
@@ -1246,13 +1262,13 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK__STRING(CLASS, PCLASS, CBNAME)                           \
      void CLASS::CBNAME(const wxString& a)  {                                    \
          bool found;                                                             \
  #define IMP_PYCALLBACK__STRING(CLASS, PCLASS, CBNAME)                           \
      void CLASS::CBNAME(const wxString& a)  {                                    \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* s = wx2PyString(a);                                       \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s));            \
              Py_DECREF(s);                                                       \
          }                                                                       \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* s = wx2PyString(a);                                       \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s));            \
              Py_DECREF(s);                                                       \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              PCLASS::CBNAME(a);                                                  \
      }                                                                           \
          if (! found)                                                            \
              PCLASS::CBNAME(a);                                                  \
      }                                                                           \
@@ -1270,13 +1286,13 @@ extern wxPyApp *wxPythonApp;
      bool CLASS::CBNAME(const wxString& a)  {                                    \
          bool rval=False;                                                        \
          bool found;                                                             \
      bool CLASS::CBNAME(const wxString& a)  {                                    \
          bool rval=False;                                                        \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* s = wx2PyString(a);                                       \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s));     \
              Py_DECREF(s);                                                       \
          }                                                                       \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* s = wx2PyString(a);                                       \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s));     \
              Py_DECREF(s);                                                       \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a);                                           \
          return rval;                                                            \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a);                                           \
          return rval;                                                            \
@@ -1293,13 +1309,13 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK_BOOL_STRING_pure(CLASS, PCLASS, CBNAME)                  \
      bool CLASS::CBNAME(const wxString& a)  {                                    \
          bool rval=False;                                                        \
  #define IMP_PYCALLBACK_BOOL_STRING_pure(CLASS, PCLASS, CBNAME)                  \
      bool CLASS::CBNAME(const wxString& a)  {                                    \
          bool rval=False;                                                        \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
              PyObject* s = wx2PyString(a);                                       \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s));     \
              Py_DECREF(s);                                                       \
          }                                                                       \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
              PyObject* s = wx2PyString(a);                                       \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s));     \
              Py_DECREF(s);                                                       \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          return rval;                                                            \
      }                                                                           \
  
          return rval;                                                            \
      }                                                                           \
  
@@ -1311,7 +1327,7 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK_STRING_STRING_pure(CLASS, PCLASS, CBNAME)                \
      wxString CLASS::CBNAME(const wxString& a)  {                                \
          wxString rval;                                                          \
  #define IMP_PYCALLBACK_STRING_STRING_pure(CLASS, PCLASS, CBNAME)                \
      wxString CLASS::CBNAME(const wxString& a)  {                                \
          wxString rval;                                                          \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
              PyObject* ro;                                                       \
              PyObject* s = wx2PyString(a);                                       \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
              PyObject* ro;                                                       \
              PyObject* s = wx2PyString(a);                                       \
@@ -1322,7 +1338,7 @@ extern wxPyApp *wxPythonApp;
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          return rval;                                                            \
      }                                                                           \
  
          return rval;                                                            \
      }                                                                           \
  
@@ -1336,7 +1352,7 @@ extern wxPyApp *wxPythonApp;
      wxString CLASS::CBNAME(const wxString& a)  {                                \
          wxString rval;                                                          \
          bool found;                                                             \
      wxString CLASS::CBNAME(const wxString& a)  {                                \
          wxString rval;                                                          \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
              PyObject* s = wx2PyString(a);                                       \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
              PyObject* s = wx2PyString(a);                                       \
@@ -1349,7 +1365,7 @@ extern wxPyApp *wxPythonApp;
          }                                                                       \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a);                                           \
          }                                                                       \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a);                                           \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          return rval;                                                            \
      }                                                                           \
  
          return rval;                                                            \
      }                                                                           \
  
@@ -1361,7 +1377,7 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK_STRING_STRINGINT_pure(CLASS, PCLASS, CBNAME)             \
      wxString CLASS::CBNAME(const wxString& a,int b)  {                          \
          wxString rval;                                                          \
  #define IMP_PYCALLBACK_STRING_STRINGINT_pure(CLASS, PCLASS, CBNAME)             \
      wxString CLASS::CBNAME(const wxString& a,int b)  {                          \
          wxString rval;                                                          \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
              PyObject* ro;                                                       \
              PyObject* s = wx2PyString(a);                                       \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
              PyObject* ro;                                                       \
              PyObject* s = wx2PyString(a);                                       \
@@ -1372,7 +1388,7 @@ extern wxPyApp *wxPythonApp;
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          return rval;                                                            \
      }                                                                           \
  
          return rval;                                                            \
      }                                                                           \
  
@@ -1386,7 +1402,7 @@ extern wxPyApp *wxPythonApp;
      bool CLASS::CBNAME(const wxString& a, const wxString& b) {                  \
          bool rval=False;                                                        \
          bool found;                                                             \
      bool CLASS::CBNAME(const wxString& a, const wxString& b) {                  \
          bool rval=False;                                                        \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* s1 = wx2PyString(a);                                      \
              PyObject* s2 = wx2PyString(b);                                      \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* s1 = wx2PyString(a);                                      \
              PyObject* s2 = wx2PyString(b);                                      \
@@ -1394,7 +1410,7 @@ extern wxPyApp *wxPythonApp;
              Py_DECREF(s1);                                                      \
              Py_DECREF(s2);                                                      \
          }                                                                       \
              Py_DECREF(s1);                                                      \
              Py_DECREF(s2);                                                      \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a, b);                                        \
          return rval;                                                            \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a, b);                                        \
          return rval;                                                            \
@@ -1413,7 +1429,7 @@ extern wxPyApp *wxPythonApp;
      wxString CLASS::CBNAME() {                                                  \
          wxString rval;                                                          \
          bool found;                                                             \
      wxString CLASS::CBNAME() {                                                  \
          wxString rval;                                                          \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                            \
+        bool blocked = wxPyBeginBlockThreads();                            \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));        \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));        \
@@ -1422,7 +1438,7 @@ extern wxPyApp *wxPythonApp;
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              rval = PCLASS::CBNAME();                                            \
          return rval;                                                            \
          if (! found)                                                            \
              rval = PCLASS::CBNAME();                                            \
          return rval;                                                            \
@@ -1441,7 +1457,7 @@ extern wxPyApp *wxPythonApp;
      wxString CLASS::CBNAME() const {                                            \
          wxString rval;                                                          \
          bool found;                                                             \
      wxString CLASS::CBNAME() const {                                            \
          wxString rval;                                                          \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                            \
+        bool blocked = wxPyBeginBlockThreads();                            \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));        \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));        \
@@ -1450,7 +1466,7 @@ extern wxPyApp *wxPythonApp;
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              rval = PCLASS::CBNAME();                                            \
          return rval;                                                            \
          if (! found)                                                            \
              rval = PCLASS::CBNAME();                                            \
          return rval;                                                            \
@@ -1467,7 +1483,7 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK_STRING__pure(CLASS, PCLASS, CBNAME)                      \
      wxString CLASS::CBNAME() {                                                  \
          wxString rval;                                                          \
  #define IMP_PYCALLBACK_STRING__pure(CLASS, PCLASS, CBNAME)                      \
      wxString CLASS::CBNAME() {                                                  \
          wxString rval;                                                          \
-        wxPyBeginBlockThreads();                            \
+        bool blocked = wxPyBeginBlockThreads();                            \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
              PyObject* ro;                                                       \
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));        \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
              PyObject* ro;                                                       \
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));        \
@@ -1476,7 +1492,7 @@ extern wxPyApp *wxPythonApp;
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          return rval;                                                            \
      }
  
          return rval;                                                            \
      }
  
@@ -1488,7 +1504,7 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK_STRING__constpure(CLASS, PCLASS, CBNAME)                 \
      wxString CLASS::CBNAME() const {                                            \
          wxString rval;                                                          \
  #define IMP_PYCALLBACK_STRING__constpure(CLASS, PCLASS, CBNAME)                 \
      wxString CLASS::CBNAME() const {                                            \
          wxString rval;                                                          \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
              PyObject* ro;                                                       \
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));        \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
              PyObject* ro;                                                       \
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));        \
@@ -1497,7 +1513,7 @@ extern wxPyApp *wxPythonApp;
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          return rval;                                                            \
      }
  
          return rval;                                                            \
      }
  
@@ -1510,13 +1526,13 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK_BOOL_TAG_pure(CLASS, PCLASS, CBNAME)                     \
      bool CLASS::CBNAME(const wxHtmlTag& a)  {                                   \
          bool rval=False;                                                        \
  #define IMP_PYCALLBACK_BOOL_TAG_pure(CLASS, PCLASS, CBNAME)                     \
      bool CLASS::CBNAME(const wxHtmlTag& a)  {                                   \
          bool rval=False;                                                        \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
              PyObject* obj = wxPyConstructObject((void*)&a, wxT("wxHtmlTag"), 0);     \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj));   \
              Py_DECREF(obj);                                                     \
          }                                                                       \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
              PyObject* obj = wxPyConstructObject((void*)&a, wxT("wxHtmlTag"), 0);     \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj));   \
              Py_DECREF(obj);                                                     \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          return rval;                                                            \
      }
  
          return rval;                                                            \
      }
  
@@ -1529,13 +1545,13 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK__CELLINTINT(CLASS, PCLASS, CBNAME)                       \
      void CLASS::CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y) {                \
          bool found;                                                             \
  #define IMP_PYCALLBACK__CELLINTINT(CLASS, PCLASS, CBNAME)                       \
      void CLASS::CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y) {                \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* obj = wxPyConstructObject((void*)cell, wxT("wxHtmlCell"), 0);  \
              wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(Oii)",obj,x,y));  \
              Py_DECREF(obj);                                                     \
          }                                                                       \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* obj = wxPyConstructObject((void*)cell, wxT("wxHtmlCell"), 0);  \
              wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(Oii)",obj,x,y));  \
              Py_DECREF(obj);                                                     \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              PCLASS::CBNAME(cell, x, y);                                         \
      }                                                                           \
          if (! found)                                                            \
              PCLASS::CBNAME(cell, x, y);                                         \
      }                                                                           \
@@ -1553,7 +1569,7 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK__CELLINTINTME(CLASS, PCLASS, CBNAME)                       \
      void CLASS::CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& e) {                \
          bool found;                                                             \
  #define IMP_PYCALLBACK__CELLINTINTME(CLASS, PCLASS, CBNAME)                       \
      void CLASS::CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& e) {                \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* obj = wxPyConstructObject((void*)cell, wxT("wxHtmlCell"), 0);  \
              PyObject* o2  = wxPyConstructObject((void*)&e, wxT("wxMouseEvent"), 0);  \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* obj = wxPyConstructObject((void*)cell, wxT("wxHtmlCell"), 0);  \
              PyObject* o2  = wxPyConstructObject((void*)&e, wxT("wxMouseEvent"), 0);  \
@@ -1561,7 +1577,7 @@ extern wxPyApp *wxPythonApp;
              Py_DECREF(obj);                                                     \
              Py_DECREF(o2);                                                      \
          }                                                                       \
              Py_DECREF(obj);                                                     \
              Py_DECREF(o2);                                                      \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              PCLASS::CBNAME(cell, x, y, e);                                      \
      }                                                                           \
          if (! found)                                                            \
              PCLASS::CBNAME(cell, x, y, e);                                      \
      }                                                                           \
@@ -1579,10 +1595,10 @@ extern wxPyApp *wxPythonApp;
  
  #define IMP_PYCALLBACK___pure(CLASS, PCLASS, CBNAME)                            \
      void CLASS::CBNAME() {                                                      \
  
  #define IMP_PYCALLBACK___pure(CLASS, PCLASS, CBNAME)                            \
      void CLASS::CBNAME() {                                                      \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME))                            \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));                \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME))                            \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));                \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
      }
  
  //---------------------------------------------------------------------------
      }
  
  //---------------------------------------------------------------------------
@@ -1595,7 +1611,7 @@ extern wxPyApp *wxPythonApp;
      wxSize CLASS::CBNAME() {                                                    \
          const char* errmsg = #CBNAME " should return a 2-tuple of integers or a wxSize object."; \
          wxSize rval(0,0);                                                       \
      wxSize CLASS::CBNAME() {                                                    \
          const char* errmsg = #CBNAME " should return a 2-tuple of integers or a wxSize object."; \
          wxSize rval(0,0);                                                       \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
              PyObject* ro;                                                       \
              wxSize*   ptr;                                                      \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
              PyObject* ro;                                                       \
              wxSize*   ptr;                                                      \
@@ -1619,7 +1635,7 @@ extern wxPyApp *wxPythonApp;
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          return rval;                                                            \
      }
  
          return rval;                                                            \
      }
  
@@ -1634,13 +1650,13 @@ extern wxPyApp *wxPythonApp;
      bool CLASS::CBNAME(wxWindow* a) {                                           \
          bool rval=False;                                                        \
          bool found;                                                             \
      bool CLASS::CBNAME(wxWindow* a) {                                           \
          bool rval=False;                                                        \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* obj = wxPyMake_wxObject(a);                               \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj));   \
              Py_DECREF(obj);                                                     \
          }                                                                       \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* obj = wxPyMake_wxObject(a);                               \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj));   \
              Py_DECREF(obj);                                                     \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a);                                           \
          return rval;                                                            \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a);                                           \
          return rval;                                                            \
@@ -1660,7 +1676,7 @@ extern wxPyApp *wxPythonApp;
      bool CLASS::CBNAME(wxWindow* a, wxDC& b) {                                  \
          bool rval=False;                                                        \
          bool found;                                                             \
      bool CLASS::CBNAME(wxWindow* a, wxDC& b) {                                  \
          bool rval=False;                                                        \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* win = wxPyMake_wxObject(a);                               \
              PyObject* dc  = wxPyMake_wxObject(&b);                              \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* win = wxPyMake_wxObject(a);                               \
              PyObject* dc  = wxPyMake_wxObject(&b);                              \
@@ -1668,7 +1684,7 @@ extern wxPyApp *wxPythonApp;
              Py_DECREF(win);                                                     \
              Py_DECREF(dc);                                                      \
          }                                                                       \
              Py_DECREF(win);                                                     \
              Py_DECREF(dc);                                                      \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a, b);                                        \
          return rval;                                                            \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a, b);                                        \
          return rval;                                                            \
@@ -1687,13 +1703,13 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK_VOID_WXWINBASE(CLASS, PCLASS, CBNAME)                    \
      void CLASS::CBNAME(wxWindowBase* a) {                                       \
          bool found;                                                             \
  #define IMP_PYCALLBACK_VOID_WXWINBASE(CLASS, PCLASS, CBNAME)                    \
      void CLASS::CBNAME(wxWindowBase* a) {                                       \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* obj = wxPyMake_wxObject(a);                               \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj));          \
              Py_DECREF(obj);                                                     \
          }                                                                       \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* obj = wxPyMake_wxObject(a);                               \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj));          \
              Py_DECREF(obj);                                                     \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              PCLASS::CBNAME(a);                                                  \
      }                                                                           \
          if (! found)                                                            \
              PCLASS::CBNAME(a);                                                  \
      }                                                                           \
@@ -1712,10 +1728,10 @@ extern wxPyApp *wxPythonApp;
      bool CLASS::CBNAME() {                                                      \
          bool rval=False;                                                        \
          bool found;                                                             \
      bool CLASS::CBNAME() {                                                      \
          bool rval=False;                                                        \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = 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();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              rval = PCLASS::CBNAME();                                            \
          return rval;                                                            \
          if (! found)                                                            \
              rval = PCLASS::CBNAME();                                            \
          return rval;                                                            \
@@ -1735,10 +1751,10 @@ extern wxPyApp *wxPythonApp;
      bool CLASS::CBNAME() const {                                                \
          bool rval=False;                                                        \
          bool found;                                                             \
      bool CLASS::CBNAME() const {                                                \
          bool rval=False;                                                        \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = 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();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              rval = PCLASS::CBNAME();                                            \
          return rval;                                                            \
          if (! found)                                                            \
              rval = PCLASS::CBNAME();                                            \
          return rval;                                                            \
@@ -1758,10 +1774,10 @@ extern wxPyApp *wxPythonApp;
      wxDragResult CLASS::CBNAME(wxCoord a, wxCoord b, wxDragResult c) {          \
          int rval=0;                                                             \
          bool found;                                                             \
      wxDragResult CLASS::CBNAME(wxCoord a, wxCoord b, wxDragResult c) {          \
          int rval=0;                                                             \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));\
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));\
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a, b, c);                                     \
          return (wxDragResult)rval;                                              \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a, b, c);                                     \
          return (wxDragResult)rval;                                              \
@@ -1777,7 +1793,7 @@ extern wxPyApp *wxPythonApp;
  
  #define IMP_PYCALLBACK_FSF_FSSTRING_pure(CLASS, PCLASS, CBNAME)         \
      wxFSFile* CLASS::CBNAME(wxFileSystem& a,const wxString& b) {        \
  
  #define IMP_PYCALLBACK_FSF_FSSTRING_pure(CLASS, PCLASS, CBNAME)         \
      wxFSFile* CLASS::CBNAME(wxFileSystem& a,const wxString& b) {        \
-        wxPyBeginBlockThreads();                                        \
+        bool blocked = wxPyBeginBlockThreads();                                        \
          wxFSFile* rval=0;                                               \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                  \
              PyObject* ro;                                               \
          wxFSFile* rval=0;                                               \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                  \
              PyObject* ro;                                               \
@@ -1792,7 +1808,7 @@ extern wxPyApp *wxPythonApp;
              Py_DECREF(obj);                                             \
              Py_DECREF(s);                                               \
          }                                                               \
              Py_DECREF(obj);                                             \
              Py_DECREF(s);                                               \
          }                                                               \
-        wxPyEndBlockThreads();                                          \
+        wxPyEndBlockThreads(blocked);                                          \
          return rval;                                                    \
      };
  
          return rval;                                                    \
      };
  
@@ -1807,10 +1823,10 @@ extern wxPyApp *wxPythonApp;
      bool CLASS::CBNAME(wxDragResult a) {                                \
          bool rval=False;                                                \
          bool found;                                                     \
      bool CLASS::CBNAME(wxDragResult a) {                                \
          bool rval=False;                                                \
          bool found;                                                     \
-        wxPyBeginBlockThreads();                                        \
+        bool blocked = 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();                                          \
+        wxPyEndBlockThreads(blocked);                                          \
          if (! found)                                                    \
              rval = PCLASS::CBNAME(a);                                   \
          return rval;                                                    \
          if (! found)                                                    \
              rval = PCLASS::CBNAME(a);                                   \
          return rval;                                                    \
@@ -1827,11 +1843,11 @@ extern wxPyApp *wxPythonApp;
  
  #define IMP_PYCALLBACK_DR_2WXCDR_pure(CLASS, PCLASS, CBNAME)            \
      wxDragResult CLASS::CBNAME(wxCoord a, wxCoord b, wxDragResult c) {  \
  
  #define IMP_PYCALLBACK_DR_2WXCDR_pure(CLASS, PCLASS, CBNAME)            \
      wxDragResult CLASS::CBNAME(wxCoord a, wxCoord b, wxDragResult c) {  \
-        wxPyBeginBlockThreads();                                        \
+        bool blocked = wxPyBeginBlockThreads();                                        \
          int rval=0;                                                     \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME))                    \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));\
          int rval=0;                                                     \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME))                    \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));\
-        wxPyEndBlockThreads();                                          \
+        wxPyEndBlockThreads(blocked);                                          \
          return (wxDragResult)rval;                                      \
      }                                                                   \
  
          return (wxDragResult)rval;                                      \
      }                                                                   \
  
@@ -1843,13 +1859,13 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK_BOOL_INTINTSTR_pure(CLASS, PCLASS, CBNAME)       \
      bool CLASS::CBNAME(int a, int b, const wxString& c) {               \
          bool rval=False;                                                \
  #define IMP_PYCALLBACK_BOOL_INTINTSTR_pure(CLASS, PCLASS, CBNAME)       \
      bool CLASS::CBNAME(int a, int b, const wxString& c) {               \
          bool rval=False;                                                \
-        wxPyBeginBlockThreads();                                        \
+        bool blocked = wxPyBeginBlockThreads();                                        \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                  \
              PyObject* s = wx2PyString(c);                               \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",a,b,s));\
              Py_DECREF(s);                                               \
          }                                                               \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                  \
              PyObject* s = wx2PyString(c);                               \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",a,b,s));\
              Py_DECREF(s);                                               \
          }                                                               \
-        wxPyEndBlockThreads();                                          \
+        wxPyEndBlockThreads(blocked);                                          \
          return rval;                                                    \
      }                                                                   \
  
          return rval;                                                    \
      }                                                                   \
  
@@ -1864,10 +1880,10 @@ extern wxPyApp *wxPythonApp;
      size_t CLASS::CBNAME() {                                                    \
          size_t rval=0;                                                          \
          bool found;                                                             \
      size_t CLASS::CBNAME() {                                                    \
          size_t rval=0;                                                          \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = 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();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              rval = PCLASS::CBNAME();                                            \
          return rval;                                                            \
          if (! found)                                                            \
              rval = PCLASS::CBNAME();                                            \
          return rval;                                                            \
@@ -1887,10 +1903,10 @@ extern wxPyApp *wxPythonApp;
      size_t CLASS::CBNAME() const {                                              \
          size_t rval=0;                                                          \
          bool found;                                                             \
      size_t CLASS::CBNAME() const {                                              \
          size_t rval=0;                                                          \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = 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();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              rval = PCLASS::CBNAME();                                            \
          return rval;                                                            \
          if (! found)                                                            \
              rval = PCLASS::CBNAME();                                            \
          return rval;                                                            \
@@ -1910,7 +1926,7 @@ extern wxPyApp *wxPythonApp;
      wxDataFormat CLASS::CBNAME(size_t a) {                                      \
          wxDataFormat rval=0;                                                    \
          bool found;                                                             \
      wxDataFormat CLASS::CBNAME(size_t a) {                                      \
          wxDataFormat rval=0;                                                    \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
              wxDataFormat* ptr;                                                  \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
              wxDataFormat* ptr;                                                  \
@@ -1921,7 +1937,7 @@ extern wxPyApp *wxPythonApp;
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a);                                           \
          return rval;                                                            \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a);                                           \
          return rval;                                                            \
@@ -1940,13 +1956,13 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK__constany(CLASS, PCLASS, CBNAME, Type)                   \
      void CLASS::CBNAME(const Type& a) {                                         \
          bool found;                                                             \
  #define IMP_PYCALLBACK__constany(CLASS, PCLASS, CBNAME, Type)                   \
      void CLASS::CBNAME(const Type& a) {                                         \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* obj = wxPyConstructObject((void*)&a, wxT(#Type), 0);           \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj));          \
              Py_DECREF(obj);                                                     \
          }                                                                       \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* obj = wxPyConstructObject((void*)&a, wxT(#Type), 0);           \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj));          \
              Py_DECREF(obj);                                                     \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              PCLASS::CBNAME(a);                                                  \
      }                                                                           \
          if (! found)                                                            \
              PCLASS::CBNAME(a);                                                  \
      }                                                                           \
@@ -1965,13 +1981,13 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK__any(CLASS, PCLASS, CBNAME, Type)                        \
      void CLASS::CBNAME(Type& a) {                                               \
          bool found;                                                             \
  #define IMP_PYCALLBACK__any(CLASS, PCLASS, CBNAME, Type)                        \
      void CLASS::CBNAME(Type& a) {                                               \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* obj = wxPyConstructObject((void*)&a, wxT(#Type), 0);           \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj));          \
              Py_DECREF(obj);                                                     \
          }                                                                       \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* obj = wxPyConstructObject((void*)&a, wxT(#Type), 0);           \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj));          \
              Py_DECREF(obj);                                                     \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              PCLASS::CBNAME(a);                                                  \
      }                                                                           \
          if (! found)                                                            \
              PCLASS::CBNAME(a);                                                  \
      }                                                                           \
@@ -1990,13 +2006,13 @@ extern wxPyApp *wxPythonApp;
      bool CLASS::CBNAME(Type& a) {                                               \
          bool rv=False;                                                          \
          bool found;                                                             \
      bool CLASS::CBNAME(Type& a) {                                               \
          bool rv=False;                                                          \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* obj = wxPyConstructObject((void*)&a, wxT(#Type), 0);           \
              rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj));     \
              Py_DECREF(obj);                                                     \
          }                                                                       \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* obj = wxPyConstructObject((void*)&a, wxT(#Type), 0);           \
              rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj));     \
              Py_DECREF(obj);                                                     \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              rv = PCLASS::CBNAME(a);                                             \
          return rv;                                                              \
          if (! found)                                                            \
              rv = PCLASS::CBNAME(a);                                             \
          return rv;                                                              \
@@ -2014,13 +2030,13 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK_bool_anypure(CLASS, PCLASS, CBNAME, Type)                \
      bool CLASS::CBNAME(Type& a) {                                               \
          bool rv=False;                                                          \
  #define IMP_PYCALLBACK_bool_anypure(CLASS, PCLASS, CBNAME, Type)                \
      bool CLASS::CBNAME(Type& a) {                                               \
          bool rv=False;                                                          \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
              PyObject* obj = wxPyConstructObject((void*)&a, wxT(#Type), 0);           \
              rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj));     \
              Py_DECREF(obj);                                                     \
          }                                                                       \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
              PyObject* obj = wxPyConstructObject((void*)&a, wxT(#Type), 0);           \
              rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj));     \
              Py_DECREF(obj);                                                     \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          return rv;                                                              \
      }                                                                           \
  
          return rv;                                                              \
      }                                                                           \
  
@@ -2034,7 +2050,7 @@ extern wxPyApp *wxPythonApp;
      wxString CLASS::CBNAME(long a, long b) const {                              \
          wxString rval;                                                          \
          bool found;                                                             \
      wxString CLASS::CBNAME(long a, long b) const {                              \
          wxString rval;                                                          \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ll)",a,b));  \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ll)",a,b));  \
@@ -2043,7 +2059,7 @@ extern wxPyApp *wxPythonApp;
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a,b);                                         \
          return rval;                                                            \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a,b);                                         \
          return rval;                                                            \
@@ -2063,7 +2079,7 @@ extern wxPyApp *wxPythonApp;
      int CLASS::CBNAME(long a) const {                                           \
          int rval=-1;                                                            \
          bool found;                                                             \
      int CLASS::CBNAME(long a) const {                                           \
          int rval=-1;                                                            \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(l)",a));     \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(l)",a));     \
@@ -2072,7 +2088,7 @@ extern wxPyApp *wxPythonApp;
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a);                                           \
          return rval;                                                            \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a);                                           \
          return rval;                                                            \
@@ -2093,7 +2109,7 @@ extern wxPyApp *wxPythonApp;
      wxListItemAttr *CLASS::CBNAME(long a) const {                               \
          wxListItemAttr *rval = NULL;                                            \
          bool found;                                                             \
      wxListItemAttr *CLASS::CBNAME(long a) const {                               \
          wxListItemAttr *rval = NULL;                                            \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
              wxListItemAttr* ptr;                                                \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
              wxListItemAttr* ptr;                                                \
@@ -2104,7 +2120,7 @@ extern wxPyApp *wxPythonApp;
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a);                                           \
          return rval;                                                            \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a);                                           \
          return rval;                                                            \
@@ -2123,7 +2139,7 @@ extern wxPyApp *wxPythonApp;
      bool CLASS::CBNAME(wxMouseEvent& e) {                                       \
          bool rval=False;                                                        \
          bool found;                                                             \
      bool CLASS::CBNAME(wxMouseEvent& e) {                                       \
          bool rval=False;                                                        \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
              PyObject* obj  = wxPyConstructObject((void*)&e, wxT("wxMouseEvent"), 0); \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
              PyObject* obj  = wxPyConstructObject((void*)&e, wxT("wxMouseEvent"), 0); \
@@ -2134,7 +2150,7 @@ extern wxPyApp *wxPythonApp;
              }                                                                   \
              Py_DECREF(obj);                                                     \
          }                                                                       \
              }                                                                   \
              Py_DECREF(obj);                                                     \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              return PCLASS::CBNAME(e);                                           \
          return rval;                                                            \
          if (! found)                                                            \
              return PCLASS::CBNAME(e);                                           \
          return rval;                                                            \
@@ -2152,7 +2168,7 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK_WIZPG__pure(CLASS, PCLASS, CBNAME)                       \
      wxWizardPage* CLASS::CBNAME() const {                                       \
          wxWizardPage* rv = NULL;                                                \
  #define IMP_PYCALLBACK_WIZPG__pure(CLASS, PCLASS, CBNAME)                       \
      wxWizardPage* CLASS::CBNAME() const {                                       \
          wxWizardPage* rv = NULL;                                                \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
              PyObject* ro;                                                       \
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));        \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
              PyObject* ro;                                                       \
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));        \
@@ -2161,7 +2177,7 @@ extern wxPyApp *wxPythonApp;
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          return rv;                                                              \
      }
  
          return rv;                                                              \
      }
  
@@ -2173,7 +2189,7 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK_BITMAP__pure(CLASS, PCLASS, CBNAME)                      \
      wxBitmap CLASS::CBNAME() const {                                            \
          wxBitmap rv;                                                            \
  #define IMP_PYCALLBACK_BITMAP__pure(CLASS, PCLASS, CBNAME)                      \
      wxBitmap CLASS::CBNAME() const {                                            \
          wxBitmap rv;                                                            \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
              PyObject* ro;                                                       \
              wxBitmap* ptr;                                                      \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
              PyObject* ro;                                                       \
              wxBitmap* ptr;                                                      \
@@ -2184,7 +2200,7 @@ extern wxPyApp *wxPythonApp;
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          return rv;                                                              \
      }
  
          return rv;                                                              \
      }
  
@@ -2196,7 +2212,7 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK_OBJECT__pure(CLASS, PCLASS, CBNAME)                      \
      wxObject* CLASS::CBNAME() {                                                 \
          wxObject* rv = NULL;                                                    \
  #define IMP_PYCALLBACK_OBJECT__pure(CLASS, PCLASS, CBNAME)                      \
      wxObject* CLASS::CBNAME() {                                                 \
          wxObject* rv = NULL;                                                    \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
              PyObject* ro;                                                       \
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));        \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
              PyObject* ro;                                                       \
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));        \
@@ -2205,7 +2221,7 @@ extern wxPyApp *wxPythonApp;
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          return rv;                                                              \
      }
  
          return rv;                                                              \
      }
  
@@ -2217,7 +2233,7 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK_OBJECT_STRING_pure(CLASS, PCLASS, CBNAME)                \
      wxObject* CLASS::CBNAME(const wxString& a) {                                \
          wxObject* rv = NULL;                                                    \
  #define IMP_PYCALLBACK_OBJECT_STRING_pure(CLASS, PCLASS, CBNAME)                \
      wxObject* CLASS::CBNAME(const wxString& a) {                                \
          wxObject* rv = NULL;                                                    \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
              PyObject* so = wx2PyString(a);                                      \
              PyObject* ro;                                                       \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
              PyObject* so = wx2PyString(a);                                      \
              PyObject* ro;                                                       \
@@ -2228,7 +2244,7 @@ extern wxPyApp *wxPythonApp;
              }                                                                   \
              Py_DECREF(so);                                                      \
          }                                                                       \
              }                                                                   \
              Py_DECREF(so);                                                      \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          return rv;                                                              \
      }
  
          return rv;                                                              \
      }
  
@@ -2241,13 +2257,13 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK_BOOL_NODE_pure(CLASS, PCLASS, CBNAME)                    \
      bool CLASS::CBNAME(wxXmlNode* a) {                                          \
          bool rv=False;                                                          \
  #define IMP_PYCALLBACK_BOOL_NODE_pure(CLASS, PCLASS, CBNAME)                    \
      bool CLASS::CBNAME(wxXmlNode* a) {                                          \
          bool rv=False;                                                          \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
              PyObject* obj = wxPyConstructObject((void*)a, wxT("wxXmlNode"), 0);      \
              rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj));     \
              Py_DECREF(obj);                                                     \
          }                                                                       \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
              PyObject* obj = wxPyConstructObject((void*)a, wxT("wxXmlNode"), 0);      \
              rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj));     \
              Py_DECREF(obj);                                                     \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          return rv;                                                              \
      }                                                                           \
  
          return rv;                                                              \
      }                                                                           \
  
@@ -2261,11 +2277,11 @@ extern wxPyApp *wxPythonApp;
      wxCoord CLASS::CBNAME(size_t a) const {                                     \
          wxCoord rval=0;                                                         \
          bool found;                                                             \
      wxCoord CLASS::CBNAME(size_t a) const {                                     \
          wxCoord rval=0;                                                         \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = 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();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          return rval;                                                            \
      }                                                                           \
  
          return rval;                                                            \
      }                                                                           \
  
@@ -2279,10 +2295,10 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK_VOID_SIZETSIZET_const(CLASS, PCLASS, CBNAME)             \
      void CLASS::CBNAME(size_t a, size_t b) const {                              \
          bool found;                                                             \
  #define IMP_PYCALLBACK_VOID_SIZETSIZET_const(CLASS, PCLASS, CBNAME)             \
      void CLASS::CBNAME(size_t a, size_t b) const {                              \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = 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();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              PCLASS::CBNAME(a,b);                                                \
      }                                                                           \
          if (! found)                                                            \
              PCLASS::CBNAME(a,b);                                                \
      }                                                                           \
@@ -2301,10 +2317,10 @@ extern wxPyApp *wxPythonApp;
      wxCoord CLASS::CBNAME() const {                                             \
          wxCoord rval=0;                                                         \
          bool found;                                                             \
      wxCoord CLASS::CBNAME() const {                                             \
          wxCoord rval=0;                                                         \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = 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();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              rval = PCLASS::CBNAME();                                            \
          return rval;                                                            \
          if (! found)                                                            \
              rval = PCLASS::CBNAME();                                            \
          return rval;                                                            \
@@ -2322,14 +2338,14 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK__DCRECTSIZET_constpure(CLASS, PCLASS, CBNAME)            \
      void CLASS::CBNAME(wxDC& a, const wxRect& b, size_t c) const {              \
          bool found;                                                             \
  #define IMP_PYCALLBACK__DCRECTSIZET_constpure(CLASS, PCLASS, CBNAME)            \
      void CLASS::CBNAME(wxDC& a, const wxRect& b, size_t c) const {              \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* obj = wxPyMake_wxObject(&a);                              \
              PyObject* ro = wxPyConstructObject((void*)&b, wxT("wxRect"), 0);    \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOi)", obj, ro, (int)c)); \
              Py_DECREF(obj);                                                     \
          }                                                                       \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* obj = wxPyMake_wxObject(&a);                              \
              PyObject* ro = wxPyConstructObject((void*)&b, wxT("wxRect"), 0);    \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOi)", obj, ro, (int)c)); \
              Py_DECREF(obj);                                                     \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
      }                                                                           \
  
  //---------------------------------------------------------------------------
      }                                                                           \
  
  //---------------------------------------------------------------------------
@@ -2342,14 +2358,14 @@ extern wxPyApp *wxPythonApp;
  #define IMP_PYCALLBACK__DCRECTSIZET_const(CLASS, PCLASS, CBNAME)                \
      void CLASS::CBNAME(wxDC& a, const wxRect& b, size_t c) const {              \
          bool found;                                                             \
  #define IMP_PYCALLBACK__DCRECTSIZET_const(CLASS, PCLASS, CBNAME)                \
      void CLASS::CBNAME(wxDC& a, const wxRect& b, size_t c) const {              \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* obj = wxPyMake_wxObject(&a);                              \
              PyObject* ro = wxPyConstructObject((void*)&b, wxT("wxRect"), 0);    \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOi)", obj, ro, (int)c)); \
              Py_DECREF(obj);                                                     \
          }                                                                       \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* obj = wxPyMake_wxObject(&a);                              \
              PyObject* ro = wxPyConstructObject((void*)&b, wxT("wxRect"), 0);    \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOi)", obj, ro, (int)c)); \
              Py_DECREF(obj);                                                     \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              PCLASS::CBNAME(a,b,c);                                              \
      }                                                                           \
          if (! found)                                                            \
              PCLASS::CBNAME(a,b,c);                                              \
      }                                                                           \
@@ -2368,7 +2384,7 @@ extern wxPyApp *wxPythonApp;
      wxString CLASS::CBNAME(size_t a) const {                                    \
          wxString rval;                                                          \
          bool found;                                                             \
      wxString CLASS::CBNAME(size_t a) const {                                    \
          wxString rval;                                                          \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(l)",a));     \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(l)",a));     \
@@ -2377,7 +2393,7 @@ extern wxPyApp *wxPythonApp;
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a);                                           \
          return rval;                                                            \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a);                                           \
          return rval;                                                            \
@@ -2395,7 +2411,7 @@ extern wxPyApp *wxPythonApp;
      wxString CLASS::CBNAME(size_t a) const {                                    \
          wxString rval;                                                          \
          bool found;                                                             \
      wxString CLASS::CBNAME(size_t a) const {                                    \
          wxString rval;                                                          \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(l)",a));     \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(l)",a));     \
@@ -2404,7 +2420,7 @@ extern wxPyApp *wxPythonApp;
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \
          return rval;                                                            \
      }                                                                           \
  
          return rval;                                                            \
      }                                                                           \