Fixed a bunch of embarassing reference leaks

[wxWidgets.git] / wxPython / src / helpers.h

diff --git a/wxPython/src/helpers.h b/wxPython/src/helpers.h
index 38dd0cddc6c1e88579ccbfb86f3c9a951499a67c..fc20239de3d46879c48208248d6024607da20278 100644 (file)
--- a/wxPython/src/helpers.h
+++ b/wxPython/src/helpers.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////
 // Name:        helpers.h
 ////////////////////////////////////////////////////////////////////////////
 // Name:        helpers.h

-// Purpose:     Helper functions/classes for the wxPython extenaion module
+// Purpose:     Helper functions/classes for the wxPython extension module

 //
 // Author:      Robin Dunn
 //
 //
 // Author:      Robin Dunn
 //


@@ -16,42 +16,18 @@
 #include <wx/wx.h>
 
 
 #include <wx/wx.h>
 
 

-//----------------------------------------------------------------------
-
-// if we want to handle threads and Python threads are available...
-#if defined(WXP_USE_THREAD) && defined(WITH_THREAD)
-
-#define WXP_WITH_THREAD
-#define wxPy_BEGIN_ALLOW_THREADS  Py_BEGIN_ALLOW_THREADS
-#define wxPy_END_ALLOW_THREADS    Py_END_ALLOW_THREADS
-
-#else  // no Python threads...
-#undef WXP_WITH_THREAD
-#define wxPy_BEGIN_ALLOW_THREADS
-#define wxPy_END_ALLOW_THREADS
-#endif
-
-

 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
 

-#if defined(__WXMSW__)
-#       define HELPEREXPORT __declspec(dllexport)
-#else
-#       define HELPEREXPORT
-#endif
-

 typedef unsigned char byte;
 
 typedef unsigned char byte;
 

-//----------------------------------------------------------------------

 
 class wxPyApp: public wxApp
 {
 public:
     wxPyApp();
     ~wxPyApp();
 
 class wxPyApp: public wxApp
 {
 public:
     wxPyApp();
     ~wxPyApp();

-    int  MainLoop(void);
-    bool OnInit(void);
-//#    void AfterMainLoop(void);
+    bool OnInit();
+    int  MainLoop();

 };
 
 extern wxPyApp *wxPythonApp;
 };
 
 extern wxPyApp *wxPythonApp;


@@ -62,47 +38,87 @@ void      __wxPreStart();
 PyObject* __wxStart(PyObject*, PyObject* args);
 void      __wxCleanup();
 
 PyObject* __wxStart(PyObject*, PyObject* args);
 void      __wxCleanup();
 

-extern PyObject* wxPython_dict;
+//extern PyObject* wxPython_dict;

 PyObject* __wxSetDictionary(PyObject*, PyObject* args);
 
 void wxPyEventThunker(wxObject*, wxEvent& event);
 
 PyObject* __wxSetDictionary(PyObject*, PyObject* args);
 
 void wxPyEventThunker(wxObject*, wxEvent& event);
 

-HELPEREXPORT PyObject* wxPyConstructObject(void* ptr, const char* className);
-HELPEREXPORT bool wxPyRestoreThread();
-HELPEREXPORT void wxPySaveThread(bool doSave);
-HELPEREXPORT PyObject* wxPy_ConvertList(wxListBase* list, const char* className);
-HELPEREXPORT long wxPyGetWinHandle(wxWindow* win);
+PyObject* wxPyConstructObject(void* ptr,
+                              const wxString& className,
+                              int setThisOwn=0);
+PyObject* wxPyConstructObject(void* ptr,
+                              const wxString& className,
+                              PyObject* klass,
+                              int setThisOwn=0);
+
+PyObject* wx2PyString(const wxString& src);
+wxString  Py2wxString(PyObject* source);
+
+PyObject* wxPyClassExists(const wxString& className);
+PyObject* wxPyMake_wxObject(wxObject* source, bool checkEvtHandler=TRUE);
+PyObject* wxPyMake_wxSizer(wxSizer* source);
+void      wxPyPtrTypeMap_Add(const char* commonName, const char* ptrName);
+
+PyObject* wxPy_ConvertList(wxListBase* list, const char* className);
+long      wxPyGetWinHandle(wxWindow* win);

 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

-class wxPyUserData : public wxObject {
-public:
-    wxPyUserData(PyObject* obj) { m_obj = obj; Py_INCREF(m_obj); }
-    ~wxPyUserData() {
-        bool doSave = wxPyRestoreThread();
-        Py_DECREF(m_obj);
-        wxPySaveThread(doSave);
-    }
-    PyObject* m_obj;
-};
+// if we want to handle threads and Python threads are available...
+#if defined(WXP_USE_THREAD) && defined(WITH_THREAD)
+#define WXP_WITH_THREAD
+#else  // no Python threads...
+#undef WXP_WITH_THREAD
+#endif
+
+
+// For Python --> C++
+PyThreadState* wxPyBeginAllowThreads();
+void           wxPyEndAllowThreads(PyThreadState* state);
+
+// For C++ --> Python
+void wxPyBeginBlockThreads();
+void wxPyEndBlockThreads();

 
 //----------------------------------------------------------------------
 // These are helpers used by the typemaps
 
 
 //----------------------------------------------------------------------
 // These are helpers used by the typemaps
 

-HELPEREXPORT byte* byte_LIST_helper(PyObject* source);
-HELPEREXPORT int* int_LIST_helper(PyObject* source);
-HELPEREXPORT long* long_LIST_helper(PyObject* source);
-HELPEREXPORT char** string_LIST_helper(PyObject* source);
-HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source);
-HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source);
-HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source);
-HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
-
-HELPEREXPORT bool wxSize_helper(PyObject* source, wxSize** obj);
-HELPEREXPORT bool wxPoint_helper(PyObject* source, wxPoint** obj);
-HELPEREXPORT bool wxRealPoint_helper(PyObject* source, wxRealPoint** obj);
-HELPEREXPORT bool wxRect_helper(PyObject* source, wxRect** obj);
-HELPEREXPORT bool wxColour_helper(PyObject* source, wxColour** obj);
+wxString* wxString_in_helper(PyObject* source);
+
+byte* byte_LIST_helper(PyObject* source);
+int* int_LIST_helper(PyObject* source);
+long* long_LIST_helper(PyObject* source);
+char** string_LIST_helper(PyObject* source);
+wxPoint* wxPoint_LIST_helper(PyObject* source, int* npoints);
+wxBitmap** wxBitmap_LIST_helper(PyObject* source);
+wxString* wxString_LIST_helper(PyObject* source);
+wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
+wxPen** wxPen_LIST_helper(PyObject* source);
+
+bool wxSize_helper(PyObject* source, wxSize** obj);
+bool wxPoint_helper(PyObject* source, wxPoint** obj);
+bool wxRealPoint_helper(PyObject* source, wxRealPoint** obj);
+bool wxRect_helper(PyObject* source, wxRect** obj);
+bool wxColour_helper(PyObject* source, wxColour** obj);
+
+//----------------------------------------------------------------------
+// Other helpful stuff
+
+#if PYTHON_API_VERSION < 1009
+#define PySequence_Fast_GET_ITEM(o, i) \
+     (PyList_Check(o) ? PyList_GET_ITEM(o, i) : PyTuple_GET_ITEM(o, i))
+#endif
+
+bool _2int_seq_helper(PyObject* source, int* i1, int* i2);
+bool _4int_seq_helper(PyObject* source, int* i1, int* i2, int* i3, int* i4);
+
+
+PyObject* wxArrayString2PyList_helper(const wxArrayString& arr);
+PyObject* wxArrayInt2PyList_helper(const wxArrayInt& arr);
+
+#define RETURN_NONE()                 { Py_INCREF(Py_None); return Py_None; }
+#define DECLARE_DEF_STRING(name)      static const wxString wxPy##name(wx##name)
+#define DECLARE_DEF_STRING2(name,val) static const wxString wxPy##name(val)

 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 


@@ -118,13 +134,6 @@ extern "C" char *SWIG_GetPtrObj(PyObject *obj, void **ptr, char *type);
 # pragma warning(disable:4190)
 #endif
 
 # pragma warning(disable:4190)
 #endif
 

-
-
-// Non-const versions to keep SWIG happy.
-extern wxPoint  wxPyDefaultPosition;
-extern wxSize   wxPyDefaultSize;
-extern wxString wxPyEmptyStr;
-

 //----------------------------------------------------------------------
 
 class wxPyCallback : public wxObject {
 //----------------------------------------------------------------------
 
 class wxPyCallback : public wxObject {


@@ -153,42 +162,6 @@ private:
 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------

-
-
-
-
-//---------------------------------------------------------------------------
-// This class holds an instance of a Python Shadow Class object and assists
-// with looking up and invoking Python callback methods from C++ virtual
-// method redirections.  For all classes which have virtuals which should be
-// overridable in wxPython, a new subclass is created that contains a
-// wxPyCallbackHelper.
-//
-// TODO: This class should be combined with wxPyCallback defined above.
-//
-
-class HELPEREXPORT wxPyCallbackHelper {
-public:
-    wxPyCallbackHelper();
-    ~wxPyCallbackHelper();
-
-    wxPyCallbackHelper(const wxPyCallbackHelper& other);
-
-    void        setSelf(PyObject* self, PyObject* _class, int incref=TRUE);
-
-    bool        findCallback(const wxString& name) const;
-    int         callCallback(PyObject* argTuple) const;
-    PyObject*   callCallbackObj(PyObject* argTuple) const;
-
-private:
-    PyObject*   m_self;
-    PyObject*   m_class;
-    PyObject*   m_lastFound;
-    int         m_incRef;
-};
-
-
-//---------------------------------------------------------------------------

 //---------------------------------------------------------------------------
 // These Event classes can be derived from in Python and passed through the
 // event system without loosing anything.  They do this by keeping a reference
 //---------------------------------------------------------------------------
 // These Event classes can be derived from in Python and passed through the
 // event system without loosing anything.  They do this by keeping a reference


@@ -210,24 +183,210 @@ protected:
 
 
 class wxPyEvent : public wxEvent, public wxPyEvtSelfRef {
 
 
 class wxPyEvent : public wxEvent, public wxPyEvtSelfRef {

-    DECLARE_DYNAMIC_CLASS(wxPyEvent)
+    DECLARE_ABSTRACT_CLASS(wxPyEvent)

 public:
     wxPyEvent(int id=0);
 public:
     wxPyEvent(int id=0);

+    wxPyEvent(const wxPyEvent& evt);

     ~wxPyEvent();
 
     ~wxPyEvent();
 

-    void CopyObject(wxObject& dest) const;
+    virtual wxEvent* Clone() const { return new wxPyEvent(*this); }

 };
 
 
 class wxPyCommandEvent : public wxCommandEvent, public wxPyEvtSelfRef {
 };
 
 
 class wxPyCommandEvent : public wxCommandEvent, public wxPyEvtSelfRef {

-    DECLARE_DYNAMIC_CLASS(wxPyCommandEvent)
+    DECLARE_ABSTRACT_CLASS(wxPyCommandEvent)

 public:
     wxPyCommandEvent(wxEventType commandType = wxEVT_NULL, int id=0);
 public:
     wxPyCommandEvent(wxEventType commandType = wxEVT_NULL, int id=0);

+    wxPyCommandEvent(const wxPyCommandEvent& evt);

     ~wxPyCommandEvent();
 
     ~wxPyCommandEvent();
 

-    void CopyObject(wxObject& dest) const;
+    virtual wxEvent* Clone() const { return new wxPyCommandEvent(*this); }
+};
+
+
+
+//----------------------------------------------------------------------
+// Forward decalre a few things used in the exported API
+class wxPyClientData;
+class wxPyUserData;
+class wxPyOORClientData;
+
+void wxPyClientData_dtor(wxPyClientData* self);
+void wxPyUserData_dtor(wxPyUserData* self);
+void wxPyOORClientData_dtor(wxPyOORClientData* self);
+
+
+//---------------------------------------------------------------------------
+// Export a C API in a struct.  Other modules will be able to load this from
+// the wxc module and will then have safe access to these functions, even if
+// in another shared library.
+
+class wxPyCallbackHelper;
+
+struct wxPyCoreAPI {
+
+    void        (*p_SWIG_MakePtr)(char*, void*, char*);
+    char*       (*p_SWIG_GetPtr)(char*, void**, char*);
+    char*       (*p_SWIG_GetPtrObj)(PyObject*, void**, char*);
+    void        (*p_SWIG_RegisterMapping)(char*, char*, void *(*cast)(void *));
+    void        (*p_SWIG_addvarlink)(PyObject*, char*, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p));
+    PyObject*   (*p_SWIG_newvarlink)(void);
+
+    PyThreadState* (*p_wxPyBeginAllowThreads)();
+    void           (*p_wxPyEndAllowThreads)(PyThreadState* state);
+    void        (*p_wxPyBeginBlockThreads)();
+    void        (*p_wxPyEndBlockThreads)();
+
+    PyObject*   (*p_wxPyConstructObject)(void *, const wxString&, int);
+    PyObject*   (*p_wxPy_ConvertList)(wxListBase* list, const char* className);
+
+    wxString*   (*p_wxString_in_helper)(PyObject* source);
+    wxString    (*p_Py2wxString)(PyObject* source);
+    PyObject*   (*p_wx2PyString)(const wxString& src);
+
+    byte*       (*p_byte_LIST_helper)(PyObject* source);
+    int*        (*p_int_LIST_helper)(PyObject* source);
+    long*       (*p_long_LIST_helper)(PyObject* source);
+    char**      (*p_string_LIST_helper)(PyObject* source);
+    wxPoint*    (*p_wxPoint_LIST_helper)(PyObject* source, int* npoints);
+    wxBitmap**  (*p_wxBitmap_LIST_helper)(PyObject* source);
+    wxString*   (*p_wxString_LIST_helper)(PyObject* source);
+    wxAcceleratorEntry*   (*p_wxAcceleratorEntry_LIST_helper)(PyObject* source);
+
+    bool        (*p_wxSize_helper)(PyObject* source, wxSize** obj);
+    bool        (*p_wxPoint_helper)(PyObject* source, wxPoint** obj);
+    bool        (*p_wxRealPoint_helper)(PyObject* source, wxRealPoint** obj);
+    bool        (*p_wxRect_helper)(PyObject* source, wxRect** obj);
+    bool        (*p_wxColour_helper)(PyObject* source, wxColour** obj);
+
+    void        (*p_wxPyCBH_setCallbackInfo)(wxPyCallbackHelper& cbh, PyObject* self, PyObject* klass, int incref);
+    bool        (*p_wxPyCBH_findCallback)(const wxPyCallbackHelper& cbh, const char* name);
+    int         (*p_wxPyCBH_callCallback)(const wxPyCallbackHelper& cbh, PyObject* argTuple);
+    PyObject*   (*p_wxPyCBH_callCallbackObj)(const wxPyCallbackHelper& cbh, PyObject* argTuple);
+    void        (*p_wxPyCBH_delete)(wxPyCallbackHelper* cbh);
+
+    PyObject*   (*p_wxPyClassExists)(const wxString& className);
+    PyObject*   (*p_wxPyMake_wxObject)(wxObject* source, bool checkEvtHandler);
+    PyObject*   (*p_wxPyMake_wxSizer)(wxSizer* source);
+    void        (*p_wxPyPtrTypeMap_Add)(const char* commonName, const char* ptrName);
+    PyObject*   (*p_wxArrayString2PyList_helper)(const wxArrayString& arr);
+    PyObject*   (*p_wxArrayInt2PyList_helper)(const wxArrayInt& arr);
+
+    void        (*p_wxPyClientData_dtor)(wxPyClientData*);
+    void        (*p_wxPyUserData_dtor)(wxPyUserData*);
+    void        (*p_wxPyOORClientData_dtor)(wxPyOORClientData*);

 };
 
 };
 

+#ifdef wxPyUSE_EXPORT
+// Notice that this is static, not extern.  This is by design, each module
+// needs one, but doesn't have to use it.
+static wxPyCoreAPI* wxPyCoreAPIPtr = NULL;
+#endif
+
+
+//---------------------------------------------------------------------------
+
+
+class wxPyUserData : public wxObject {
+public:
+    wxPyUserData(PyObject* obj) {
+        m_obj = obj;
+        Py_INCREF(m_obj);
+    }
+
+    ~wxPyUserData() {
+#ifdef wxPyUSE_EXPORT
+        wxPyCoreAPIPtr->p_wxPyUserData_dtor(this);
+#else
+        wxPyUserData_dtor(this);
+#endif
+    }
+    PyObject* m_obj;
+};
+
+
+class wxPyClientData : public wxClientData {
+public:
+    wxPyClientData(PyObject* obj) {
+        m_obj = obj;
+        Py_INCREF(m_obj);
+    }
+
+    ~wxPyClientData() {
+#ifdef wxPyUSE_EXPORT
+        wxPyCoreAPIPtr->p_wxPyClientData_dtor(this);
+#else
+        wxPyClientData_dtor(this);
+#endif
+    }
+    PyObject* m_obj;
+};
+
+
+class wxPyOORClientData : public wxPyClientData {
+public:
+    wxPyOORClientData(PyObject* obj)
+        : wxPyClientData(obj) {}
+
+    ~wxPyOORClientData() {
+#ifdef wxPyUSE_EXPORT
+        wxPyCoreAPIPtr->p_wxPyOORClientData_dtor(this);
+#else
+        wxPyOORClientData_dtor(this);
+#endif
+    }
+};
+
+//---------------------------------------------------------------------------
+// This class holds an instance of a Python Shadow Class object and assists
+// with looking up and invoking Python callback methods from C++ virtual
+// method redirections.  For all classes which have virtuals which should be
+// overridable in wxPython, a new subclass is created that contains a
+// wxPyCallbackHelper.
+//
+
+class wxPyCallbackHelper {
+public:
+    wxPyCallbackHelper(const wxPyCallbackHelper& other);
+
+    wxPyCallbackHelper() {
+        m_class = NULL;
+        m_self = NULL;
+        m_lastFound = NULL;
+        m_incRef = FALSE;
+    }
+
+    ~wxPyCallbackHelper() {
+#ifdef wxPyUSE_EXPORT
+        wxPyCoreAPIPtr->p_wxPyCBH_delete(this);
+#else
+        wxPyCBH_delete(this);
+#endif
+    }
+
+    void        setSelf(PyObject* self, PyObject* klass, int incref=TRUE);
+    bool        findCallback(const char* name) const;
+    int         callCallback(PyObject* argTuple) const;
+    PyObject*   callCallbackObj(PyObject* argTuple) const;
+
+private:
+    PyObject*   m_self;
+    PyObject*   m_class;
+    PyObject*   m_lastFound;
+    int         m_incRef;
+
+    friend      void wxPyCBH_delete(wxPyCallbackHelper* cbh);
+};
+
+
+void wxPyCBH_setCallbackInfo(wxPyCallbackHelper& cbh, PyObject* self, PyObject* klass, int incref);
+bool wxPyCBH_findCallback(const wxPyCallbackHelper& cbh, const char* name);
+int  wxPyCBH_callCallback(const wxPyCallbackHelper& cbh, PyObject* argTuple);
+PyObject* wxPyCBH_callCallbackObj(const wxPyCallbackHelper& cbh, PyObject* argTuple);
+void wxPyCBH_delete(wxPyCallbackHelper* cbh);
+
+
+

 
 //---------------------------------------------------------------------------
 // These macros are used to implement the virtual methods that should
 
 //---------------------------------------------------------------------------
 // These macros are used to implement the virtual methods that should


@@ -236,10 +395,10 @@ public:
 //---------------------------------------------------------------------------
 
 #define PYPRIVATE                                                       \
 //---------------------------------------------------------------------------
 
 #define PYPRIVATE                                                       \

-    void _setSelf(PyObject* self, PyObject* _class, int incref=1) {     \
-        m_myInst.setSelf(self, _class, incref);                         \
+    void _setCallbackInfo(PyObject* self, PyObject* _class, int incref=1) {     \
+        wxPyCBH_setCallbackInfo(m_myInst, self, _class, incref);                \

     }                                                                   \
     }                                                                   \

-    private: wxPyCallbackHelper m_myInst;
+    private: wxPyCallbackHelper m_myInst

 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 


@@ -248,17 +407,18 @@ public:
     void base_##CBNAME();
 
 
     void base_##CBNAME();
 
 

-#define IMP_PYCALLBACK__(CLASS, PCLASS, CBNAME)         \
-    void CLASS::CBNAME() {                              \
-        bool doSave = wxPyRestoreThread();              \
-        if (m_myInst.findCallback(#CBNAME))             \
-            m_myInst.callCallback(Py_BuildValue("()")); \
-        else                                            \
-            PCLASS::CBNAME();                           \
-        wxPySaveThread(doSave);                         \
-    }                                                   \
-    void CLASS::base_##CBNAME() {                       \
-        PCLASS::CBNAME();                               \
+#define IMP_PYCALLBACK__(CLASS, PCLASS, CBNAME)                         \
+    void CLASS::CBNAME() {                                              \
+        bool found;                                                     \
+        wxPyBeginBlockThreads();                    \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))          \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));        \
+        wxPyEndBlockThreads();                                     \
+        if (! found)                                                    \
+            PCLASS::CBNAME();                                           \
+    }                                                                   \
+    void CLASS::base_##CBNAME() {                                       \
+        PCLASS::CBNAME();                                               \

     }
 
 //---------------------------------------------------------------------------
     }
 
 //---------------------------------------------------------------------------


@@ -270,13 +430,13 @@ public:
 
 #define IMP_PYCALLBACK_BOOL_INTINT(CLASS, PCLASS, CBNAME)               \
     bool CLASS::CBNAME(int a, int b) {                                  \
 
 #define IMP_PYCALLBACK_BOOL_INTINT(CLASS, PCLASS, CBNAME)               \
     bool CLASS::CBNAME(int a, int b) {                                  \

-        bool rval;                                                      \
-        bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            rval = m_myInst.callCallback(Py_BuildValue("(ii)",a,b));    \
-        else                                                            \
+        bool rval=FALSE, found;                                         \
+        wxPyBeginBlockThreads();                    \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))          \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b));    \
+        wxPyEndBlockThreads();                                     \
+        if (! found)                                                    \

             rval = PCLASS::CBNAME(a,b);                                 \
             rval = PCLASS::CBNAME(a,b);                                 \

-        wxPySaveThread(doSave);                                         \

         return rval;                                                    \
     }                                                                   \
     bool CLASS::base_##CBNAME(int a, int b) {                           \
         return rval;                                                    \
     }                                                                   \
     bool CLASS::base_##CBNAME(int a, int b) {                           \


@@ -285,6 +445,154 @@ public:
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

+#define DEC_PYCALLBACK_VOID_INTINT(CBNAME)                      \
+    void CBNAME(int a, int b);                                  \
+    void base_##CBNAME(int a, int b);
+
+
+#define IMP_PYCALLBACK_VOID_INTINT(CLASS, PCLASS, CBNAME)               \
+    void CLASS::CBNAME(int a, int b) {                                  \
+        bool found;                                                     \
+        wxPyBeginBlockThreads();                                        \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))          \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b));  \
+        wxPyEndBlockThreads();                                          \
+        if (! found)                                                    \
+            PCLASS::CBNAME(a,b);                                        \
+    }                                                                   \
+    void CLASS::base_##CBNAME(int a, int b) {                           \
+        PCLASS::CBNAME(a,b);                                            \
+    }
+
+//---------------------------------------------------------------------------
+
+#define DEC_PYCALLBACK_VOID_INT4(CBNAME)                                \
+    void CBNAME(int a, int b, int c, int d);                            \
+    void base_##CBNAME(int a, int b, int c, int d);
+
+
+#define IMP_PYCALLBACK_VOID_INT4(CLASS, PCLASS, CBNAME)                 \
+    void CLASS::CBNAME(int a, int b, int c, int d) {                    \
+        bool found;                                                     \
+        wxPyBeginBlockThreads();                                        \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))          \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiii)",a,b,c,d));  \
+        wxPyEndBlockThreads();                                          \
+        if (! found)                                                    \
+            PCLASS::CBNAME(a,b,c,d);                                    \
+    }                                                                   \
+    void CLASS::base_##CBNAME(int a, int b, int c, int d) {             \
+        PCLASS::CBNAME(a,b,c,d);                                        \
+    }
+
+//---------------------------------------------------------------------------
+#define DEC_PYCALLBACK_VOID_INT5(CBNAME)                                \
+    void CBNAME(int a, int b, int c, int d, int e);                     \
+    void base_##CBNAME(int a, int b, int c, int d, int e);
+
+
+#define IMP_PYCALLBACK_VOID_INT5(CLASS, PCLASS, CBNAME)                 \
+    void CLASS::CBNAME(int a, int b, int c, int d, int e) {             \
+        bool found;                                                     \
+        wxPyBeginBlockThreads();                                        \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))          \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiiii)",a,b,c,d,e));  \
+        wxPyEndBlockThreads();                                          \
+        if (! found)                                                    \
+            PCLASS::CBNAME(a,b,c,d,e);                                  \
+    }                                                                   \
+    void CLASS::base_##CBNAME(int a, int b, int c, int d, int e) {      \
+        PCLASS::CBNAME(a,b,c,d,e);                                      \
+    }
+
+//---------------------------------------------------------------------------
+
+#define DEC_PYCALLBACK_VOID_INTPINTP_const(CBNAME)                              \
+    void CBNAME(int* a, int* b) const;                                          \
+    void base_##CBNAME(int* a, int* b) const;
+
+
+#define IMP_PYCALLBACK_VOID_INTPINTP_const(CLASS, PCLASS, CBNAME)               \
+    void CLASS::CBNAME(int* a, int* b) const {                                  \
+        const char* errmsg = #CBNAME " should return a 2-tuple of integers.";   \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                                                \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
+            PyObject* ro;                                                       \
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));        \
+            if (ro) {                                                           \
+                if (PySequence_Check(ro) && PyObject_Length(ro) == 2) {         \
+                    PyObject* o1 = PySequence_GetItem(ro, 0);                   \
+                    PyObject* o2 = PySequence_GetItem(ro, 1);                   \
+                    if (PyNumber_Check(o1) && PyNumber_Check(o2)) {             \
+                        *a = PyInt_AsLong(o1); *b = PyInt_AsLong(o2);           \
+                    }                                                           \
+                    else                                                        \
+                        PyErr_SetString(PyExc_TypeError, errmsg);               \
+                    Py_DECREF(o1);                                              \
+                    Py_DECREF(o2);                                              \
+                }                                                               \
+                else {                                                          \
+                    PyErr_SetString(PyExc_TypeError, errmsg);                   \
+                }                                                               \
+                Py_DECREF(ro);                                                  \
+            }                                                                   \
+        }                                                                       \
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \
+            PCLASS::CBNAME(a,b);                                                \
+    }                                                                           \
+    void CLASS::base_##CBNAME(int* a, int* b) const {                           \
+        PCLASS::CBNAME(a,b);                                                    \
+    }
+
+
+//---------------------------------------------------------------------------
+
+#define DEC_PYCALLBACK_SIZE_const(CBNAME)                                       \
+    wxSize CBNAME() const;                                                      \
+    wxSize base_##CBNAME() const;
+
+
+#define IMP_PYCALLBACK_SIZE_const(CLASS, PCLASS, CBNAME)                        \
+    wxSize CLASS::CBNAME() const {                                              \
+        const char* errmsg = #CBNAME " should return a 2-tuple of integers.";   \
+        bool found; wxSize rval(0,0);                                           \
+        wxPyBeginBlockThreads();                                                \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
+            PyObject* ro;                                                       \
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));        \
+            if (ro) {                                                           \
+                if (PySequence_Check(ro) && PyObject_Length(ro) == 2) {         \
+                    PyObject* o1 = PySequence_GetItem(ro, 0);                   \
+                    PyObject* o2 = PySequence_GetItem(ro, 1);                   \
+                    if (PyNumber_Check(o1) && PyNumber_Check(o2)) {             \
+                        rval = wxSize(PyInt_AsLong(o1), PyInt_AsLong(o2));      \
+                    }                                                           \
+                    else                                                        \
+                        PyErr_SetString(PyExc_TypeError, errmsg);               \
+                    Py_DECREF(o1);                                              \
+                    Py_DECREF(o2);                                              \
+                }                                                               \
+                else {                                                          \
+                    PyErr_SetString(PyExc_TypeError, errmsg);                   \
+                }                                                               \
+                Py_DECREF(ro);                                                  \
+            }                                                                   \
+        }                                                                       \
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \
+            return PCLASS::CBNAME();                                            \
+        else                                                                    \
+            return rval;                                                        \
+    }                                                                           \
+    wxSize CLASS::base_##CBNAME() const {                                       \
+        return PCLASS::CBNAME();                                                \
+    }
+
+
+//---------------------------------------------------------------------------
+

 #define DEC_PYCALLBACK_BOOL_INT(CBNAME)                         \
     bool CBNAME(int a);                                         \
     bool base_##CBNAME(int a);
 #define DEC_PYCALLBACK_BOOL_INT(CBNAME)                         \
     bool CBNAME(int a);                                         \
     bool base_##CBNAME(int a);


@@ -292,13 +600,13 @@ public:
 
 #define IMP_PYCALLBACK_BOOL_INT(CLASS, PCLASS, CBNAME)                  \
     bool CLASS::CBNAME(int a) {                                         \
 
 #define IMP_PYCALLBACK_BOOL_INT(CLASS, PCLASS, CBNAME)                  \
     bool CLASS::CBNAME(int a) {                                         \

-        bool rval;                                                      \
-        bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            rval = m_myInst.callCallback(Py_BuildValue("(i)",a));       \
-        else                                                            \
+        bool rval=FALSE, found;                                         \
+        wxPyBeginBlockThreads();                                        \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))          \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)",a));\
+        wxPyEndBlockThreads();                                          \
+        if (! found)                                                    \

             rval = PCLASS::CBNAME(a);                                   \
             rval = PCLASS::CBNAME(a);                                   \

-        wxPySaveThread(doSave);                                         \

         return rval;                                                    \
     }                                                                   \
     bool CLASS::base_##CBNAME(int a) {                                  \
         return rval;                                                    \
     }                                                                   \
     bool CLASS::base_##CBNAME(int a) {                                  \


@@ -313,12 +621,12 @@ public:
 
 #define IMP_PYCALLBACK_BOOL_INT_pure(CLASS, PCLASS, CBNAME)             \
     bool CLASS::CBNAME(int a) {                                         \
 
 #define IMP_PYCALLBACK_BOOL_INT_pure(CLASS, PCLASS, CBNAME)             \
     bool CLASS::CBNAME(int a) {                                         \

-        bool rval;                                                      \
-        bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            rval = m_myInst.callCallback(Py_BuildValue("(i)",a));       \
+        bool rval=FALSE;                                                \
+        wxPyBeginBlockThreads();                    \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME))                    \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)",a));       \

         else rval = FALSE;                                              \
         else rval = FALSE;                                              \

-        wxPySaveThread(doSave);                                         \
+        wxPyEndBlockThreads();                                     \

         return rval;                                                    \
     }
 
         return rval;                                                    \
     }
 


@@ -330,18 +638,21 @@ public:
     void base_##CBNAME(wxDC& a);
 
 
     void base_##CBNAME(wxDC& a);
 
 

-#define IMP_PYCALLBACK__DC(CLASS, PCLASS, CBNAME)               \
-    void CLASS::CBNAME(wxDC& a) {                               \
-        bool doSave = wxPyRestoreThread();                      \
-        if (m_myInst.findCallback(#CBNAME))                     \
-            m_myInst.callCallback(Py_BuildValue("(O)",          \
-                            wxPyConstructObject(&a, "wxDC")));  \
-        else                                                    \
-            PCLASS::CBNAME(a);                                  \
-        wxPySaveThread(doSave);                                 \
-    }                                                           \
-    void CLASS::base_##CBNAME(wxDC& a) {                        \
-        PCLASS::CBNAME(a);                                      \
+#define IMP_PYCALLBACK__DC(CLASS, PCLASS, CBNAME)                       \
+    void CLASS::CBNAME(wxDC& a) {                                       \
+        bool found;                                                     \
+        wxPyBeginBlockThreads();                    \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {        \
+            PyObject* obj = wxPyMake_wxObject(&a);                      \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj));  \
+            Py_DECREF(obj);                                             \
+        }                                                               \
+        wxPyEndBlockThreads();                                     \
+        if (! found)                                                    \
+            PCLASS::CBNAME(a);                                          \
+    }                                                                   \
+    void CLASS::base_##CBNAME(wxDC& a) {                                \
+        PCLASS::CBNAME(a);                                              \

     }
 
 
     }
 
 


@@ -355,13 +666,16 @@ public:
 
 #define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME)                   \
     void CLASS::CBNAME(wxDC& a, bool b) {                               \
 
 #define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME)                   \
     void CLASS::CBNAME(wxDC& a, bool b) {                               \

-        bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            m_myInst.callCallback(Py_BuildValue("(Oi)",                 \
-                            wxPyConstructObject(&a, "wxDC"), (int)b));  \
-        else                                                            \
+        bool found;                                                     \
+        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);                                             \
+        }                                                               \
+        wxPyEndBlockThreads();                                     \
+        if (! found)                                                    \

             PCLASS::CBNAME(a, b);                                       \
             PCLASS::CBNAME(a, b);                                       \

-        wxPySaveThread(doSave);                                         \

     }                                                                   \
     void CLASS::base_##CBNAME(wxDC& a, bool b) {                        \
         PCLASS::CBNAME(a, b);                                           \
     }                                                                   \
     void CLASS::base_##CBNAME(wxDC& a, bool b) {                        \
         PCLASS::CBNAME(a, b);                                           \


@@ -376,13 +690,16 @@ public:
 
 #define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME)                   \
     void CLASS::CBNAME(wxDC& a, bool b) {                               \
 
 #define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME)                   \
     void CLASS::CBNAME(wxDC& a, bool b) {                               \

-        bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            m_myInst.callCallback(Py_BuildValue("(Oi)",                 \
-                            wxPyConstructObject(&a, "wxDC"), (int)b));  \
-        else                                                            \
+        bool found;                                                     \
+        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);                                             \
+        }                                                               \
+        wxPyEndBlockThreads();                                     \
+        if (! found)                                                    \

             PCLASS::CBNAME(a, b);                                       \
             PCLASS::CBNAME(a, b);                                       \

-                wxPySaveThread(doSave);                                 \

     }                                                                   \
     void CLASS::base_##CBNAME(wxDC& a, bool b) {                        \
         PCLASS::CBNAME(a, b);                                           \
     }                                                                   \
     void CLASS::base_##CBNAME(wxDC& a, bool b) {                        \
         PCLASS::CBNAME(a, b);                                           \


@@ -395,17 +712,18 @@ public:
     void base_##CBNAME(double a, double b);
 
 
     void base_##CBNAME(double a, double b);
 
 

-#define IMP_PYCALLBACK__2DBL(CLASS, PCLASS, CBNAME)             \
-    void CLASS::CBNAME(double a, double b) {                    \
-        bool doSave = wxPyRestoreThread();                      \
-        if (m_myInst.findCallback(#CBNAME))                     \
-            m_myInst.callCallback(Py_BuildValue("(dd)",a,b));   \
-        else                                                    \
-            PCLASS::CBNAME(a, b);                               \
-        wxPySaveThread(doSave);                                 \
-    }                                                           \
-    void CLASS::base_##CBNAME(double a, double b) {             \
-        PCLASS::CBNAME(a, b);                                   \
+#define IMP_PYCALLBACK__2DBL(CLASS, PCLASS, CBNAME)                     \
+    void CLASS::CBNAME(double a, double b) {                            \
+        bool found;                                                     \
+        wxPyBeginBlockThreads();                    \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))          \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(dd)",a,b));  \
+        wxPyEndBlockThreads();                                     \
+        if (! found)                                                    \
+            PCLASS::CBNAME(a, b);                                       \
+    }                                                                   \
+    void CLASS::base_##CBNAME(double a, double b) {                     \
+        PCLASS::CBNAME(a, b);                                           \

     }
 
 //---------------------------------------------------------------------------
     }
 
 //---------------------------------------------------------------------------


@@ -417,13 +735,14 @@ public:
 
 #define IMP_PYCALLBACK__2DBL2INT(CLASS, PCLASS, CBNAME)                 \
     void CLASS::CBNAME(double a, double b, int c, int d) {              \
 
 #define IMP_PYCALLBACK__2DBL2INT(CLASS, PCLASS, CBNAME)                 \
     void CLASS::CBNAME(double a, double b, int c, int d) {              \

-        bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            m_myInst.callCallback(Py_BuildValue("(ddii)",               \
+        bool found;                                                     \
+        wxPyBeginBlockThreads();                    \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))          \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ddii)",      \

                                                        a,b,c,d));       \
                                                        a,b,c,d));       \

-        else                                                            \
+        wxPyEndBlockThreads();                                     \
+        if (! found)                                                    \

             PCLASS::CBNAME(a, b, c, d);                                 \
             PCLASS::CBNAME(a, b, c, d);                                 \

-        wxPySaveThread(doSave);                                         \

     }                                                                   \
     void CLASS::base_##CBNAME(double a, double b, int c, int d) {       \
         PCLASS::CBNAME(a, b, c, d);                                     \
     }                                                                   \
     void CLASS::base_##CBNAME(double a, double b, int c, int d) {       \
         PCLASS::CBNAME(a, b, c, d);                                     \


@@ -431,21 +750,23 @@ public:
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-#define DEC_PYCALLBACK__DC4DBLBOOL(CBNAME)                              \
+#define DEC_PYCALLBACK__DC4DBLBOOL(CBNAME)                                      \

     void CBNAME(wxDC& a, double b, double c, double d, double e, bool f);       \
     void base_##CBNAME(wxDC& a, double b, double c, double d, double e, bool f);
 
 
 #define IMP_PYCALLBACK__DC4DBLBOOL(CLASS, PCLASS, CBNAME)                               \
     void CLASS::CBNAME(wxDC& a, double b, double c, double d, double e, bool f) {       \
     void CBNAME(wxDC& a, double b, double c, double d, double e, bool f);       \
     void base_##CBNAME(wxDC& a, double b, double c, double d, double e, bool f);
 
 
 #define IMP_PYCALLBACK__DC4DBLBOOL(CLASS, PCLASS, CBNAME)                               \
     void CLASS::CBNAME(wxDC& a, double b, double c, double d, double e, bool f) {       \

-        bool doSave = wxPyRestoreThread();                                              \
-        if (m_myInst.findCallback(#CBNAME))                                             \
-            m_myInst.callCallback(Py_BuildValue("(Oddddi)",                             \
-                                   wxPyConstructObject(&a, "wxDC"),                     \
-                                              b, c, d, e, (int)f));                     \
-        else                                                                            \
+        bool found;                                                                     \
+        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);                                                             \
+        }                                                                               \
+        wxPyEndBlockThreads();                                                     \
+        if (! found)                                                                    \

             PCLASS::CBNAME(a, b, c, d, e, f);                                           \
             PCLASS::CBNAME(a, b, c, d, e, f);                                           \

-        wxPySaveThread(doSave);                                                         \

     }                                                                                   \
     void CLASS::base_##CBNAME(wxDC& a, double b, double c, double d, double e, bool f) {\
         PCLASS::CBNAME(a, b, c, d, e, f);                                               \
     }                                                                                   \
     void CLASS::base_##CBNAME(wxDC& a, double b, double c, double d, double e, bool f) {\
         PCLASS::CBNAME(a, b, c, d, e, f);                                               \


@@ -460,15 +781,17 @@ public:
 
 #define IMP_PYCALLBACK_BOOL_DC4DBLBOOL(CLASS, PCLASS, CBNAME)                           \
     bool CLASS::CBNAME(wxDC& a, double b, double c, double d, double e, bool f) {       \
 
 #define IMP_PYCALLBACK_BOOL_DC4DBLBOOL(CLASS, PCLASS, CBNAME)                           \
     bool CLASS::CBNAME(wxDC& a, double b, double c, double d, double e, bool f) {       \

-        bool doSave = wxPyRestoreThread();                                              \
-        bool rval;                                                                      \
-        if (m_myInst.findCallback(#CBNAME))                                             \
-            rval = m_myInst.callCallback(Py_BuildValue("(Oddddi)",                      \
-                                   wxPyConstructObject(&a, "wxDC"),                     \
-                                              b, c, d, e, (int)f));                     \
-        else                                                                            \
+        bool found;                                                                     \
+        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);                                                             \
+        }                                                                               \
+        wxPyEndBlockThreads();                                                     \
+        if (! found)                                                                    \

             rval = PCLASS::CBNAME(a, b, c, d, e, f);                                    \
             rval = PCLASS::CBNAME(a, b, c, d, e, f);                                    \

-        wxPySaveThread(doSave);                                                         \

         return rval;                                                                    \
     }                                                                                   \
     bool CLASS::base_##CBNAME(wxDC& a, double b, double c, double d, double e, bool f) {\
         return rval;                                                                    \
     }                                                                                   \
     bool CLASS::base_##CBNAME(wxDC& a, double b, double c, double d, double e, bool f) {\


@@ -484,13 +807,14 @@ public:
 
 #define IMP_PYCALLBACK__BOOL2DBL2INT(CLASS, PCLASS, CBNAME)                     \
     void CLASS::CBNAME(bool a, double b, double c, int d, int e) {              \
 
 #define IMP_PYCALLBACK__BOOL2DBL2INT(CLASS, PCLASS, CBNAME)                     \
     void CLASS::CBNAME(bool a, double b, double c, int d, int e) {              \

-        bool doSave = wxPyRestoreThread();                                      \
-        if (m_myInst.findCallback(#CBNAME))                                     \
-            m_myInst.callCallback(Py_BuildValue("(idii)",                       \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                            \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iddii)",             \

                                                 (int)a,b,c,d,e));               \
                                                 (int)a,b,c,d,e));               \

-        else                                                                    \
+        wxPyEndBlockThreads();                                             \
+        if (! found)                                                            \

             PCLASS::CBNAME(a, b, c, d, e);                                      \
             PCLASS::CBNAME(a, b, c, d, e);                                      \

-        wxPySaveThread(doSave);                                                 \

     }                                                                           \
     void CLASS::base_##CBNAME(bool a, double b, double c, int d, int e) {       \
         PCLASS::CBNAME(a, b, c, d, e);                                          \
     }                                                                           \
     void CLASS::base_##CBNAME(bool a, double b, double c, int d, int e) {       \
         PCLASS::CBNAME(a, b, c, d, e);                                          \


@@ -498,21 +822,23 @@ public:
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-#define DEC_PYCALLBACK__DC4DBL(CBNAME)                                      \
+#define DEC_PYCALLBACK__DC4DBL(CBNAME)                                          \

     void CBNAME(wxDC& a, double b, double c, double d, double e);               \
     void base_##CBNAME(wxDC& a, double b, double c, double d, double e);
 
 
 #define IMP_PYCALLBACK__DC4DBL(CLASS, PCLASS, CBNAME)                           \
     void CLASS::CBNAME(wxDC& a, double b, double c, double d, double e) {       \
     void CBNAME(wxDC& a, double b, double c, double d, double e);               \
     void base_##CBNAME(wxDC& a, double b, double c, double d, double e);
 
 
 #define IMP_PYCALLBACK__DC4DBL(CLASS, PCLASS, CBNAME)                           \
     void CLASS::CBNAME(wxDC& a, double b, double c, double d, double e) {       \

-        bool doSave = wxPyRestoreThread();                                      \
-        if (m_myInst.findCallback(#CBNAME))                                     \
-            m_myInst.callCallback(Py_BuildValue("(Odddd)",                      \
-                                   wxPyConstructObject(&a, "wxDC"),             \
-                                                     b, c, d, e));              \
-        else                                                                    \
+        bool found;                                                             \
+        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);                                                     \
+        }                                                                       \
+        wxPyEndBlockThreads();                                             \
+        if (! found)                                                            \

             PCLASS::CBNAME(a, b, c, d, e);                                      \
             PCLASS::CBNAME(a, b, c, d, e);                                      \

-        wxPySaveThread(doSave);                                                 \

     }                                                                           \
     void CLASS::base_##CBNAME(wxDC& a, double b, double c, double d, double e) {\
         PCLASS::CBNAME(a, b, c, d, e);                                          \
     }                                                                           \
     void CLASS::base_##CBNAME(wxDC& a, double b, double c, double d, double e) {\
         PCLASS::CBNAME(a, b, c, d, e);                                          \


@@ -525,19 +851,21 @@ public:
     void base_##CBNAME(wxDC& a, bool b);
 
 
     void base_##CBNAME(wxDC& a, bool b);
 
 

-#define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME)                   \
-    void CLASS::CBNAME(wxDC& a, bool b) {                               \
-        bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            m_myInst.callCallback(Py_BuildValue("(Oi)",                 \
-                                   wxPyConstructObject(&a, "wxDC"),     \
-                                                     (int)b));          \
-        else                                                            \
-            PCLASS::CBNAME(a, b);                                       \
-        wxPySaveThread(doSave);                                         \
-    }                                                                   \
-    void CLASS::base_##CBNAME(wxDC& a, bool b) {                        \
-        PCLASS::CBNAME(a, b);                                           \
+#define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME)                           \
+    void CLASS::CBNAME(wxDC& a, bool b) {                                       \
+        bool found;                                                             \
+        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);                                                     \
+        }                                                                       \
+        wxPyEndBlockThreads();                                             \
+        if (! found)                                                            \
+            PCLASS::CBNAME(a, b);                                               \
+    }                                                                           \
+    void CLASS::base_##CBNAME(wxDC& a, bool b) {                                \
+        PCLASS::CBNAME(a, b);                                                   \

     }
 
 //---------------------------------------------------------------------------
     }
 
 //---------------------------------------------------------------------------


@@ -550,14 +878,16 @@ public:
 #define IMP_PYCALLBACK__WXCPBOOL2DBL2INT(CLASS, PCLASS, CBNAME)                 \
     void CLASS::CBNAME(wxControlPoint* a, bool b, double c, double d,           \
                 int e, int f) {                                                 \
 #define IMP_PYCALLBACK__WXCPBOOL2DBL2INT(CLASS, PCLASS, CBNAME)                 \
     void CLASS::CBNAME(wxControlPoint* a, bool b, double c, double d,           \
                 int e, int f) {                                                 \

-        bool doSave = wxPyRestoreThread();                                      \
-        if (m_myInst.findCallback(#CBNAME))                                     \
-            m_myInst.callCallback(Py_BuildValue("(Oiddii)",                     \
-                                 wxPyConstructObject(a, "wxPyControlPoint"),    \
-                                 (int)b, c, d, e, f));                          \
-        else                                                                    \
+        bool found;                                                             \
+        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);                                                     \
+        }                                                                       \
+        wxPyEndBlockThreads();                                             \
+        if (! found)                                                            \

             PCLASS::CBNAME(a, b, c, d, e, f);                                   \
             PCLASS::CBNAME(a, b, c, d, e, f);                                   \

-        wxPySaveThread(doSave);                                                 \

     }                                                                           \
     void CLASS::base_##CBNAME(wxControlPoint* a, bool b, double c, double d,    \
                        int e, int f) {                                          \
     }                                                                           \
     void CLASS::base_##CBNAME(wxControlPoint* a, bool b, double c, double d,    \
                        int e, int f) {                                          \


@@ -573,14 +903,16 @@ public:
 
 #define IMP_PYCALLBACK__WXCP2DBL2INT(CLASS, PCLASS, CBNAME)                     \
     void CLASS::CBNAME(wxControlPoint* a, double b, double c, int d, int e) {   \
 
 #define IMP_PYCALLBACK__WXCP2DBL2INT(CLASS, PCLASS, CBNAME)                     \
     void CLASS::CBNAME(wxControlPoint* a, double b, double c, int d, int e) {   \

-        bool doSave = wxPyRestoreThread();                                      \
-        if (m_myInst.findCallback(#CBNAME))                                     \
-            m_myInst.callCallback(Py_BuildValue("(Oddii)",                      \
-                                 wxPyConstructObject(a, "wxPyControlPoint"),    \
-                                 b, c, d, e));                                  \
-        else                                                                    \
+        bool found;                                                             \
+        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);                                                     \
+        }                                                                       \
+        wxPyEndBlockThreads();                                             \
+        if (! found)                                                            \

             PCLASS::CBNAME(a, b, c, d, e);                                      \
             PCLASS::CBNAME(a, b, c, d, e);                                      \

-        wxPySaveThread(doSave);                                                 \

     }                                                                           \
     void CLASS::base_##CBNAME(wxControlPoint* a, double b, double c,            \
                        int d, int e) {                                          \
     }                                                                           \
     void CLASS::base_##CBNAME(wxControlPoint* a, double b, double c,            \
                        int d, int e) {                                          \


@@ -594,17 +926,18 @@ public:
     void base_##CBNAME(double a, double b, int c);
 
 
     void base_##CBNAME(double a, double b, int c);
 
 

-#define IMP_PYCALLBACK__2DBLINT(CLASS, PCLASS, CBNAME)                  \
-    void CLASS::CBNAME(double a, double b, int c) {                     \
-        bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            m_myInst.callCallback(Py_BuildValue("(ddi)", a,b,c));       \
-        else                                                            \
-            PCLASS::CBNAME(a, b, c);                                    \
-        wxPySaveThread(doSave);                                         \
-    }                                                                   \
-    void CLASS::base_##CBNAME(double a, double b, int c) {              \
-        PCLASS::CBNAME(a, b, c);                                        \
+#define IMP_PYCALLBACK__2DBLINT(CLASS, PCLASS, CBNAME)                          \
+    void CLASS::CBNAME(double a, double b, int c) {                             \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                            \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ddi)", a,b,c));      \
+        wxPyEndBlockThreads();                                             \
+        if (! found)                                                            \
+            PCLASS::CBNAME(a, b, c);                                            \
+    }                                                                           \
+    void CLASS::base_##CBNAME(double a, double b, int c) {                      \
+        PCLASS::CBNAME(a, b, c);                                                \

     }
 
 //---------------------------------------------------------------------------
     }
 
 //---------------------------------------------------------------------------


@@ -616,12 +949,13 @@ public:
 
 #define IMP_PYCALLBACK__BOOL2DBLINT(CLASS, PCLASS, CBNAME)                      \
     void CLASS::CBNAME(bool a, double b, double c, int d) {                     \
 
 #define IMP_PYCALLBACK__BOOL2DBLINT(CLASS, PCLASS, CBNAME)                      \
     void CLASS::CBNAME(bool a, double b, double c, int d) {                     \

-        bool doSave = wxPyRestoreThread();                                      \
-        if (m_myInst.findCallback(#CBNAME))                                     \
-            m_myInst.callCallback(Py_BuildValue("(iddi)", (int)a,b,c,d));       \
-        else                                                                    \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                                                \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iddi)", (int)a,b,c,d));\
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \

             PCLASS::CBNAME(a, b, c, d);                                         \
             PCLASS::CBNAME(a, b, c, d);                                         \

-        wxPySaveThread(doSave);                                                 \

     }                                                                           \
     void CLASS::base_##CBNAME(bool a, double b, double c, int d) {              \
         PCLASS::CBNAME(a, b, c, d);                                             \
     }                                                                           \
     void CLASS::base_##CBNAME(bool a, double b, double c, int d) {              \
         PCLASS::CBNAME(a, b, c, d);                                             \


@@ -634,18 +968,21 @@ public:
     void CBNAME(const wxString& a);                     \
     void base_##CBNAME(const wxString& a);
 
     void CBNAME(const wxString& a);                     \
     void base_##CBNAME(const wxString& a);
 

-
-#define IMP_PYCALLBACK__STRING(CLASS, PCLASS, CBNAME)                   \
-    void CLASS::CBNAME(const wxString& a)  {                            \
-        bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            m_myInst.callCallback(Py_BuildValue("(s)", a.c_str()));     \
-        else                                                            \
-            PCLASS::CBNAME(a);                                          \
-        wxPySaveThread(doSave);                                         \
-    }                                                                   \
-    void CLASS::base_##CBNAME(const wxString& a) {                      \
-        PCLASS::CBNAME(a);                                              \
+#define IMP_PYCALLBACK__STRING(CLASS, PCLASS, CBNAME)                           \
+    void CLASS::CBNAME(const wxString& a)  {                                    \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                                                \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
+            PyObject* s = wx2PyString(a);                                       \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s));            \
+            Py_DECREF(s);                                                       \
+        }                                                                       \
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \
+            PCLASS::CBNAME(a);                                                  \
+    }                                                                           \
+    void CLASS::base_##CBNAME(const wxString& a) {                              \
+        PCLASS::CBNAME(a);                                                      \

     }
 
 //---------------------------------------------------------------------------
     }
 
 //---------------------------------------------------------------------------


@@ -654,16 +991,19 @@ public:
     bool CBNAME(const wxString& a);                     \
     bool base_##CBNAME(const wxString& a);
 
     bool CBNAME(const wxString& a);                     \
     bool base_##CBNAME(const wxString& a);
 

-

 #define IMP_PYCALLBACK_BOOL_STRING(CLASS, PCLASS, CBNAME)                       \
     bool CLASS::CBNAME(const wxString& a)  {                                    \
 #define IMP_PYCALLBACK_BOOL_STRING(CLASS, PCLASS, CBNAME)                       \
     bool CLASS::CBNAME(const wxString& a)  {                                    \

-        bool rval;                                                              \
-        bool doSave = wxPyRestoreThread();                                      \
-        if (m_myInst.findCallback(#CBNAME))                                     \
-            rval = m_myInst.callCallback(Py_BuildValue("(s)", a.c_str()));      \
-        else                                                                    \
+        bool rval=FALSE;                                                        \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                                                \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
+            PyObject* s = wx2PyString(a);                                       \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s));     \
+            Py_DECREF(s);                                                       \
+        }                                                                       \
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \

             rval = PCLASS::CBNAME(a);                                           \
             rval = PCLASS::CBNAME(a);                                           \

-        wxPySaveThread(doSave);                                                 \

         return rval;                                                            \
     }                                                                           \
     bool CLASS::base_##CBNAME(const wxString& a) {                              \
         return rval;                                                            \
     }                                                                           \
     bool CLASS::base_##CBNAME(const wxString& a) {                              \


@@ -672,21 +1012,89 @@ public:
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

+#define DEC_PYCALLBACK_BOOL_STRING_pure(CBNAME)         \
+    bool CBNAME(const wxString& a);
+
+#define IMP_PYCALLBACK_BOOL_STRING_pure(CLASS, PCLASS, CBNAME)                  \
+    bool CLASS::CBNAME(const wxString& a)  {                                    \
+        bool rval=FALSE;                                                        \
+        wxPyBeginBlockThreads();                                                \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
+            PyObject* s = wx2PyString(a);                                       \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s));     \
+            Py_DECREF(s);                                                       \
+        }                                                                       \
+        wxPyEndBlockThreads();                                                  \
+        return rval;                                                            \
+    }                                                                           \
+
+//---------------------------------------------------------------------------
+
+#define DEC_PYCALLBACK_STRING_STRING_pure(CBNAME)                               \
+    wxString CBNAME(const wxString& a);                                         \
+
+#define IMP_PYCALLBACK_STRING_STRING_pure(CLASS, PCLASS, CBNAME)                \
+    wxString CLASS::CBNAME(const wxString& a)  {                                \
+        wxString rval;                                                          \
+        wxPyBeginBlockThreads();                                                \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
+            PyObject* ro;                                                       \
+            PyObject* s = wx2PyString(a);                                       \
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(O)", s));    \
+            Py_DECREF(s);                                                       \
+            if (ro) {                                                           \
+                rval = Py2wxString(ro);                                         \
+                Py_DECREF(ro);                                                  \
+            }                                                                   \
+        }                                                                       \
+        wxPyEndBlockThreads();                                                  \
+        return rval;                                                            \
+    }                                                                           \
+
+//---------------------------------------------------------------------------
+
+#define DEC_PYCALLBACK_STRING_STRINGINT_pure(CBNAME)                            \
+    wxString CBNAME(const wxString& a,int b);                                   \
+
+#define IMP_PYCALLBACK_STRING_STRINGINT_pure(CLASS, PCLASS, CBNAME)             \
+    wxString CLASS::CBNAME(const wxString& a,int b)  {                          \
+        wxString rval;                                                          \
+        wxPyBeginBlockThreads();                                                \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
+            PyObject* ro;                                                       \
+            PyObject* s = wx2PyString(a);                                       \
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(Oi)",s,b));  \
+            Py_DECREF(s);                                                       \
+            if (ro) {                                                           \
+                rval = Py2wxString(ro);                                         \
+                Py_DECREF(ro);                                                  \
+            }                                                                   \
+        }                                                                       \
+        wxPyEndBlockThreads();                                                  \
+        return rval;                                                            \
+    }                                                                           \
+
+//---------------------------------------------------------------------------
+

 #define DEC_PYCALLBACK_BOOL_STRINGSTRING(CBNAME)              \
     bool CBNAME(const wxString& a, const wxString& b);        \
     bool base_##CBNAME(const wxString& a, const wxString& b);
 
 #define DEC_PYCALLBACK_BOOL_STRINGSTRING(CBNAME)              \
     bool CBNAME(const wxString& a, const wxString& b);        \
     bool base_##CBNAME(const wxString& a, const wxString& b);
 

-

 #define IMP_PYCALLBACK_BOOL_STRINGSTRING(CLASS, PCLASS, CBNAME)                 \
     bool CLASS::CBNAME(const wxString& a, const wxString& b) {                  \
 #define IMP_PYCALLBACK_BOOL_STRINGSTRING(CLASS, PCLASS, CBNAME)                 \
     bool CLASS::CBNAME(const wxString& a, const wxString& b) {                  \

-        bool rval;                                                              \
-        bool doSave = wxPyRestoreThread();                                      \
-        if (m_myInst.findCallback(#CBNAME))                                     \
-            rval = m_myInst.callCallback(Py_BuildValue("(ss)",                  \
-                                                       a.c_str(), b.c_str()));  \
-        else                                                                    \
+        bool rval=FALSE;                                                        \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                                                \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
+            PyObject* s1 = wx2PyString(a);                                      \
+            PyObject* s2 = wx2PyString(b);                                      \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OO)",s1,s2)); \
+            Py_DECREF(s1);                                                      \
+            Py_DECREF(s2);                                                      \
+        }                                                                       \
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \

             rval = PCLASS::CBNAME(a, b);                                        \
             rval = PCLASS::CBNAME(a, b);                                        \

-        wxPySaveThread(doSave);                                                 \

         return rval;                                                            \
     }                                                                           \
     bool CLASS::base_##CBNAME(const wxString& a, const wxString& b) {           \
         return rval;                                                            \
     }                                                                           \
     bool CLASS::base_##CBNAME(const wxString& a, const wxString& b) {           \


@@ -699,22 +1107,22 @@ public:
     wxString CBNAME();                                  \
     wxString base_##CBNAME();
 
     wxString CBNAME();                                  \
     wxString base_##CBNAME();
 

-

 #define IMP_PYCALLBACK_STRING_(CLASS, PCLASS, CBNAME)                           \
     wxString CLASS::CBNAME() {                                                  \
         wxString rval;                                                          \
 #define IMP_PYCALLBACK_STRING_(CLASS, PCLASS, CBNAME)                           \
     wxString CLASS::CBNAME() {                                                  \
         wxString rval;                                                          \

-        bool doSave = wxPyRestoreThread();                                      \
-        if (m_myInst.findCallback(#CBNAME)) {                                   \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                            \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \

             PyObject* ro;                                                       \
             PyObject* ro;                                                       \

-            ro = m_myInst.callCallbackObj(Py_BuildValue("()"));                 \
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));        \

             if (ro) {                                                           \
             if (ro) {                                                           \

-                rval = PyString_AsString(PyObject_Str(ro));                     \
+                rval = Py2wxString(ro);                                         \

                 Py_DECREF(ro);                                                  \
             }                                                                   \
         }                                                                       \
                 Py_DECREF(ro);                                                  \
             }                                                                   \
         }                                                                       \

-        else                                                                    \
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \

             rval = PCLASS::CBNAME();                                            \
             rval = PCLASS::CBNAME();                                            \

-        wxPySaveThread(doSave);                                                 \

         return rval;                                                            \
     }                                                                           \
     wxString CLASS::base_##CBNAME() {                                           \
         return rval;                                                            \
     }                                                                           \
     wxString CLASS::base_##CBNAME() {                                           \


@@ -726,20 +1134,19 @@ public:
 #define DEC_PYCALLBACK_STRING__pure(CBNAME)             \
     wxString CBNAME();
 
 #define DEC_PYCALLBACK_STRING__pure(CBNAME)             \
     wxString CBNAME();
 

-

 #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;                                                          \

-        bool doSave = wxPyRestoreThread();                                      \
-        if (m_myInst.findCallback(#CBNAME)) {                                   \
+        wxPyBeginBlockThreads();                            \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \

             PyObject* ro;                                                       \
             PyObject* ro;                                                       \

-            ro = m_myInst.callCallbackObj(Py_BuildValue("()"));                 \
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));        \

             if (ro) {                                                           \
             if (ro) {                                                           \

-                rval = PyString_AsString(PyObject_Str(ro));                     \
+                rval = Py2wxString(ro);                                         \

                 Py_DECREF(ro);                                                  \
             }                                                                   \
         }                                                                       \
                 Py_DECREF(ro);                                                  \
             }                                                                   \
         }                                                                       \

-        wxPySaveThread(doSave);                                                 \
+        wxPyEndBlockThreads();                                                  \

         return rval;                                                            \
     }
 
         return rval;                                                            \
     }
 


@@ -751,15 +1158,68 @@ public:
 
 #define IMP_PYCALLBACK_BOOL_TAG_pure(CLASS, PCLASS, CBNAME)                     \
     bool CLASS::CBNAME(const wxHtmlTag& a)  {                                   \
 
 #define IMP_PYCALLBACK_BOOL_TAG_pure(CLASS, PCLASS, CBNAME)                     \
     bool CLASS::CBNAME(const wxHtmlTag& a)  {                                   \

-        bool rval = FALSE;                                                      \
-        bool doSave = wxPyRestoreThread();                                      \
-        if (m_myInst.findCallback(#CBNAME))                                     \
-            rval = m_myInst.callCallback(Py_BuildValue("(O)",                   \
-                                         wxPyConstructObject((void*)&a,"wxHtmlTag"))); \
-        wxPySaveThread(doSave);                                                 \
+        bool rval=FALSE;                                                        \
+        wxPyBeginBlockThreads();                                                \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
+            PyObject* obj = wxPyConstructObject((void*)&a, "wxHtmlTag", 0);     \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj));   \
+            Py_DECREF(obj);                                                     \
+        }                                                                       \
+        wxPyEndBlockThreads();                                                  \

         return rval;                                                            \
     }
 
         return rval;                                                            \
     }
 

+//---------------------------------------------------------------------------
+
+#define DEC_PYCALLBACK__CELLINTINT(CBNAME)                                      \
+    void CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y);                        \
+    void base_##CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y);
+
+#define IMP_PYCALLBACK__CELLINTINT(CLASS, PCLASS, CBNAME)                       \
+    void CLASS::CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y) {                \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                                                \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
+            PyObject* obj = wxPyConstructObject((void*)cell, "wxHtmlCell", 0);  \
+            wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(Oii)",obj,x,y));  \
+            Py_DECREF(obj);                                                     \
+        }                                                                       \
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \
+            PCLASS::CBNAME(cell, x, y);                                         \
+    }                                                                           \
+    void CLASS::base_##CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y) {         \
+        PCLASS::CBNAME(cell, x, y);                                             \
+    }
+
+
+//---------------------------------------------------------------------------
+
+#define DEC_PYCALLBACK__CELLINTINTME(CBNAME)                                    \
+    void CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& e); \
+    void base_##CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& e);
+
+#define IMP_PYCALLBACK__CELLINTINTME(CLASS, PCLASS, CBNAME)                       \
+    void CLASS::CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& e) {                \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                                                \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
+            PyObject* obj = wxPyConstructObject((void*)cell, "wxHtmlCell", 0);  \
+            PyObject* o2  = wxPyConstructObject((void*)&e, "wxMouseEvent", 0);  \
+            wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OiiO)",obj,x,y,o2));  \
+            Py_DECREF(obj);                                                     \
+            Py_DECREF(o2);                                                      \
+        }                                                                       \
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \
+            PCLASS::CBNAME(cell, x, y, e);                                      \
+    }                                                                           \
+    void CLASS::base_##CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& e) {         \
+        PCLASS::CBNAME(cell, x, y, e);                                          \
+    }
+
+
+

 //---------------------------------------------------------------------------
 
 #define DEC_PYCALLBACK___pure(CBNAME)                         \
 //---------------------------------------------------------------------------
 
 #define DEC_PYCALLBACK___pure(CBNAME)                         \


@@ -768,10 +1228,10 @@ public:
 
 #define IMP_PYCALLBACK___pure(CLASS, PCLASS, CBNAME)                            \
     void CLASS::CBNAME() {                                                      \
 
 #define IMP_PYCALLBACK___pure(CLASS, PCLASS, CBNAME)                            \
     void CLASS::CBNAME() {                                                      \

-        bool doSave = wxPyRestoreThread();                                      \
-        if (m_myInst.findCallback(#CBNAME))                                     \
-            m_myInst.callCallback(Py_BuildValue("()"));                         \
-        wxPySaveThread(doSave);                                                 \
+        wxPyBeginBlockThreads();                                                \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME))                            \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));                \
+        wxPyEndBlockThreads();                                                  \

     }
 
 //---------------------------------------------------------------------------
     }
 
 //---------------------------------------------------------------------------


@@ -782,19 +1242,33 @@ public:
 
 #define IMP_PYCALLBACK_wxSize__pure(CLASS, PCLASS, CBNAME)                      \
     wxSize CLASS::CBNAME() {                                                    \
 
 #define IMP_PYCALLBACK_wxSize__pure(CLASS, PCLASS, CBNAME)                      \
     wxSize CLASS::CBNAME() {                                                    \

+        const char* errmsg = #CBNAME " should return a 2-tuple of integers or a wxSize object."; \

         wxSize rval(0,0);                                                       \
         wxSize rval(0,0);                                                       \

-        bool doSave = wxPyRestoreThread();                                      \
-        if (m_myInst.findCallback(#CBNAME)) {                                   \
+        wxPyBeginBlockThreads();                                                \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \

             PyObject* ro;                                                       \
             wxSize*   ptr;                                                      \
             PyObject* ro;                                                       \
             wxSize*   ptr;                                                      \

-            ro = m_myInst.callCallbackObj(Py_BuildValue("()"));                 \
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));        \

             if (ro) {                                                           \
                 if (! SWIG_GetPtrObj(ro, (void **)&ptr, "_wxSize_p"))           \
                     rval = *ptr;                                                \
             if (ro) {                                                           \
                 if (! SWIG_GetPtrObj(ro, (void **)&ptr, "_wxSize_p"))           \
                     rval = *ptr;                                                \

+                else if (PySequence_Check(ro) && PyObject_Length(ro) == 2) {    \
+                    PyObject* o1 = PySequence_GetItem(ro, 0);                   \
+                    PyObject* o2 = PySequence_GetItem(ro, 1);                   \
+                    if (PyNumber_Check(o1) && PyNumber_Check(o2))               \
+                        rval = wxSize(PyInt_AsLong(o1), PyInt_AsLong(o2));      \
+                    else                                                        \
+                        PyErr_SetString(PyExc_TypeError, errmsg);               \
+                    Py_DECREF(o1);                                              \
+                    Py_DECREF(o2);                                              \
+                }                                                               \
+                else {                                                          \
+                    PyErr_SetString(PyExc_TypeError, errmsg);                   \
+                }                                                               \

                 Py_DECREF(ro);                                                  \
             }                                                                   \
         }                                                                       \
                 Py_DECREF(ro);                                                  \
             }                                                                   \
         }                                                                       \

-        wxPySaveThread(doSave);                                                 \
+        wxPyEndBlockThreads();                                                  \

         return rval;                                                            \
     }
 
         return rval;                                                            \
     }
 


@@ -805,20 +1279,23 @@ public:
     bool base_##CBNAME(wxWindow* a);
 
 
     bool base_##CBNAME(wxWindow* a);
 
 

-#define IMP_PYCALLBACK_BOOL_WXWIN(CLASS, PCLASS, CBNAME)                \
-    bool CLASS::CBNAME(wxWindow* a) {                                   \
-        bool rval;                                                      \
-        bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            rval = m_myInst.callCallback(Py_BuildValue("(O)",           \
-                            wxPyConstructObject((void*)a,"wxWindow"))); \
-        else                                                            \
-            rval = PCLASS::CBNAME(a);                                   \
-        wxPySaveThread(doSave);                                         \
-        return rval;                                                    \
-    }                                                                   \
-    bool CLASS::base_##CBNAME(wxWindow* a) {                            \
-        return PCLASS::CBNAME(a);                                       \
+#define IMP_PYCALLBACK_BOOL_WXWIN(CLASS, PCLASS, CBNAME)                        \
+    bool CLASS::CBNAME(wxWindow* a) {                                           \
+        bool rval=FALSE;                                                        \
+        bool found;                                                             \
+        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);                                                     \
+        }                                                                       \
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \
+            rval = PCLASS::CBNAME(a);                                           \
+        return rval;                                                            \
+    }                                                                           \
+    bool CLASS::base_##CBNAME(wxWindow* a) {                                    \
+        return PCLASS::CBNAME(a);                                               \

     }
 
 //---------------------------------------------------------------------------
     }
 
 //---------------------------------------------------------------------------


@@ -828,45 +1305,96 @@ public:
     bool base_##CBNAME();
 
 
     bool base_##CBNAME();
 
 

-#define IMP_PYCALLBACK_BOOL_(CLASS, PCLASS, CBNAME)                     \
-    bool CLASS::CBNAME() {                                              \
-        bool rval;                                                      \
-        bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            rval = m_myInst.callCallback(Py_BuildValue("()"));          \
-        else                                                            \
-            rval = PCLASS::CBNAME();                                    \
-        wxPySaveThread(doSave);                                         \
-        return rval;                                                    \
-    }                                                                   \
-    bool CLASS::base_##CBNAME() {                                       \
-        return PCLASS::CBNAME();                                        \
+#define IMP_PYCALLBACK_BOOL_(CLASS, PCLASS, CBNAME)                             \
+    bool CLASS::CBNAME() {                                                      \
+        bool rval=FALSE;                                                        \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                                                \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));         \
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \
+            rval = PCLASS::CBNAME();                                            \
+        return rval;                                                            \
+    }                                                                           \
+    bool CLASS::base_##CBNAME() {                                               \
+        return PCLASS::CBNAME();                                                \
+    }
+
+//---------------------------------------------------------------------------
+
+#define DEC_PYCALLBACK_BOOL_const(CBNAME)                       \
+    bool CBNAME() const;                                        \
+    bool base_##CBNAME() const;
+
+
+#define IMP_PYCALLBACK_BOOL_const(CLASS, PCLASS, CBNAME)                        \
+    bool CLASS::CBNAME() const {                                                \
+        bool rval=FALSE;                                                        \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                                                \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));         \
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \
+            rval = PCLASS::CBNAME();                                            \
+        return rval;                                                            \
+    }                                                                           \
+    bool CLASS::base_##CBNAME() const {                                         \
+        return PCLASS::CBNAME();                                                \

     }
 
 //---------------------------------------------------------------------------
 
     }
 
 //---------------------------------------------------------------------------
 

-#define DEC_PYCALLBACK_DR_2WXCDR(CBNAME)                 \
-    wxDragResult CBNAME(wxCoord x, wxCoord y, wxDragResult def);    \
+#define DEC_PYCALLBACK_DR_2WXCDR(CBNAME)                                \
+    wxDragResult CBNAME(wxCoord x, wxCoord y, wxDragResult def);        \

     wxDragResult base_##CBNAME(wxCoord x, wxCoord y, wxDragResult def);
 
 
     wxDragResult base_##CBNAME(wxCoord x, wxCoord y, wxDragResult def);
 
 

-#define IMP_PYCALLBACK_DR_2WXCDR(CLASS, PCLASS, CBNAME)                 \
-    wxDragResult CLASS::CBNAME(wxCoord a, wxCoord b, wxDragResult c) {  \
-        bool doSave = wxPyRestoreThread();                              \
-        int rval;                                                       \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            rval = m_myInst.callCallback(Py_BuildValue("(iii)", a,b,c));\
-        else                                                            \
-            rval = PCLASS::CBNAME(a, b, c);                             \
-        wxPySaveThread(doSave);                                         \
-        return (wxDragResult)rval;                                      \
-    }                                                                   \
-    wxDragResult CLASS::base_##CBNAME(wxCoord a, wxCoord b, wxDragResult c) { \
-        return PCLASS::CBNAME(a, b, c);                                       \
+#define IMP_PYCALLBACK_DR_2WXCDR(CLASS, PCLASS, CBNAME)                         \
+    wxDragResult CLASS::CBNAME(wxCoord a, wxCoord b, wxDragResult c) {          \
+        int rval=0;                                                             \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                                                \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));\
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \
+            rval = PCLASS::CBNAME(a, b, c);                                     \
+        return (wxDragResult)rval;                                              \
+    }                                                                           \
+    wxDragResult CLASS::base_##CBNAME(wxCoord a, wxCoord b, wxDragResult c) {   \
+        return PCLASS::CBNAME(a, b, c);                                         \

     }
 
 //---------------------------------------------------------------------------
 
     }
 
 //---------------------------------------------------------------------------
 

+#define DEC_PYCALLBACK_FSF_FSSTRING_pure(CBNAME)                        \
+    wxFSFile* CBNAME(wxFileSystem& fs, const wxString& location);       \
+
+#define IMP_PYCALLBACK_FSF_FSSTRING_pure(CLASS, PCLASS, CBNAME)         \
+    wxFSFile* CLASS::CBNAME(wxFileSystem& a,const wxString& b) {        \
+        wxPyBeginBlockThreads();                                        \
+        wxFSFile* rval=0;                                               \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                  \
+            PyObject* ro;                                               \
+            PyObject* obj = wxPyMake_wxObject(&a);                      \
+            PyObject* s = wx2PyString(b);                               \
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OO)",\
+                                         obj, s));                      \
+            if (ro) {                                                   \
+                SWIG_GetPtrObj(ro, (void **)&rval, "_wxFSFILE_p");      \
+                Py_DECREF(ro);                                          \
+            }                                                           \
+            Py_DECREF(obj);                                             \
+            Py_DECREF(s);                                               \
+        }                                                               \
+        wxPyEndBlockThreads();                                          \
+        return rval;                                                    \
+    };
+
+//---------------------------------------------------------------------------
+

 #define DEC_PYCALLBACK_BOOL_DR(CBNAME)                  \
     bool CBNAME(wxDragResult a);                        \
     bool base_##CBNAME(wxDragResult a);
 #define DEC_PYCALLBACK_BOOL_DR(CBNAME)                  \
     bool CBNAME(wxDragResult a);                        \
     bool base_##CBNAME(wxDragResult a);


@@ -874,13 +1402,14 @@ public:
 
 #define IMP_PYCALLBACK_BOOL_DR(CLASS, PCLASS, CBNAME)                   \
     bool CLASS::CBNAME(wxDragResult a) {                                \
 
 #define IMP_PYCALLBACK_BOOL_DR(CLASS, PCLASS, CBNAME)                   \
     bool CLASS::CBNAME(wxDragResult a) {                                \

-        bool doSave = wxPyRestoreThread();                              \
-        bool rval;                                                      \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            rval = m_myInst.callCallback(Py_BuildValue("(i)", a));      \
-        else                                                            \
+        bool rval=FALSE;                                                \
+        bool found;                                                     \
+        wxPyBeginBlockThreads();                                        \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))          \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a));\
+        wxPyEndBlockThreads();                                          \
+        if (! found)                                                    \

             rval = PCLASS::CBNAME(a);                                   \
             rval = PCLASS::CBNAME(a);                                   \

-        wxPySaveThread(doSave);                                         \

         return rval;                                                    \
     }                                                                   \
     bool CLASS::base_##CBNAME(wxDragResult a) {                         \
         return rval;                                                    \
     }                                                                   \
     bool CLASS::base_##CBNAME(wxDragResult a) {                         \


@@ -895,11 +1424,11 @@ public:
 
 #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) {  \

-        bool doSave = wxPyRestoreThread();                              \
-        int rval;                                                       \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            rval = m_myInst.callCallback(Py_BuildValue("(iii)", a,b,c));\
-        wxPySaveThread(doSave);                                         \
+        wxPyBeginBlockThreads();                                        \
+        int rval=0;                                                     \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME))                    \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));\
+        wxPyEndBlockThreads();                                          \

         return (wxDragResult)rval;                                      \
     }                                                                   \
 
         return (wxDragResult)rval;                                      \
     }                                                                   \
 


@@ -908,14 +1437,16 @@ public:
 #define DEC_PYCALLBACK_BOOL_INTINTSTR_pure(CBNAME)                      \
     bool CBNAME(int a, int b, const wxString& c);
 
 #define DEC_PYCALLBACK_BOOL_INTINTSTR_pure(CBNAME)                      \
     bool CBNAME(int a, int b, const wxString& c);
 

-

 #define IMP_PYCALLBACK_BOOL_INTINTSTR_pure(CLASS, PCLASS, CBNAME)       \
     bool CLASS::CBNAME(int a, int b, const wxString& c) {               \
 #define IMP_PYCALLBACK_BOOL_INTINTSTR_pure(CLASS, PCLASS, CBNAME)       \
     bool CLASS::CBNAME(int a, int b, const wxString& c) {               \

-        bool rval;                                                      \
-        bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            rval = m_myInst.callCallback(Py_BuildValue("(iis)",a,b,c.c_str()));\
-        wxPySaveThread(doSave);                                         \
+        bool rval=FALSE;                                                \
+        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);                                               \
+        }                                                               \
+        wxPyEndBlockThreads();                                          \

         return rval;                                                    \
     }                                                                   \
 
         return rval;                                                    \
     }                                                                   \
 


@@ -928,13 +1459,14 @@ public:
 
 #define IMP_PYCALLBACK_SIZET_(CLASS, PCLASS, CBNAME)                            \
     size_t CLASS::CBNAME() {                                                    \
 
 #define IMP_PYCALLBACK_SIZET_(CLASS, PCLASS, CBNAME)                            \
     size_t CLASS::CBNAME() {                                                    \

-        size_t rval;                                                            \
-        bool doSave = wxPyRestoreThread();                                      \
-        if (m_myInst.findCallback(#CBNAME))                                     \
-            rval = m_myInst.callCallback(Py_BuildValue("()"));                  \
-        else                                                                    \
+        size_t rval=0;                                                          \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                                                \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));         \
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \

             rval = PCLASS::CBNAME();                                            \
             rval = PCLASS::CBNAME();                                            \

-        wxPySaveThread(doSave);                                                 \

         return rval;                                                            \
     }                                                                           \
     size_t CLASS::base_##CBNAME() {                                             \
         return rval;                                                            \
     }                                                                           \
     size_t CLASS::base_##CBNAME() {                                             \


@@ -943,28 +1475,29 @@ public:
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-#define DEC_PYCALLBACK_DATAFMT_SIZET(CBNAME)                  \
-    wxDataFormat  CBNAME();                                        \
-    wxDataFormat  base_##CBNAME();
+#define DEC_PYCALLBACK_DATAFMT_SIZET(CBNAME)                                    \
+    wxDataFormat  CBNAME(size_t a);                                             \
+    wxDataFormat  base_##CBNAME(size_t a);

 
 
 #define IMP_PYCALLBACK_DATAFMT_SIZET(CLASS, PCLASS, CBNAME)                     \
     wxDataFormat CLASS::CBNAME(size_t a) {                                      \
 
 
 #define IMP_PYCALLBACK_DATAFMT_SIZET(CLASS, PCLASS, CBNAME)                     \
     wxDataFormat CLASS::CBNAME(size_t a) {                                      \

-        wxDataFormat rval;                                                      \
-        bool doSave = wxPyRestoreThread();                                      \
-        if (m_myInst.findCallback(#CBNAME)) {                                   \
+        wxDataFormat rval=0;                                                    \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                                                \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \

             PyObject* ro;                                                       \
             wxDataFormat* ptr;                                                  \
             PyObject* ro;                                                       \
             wxDataFormat* ptr;                                                  \

-            ro = m_myInst.callCallbackObj(Py_BuildValue("(i)", a));             \
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(i)", a));    \

             if (ro) {                                                           \
                 if (! SWIG_GetPtrObj(ro, (void **)&ptr, "_wxDataFormat_p"))     \
                     rval = *ptr;                                                \
                 Py_DECREF(ro);                                                  \
             }                                                                   \
         }                                                                       \
             if (ro) {                                                           \
                 if (! SWIG_GetPtrObj(ro, (void **)&ptr, "_wxDataFormat_p"))     \
                     rval = *ptr;                                                \
                 Py_DECREF(ro);                                                  \
             }                                                                   \
         }                                                                       \

-        else                                                                    \
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \

             rval = PCLASS::CBNAME(a);                                           \
             rval = PCLASS::CBNAME(a);                                           \

-        wxPySaveThread(doSave);                                                 \

         return rval;                                                            \
     }                                                                           \
     wxDataFormat  CLASS::base_##CBNAME(size_t a) {                              \
         return rval;                                                            \
     }                                                                           \
     wxDataFormat  CLASS::base_##CBNAME(size_t a) {                              \


@@ -978,18 +1511,21 @@ public:
     void base_##CBNAME(const Type& a);
 
 
     void base_##CBNAME(const Type& a);
 
 

-#define IMP_PYCALLBACK__constany(CLASS, PCLASS, CBNAME, Type)   \
-    void CLASS::CBNAME(const Type& a) {                         \
-        bool doSave = wxPyRestoreThread();                      \
-        if (m_myInst.findCallback(#CBNAME))                     \
-            m_myInst.callCallback(Py_BuildValue("(O)",          \
-                     wxPyConstructObject((void*)&a, #Type)));   \
-        else                                                    \
-            PCLASS::CBNAME(a);                                  \
-        wxPySaveThread(doSave);                                 \
-    }                                                           \
-    void CLASS::base_##CBNAME(const Type& a) {                  \
-        PCLASS::CBNAME(a);                                      \
+#define IMP_PYCALLBACK__constany(CLASS, PCLASS, CBNAME, Type)                   \
+    void CLASS::CBNAME(const Type& a) {                                         \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                                                \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
+            PyObject* obj = wxPyConstructObject((void*)&a, #Type, 0);           \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj));          \
+            Py_DECREF(obj);                                                     \
+        }                                                                       \
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \
+            PCLASS::CBNAME(a);                                                  \
+    }                                                                           \
+    void CLASS::base_##CBNAME(const Type& a) {                                  \
+        PCLASS::CBNAME(a);                                                      \

     }
 
 
     }
 
 


@@ -1000,18 +1536,21 @@ public:
     void base_##CBNAME(Type& a);
 
 
     void base_##CBNAME(Type& a);
 
 

-#define IMP_PYCALLBACK__any(CLASS, PCLASS, CBNAME, Type)        \
-    void CLASS::CBNAME(Type& a) {                               \
-        bool doSave = wxPyRestoreThread();                      \
-        if (m_myInst.findCallback(#CBNAME))                     \
-            m_myInst.callCallback(Py_BuildValue("(O)",          \
-                            wxPyConstructObject(&a, #Type)));   \
-        else                                                    \
-            PCLASS::CBNAME(a);                                  \
-        wxPySaveThread(doSave);                                 \
-    }                                                           \
-    void CLASS::base_##CBNAME(Type& a) {                        \
-        PCLASS::CBNAME(a);                                      \
+#define IMP_PYCALLBACK__any(CLASS, PCLASS, CBNAME, Type)                        \
+    void CLASS::CBNAME(Type& a) {                                               \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                                                \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
+            PyObject* obj = wxPyConstructObject((void*)&a, #Type, 0);           \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj));          \
+            Py_DECREF(obj);                                                     \
+        }                                                                       \
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \
+            PCLASS::CBNAME(a);                                                  \
+    }                                                                           \
+    void CLASS::base_##CBNAME(Type& a) {                                        \
+        PCLASS::CBNAME(a);                                                      \

     }
 
 //---------------------------------------------------------------------------
     }
 
 //---------------------------------------------------------------------------


@@ -1021,26 +1560,145 @@ public:
     bool base_##CBNAME(Type& a);
 
 
     bool base_##CBNAME(Type& a);
 
 

-#define IMP_PYCALLBACK_bool_any(CLASS, PCLASS, CBNAME, Type)    \
-    bool CLASS::CBNAME(Type& a) {                               \
-        bool rv;                                                \
-        bool doSave = wxPyRestoreThread();                      \
-        if (m_myInst.findCallback(#CBNAME))                     \
-            rv = m_myInst.callCallback(Py_BuildValue("(O)",     \
-                            wxPyConstructObject(&a, #Type)));   \
-        else                                                    \
-            rv = PCLASS::CBNAME(a);                             \
-        wxPySaveThread(doSave);                                 \
-        return rv;                                              \
-    }                                                           \
-    bool CLASS::base_##CBNAME(Type& a) {                        \
-        return PCLASS::CBNAME(a);                               \
+#define IMP_PYCALLBACK_bool_any(CLASS, PCLASS, CBNAME, Type)                    \
+    bool CLASS::CBNAME(Type& a) {                                               \
+        bool rv=FALSE;                                                          \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                                                \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
+            PyObject* obj = wxPyConstructObject((void*)&a, #Type, 0);           \
+            rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj));     \
+            Py_DECREF(obj);                                                     \
+        }                                                                       \
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \
+            rv = PCLASS::CBNAME(a);                                             \
+        return rv;                                                              \
+    }                                                                           \
+    bool CLASS::base_##CBNAME(Type& a) {                                        \
+        return PCLASS::CBNAME(a);                                               \

     }
 
 //---------------------------------------------------------------------------
 
     }
 
 //---------------------------------------------------------------------------
 

-#endif
+#define DEC_PYCALLBACK_STRING_LONGLONG(CBNAME)                                  \
+    wxString CBNAME(long a, long b) const;                                      \
+    wxString base_##CBNAME(long a, long b)const ;
+
+#define IMP_PYCALLBACK_STRING_LONGLONG(CLASS, PCLASS, CBNAME)                   \
+    wxString CLASS::CBNAME(long a, long b) const {                              \
+        wxString rval;                                                          \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                                                \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
+            PyObject* ro;                                                       \
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ll)",a,b));  \
+            if (ro) {                                                           \
+                rval = Py2wxString(ro);                                         \
+                Py_DECREF(ro);                                                  \
+            }                                                                   \
+        }                                                                       \
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \
+            rval = PCLASS::CBNAME(a,b);                                         \
+        return rval;                                                            \
+    }                                                                           \
+    wxString CLASS::base_##CBNAME(long a, long b) const {                       \
+        return PCLASS::CBNAME(a,b);                                             \
+    }
+
+//---------------------------------------------------------------------------
+
+#define DEC_PYCALLBACK_INT_LONG(CBNAME)                                         \
+    int CBNAME(long a) const;                                                   \
+    int base_##CBNAME(long a)const ;
+
+
+#define IMP_PYCALLBACK_INT_LONG(CLASS, PCLASS, CBNAME)                          \
+    int CLASS::CBNAME(long a) const {                                           \
+        int rval=-1;                                                            \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                                                \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
+            PyObject* ro;                                                       \
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(l)",a));     \
+            if (ro) {                                                           \
+                rval = PyInt_AsLong(ro);                                        \
+                Py_DECREF(ro);                                                  \
+            }                                                                   \
+        }                                                                       \
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \
+            rval = PCLASS::CBNAME(a);                                           \
+        return rval;                                                            \
+    }                                                                           \
+    int CLASS::base_##CBNAME(long a) const {                                    \
+        return PCLASS::CBNAME(a);                                               \
+    }
+
+
+//---------------------------------------------------------------------------
+
+#define DEC_PYCALLBACK_LISTATTR_LONG(CBNAME)                                    \
+    wxListItemAttr*  CBNAME(long a) const;                                      \
+    wxListItemAttr*  base_##CBNAME(long a);
+

 
 

+#define IMP_PYCALLBACK_LISTATTR_LONG(CLASS, PCLASS, CBNAME)                     \
+    wxListItemAttr *CLASS::CBNAME(long a) const {                               \
+        wxListItemAttr *rval = NULL;                                            \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                                                \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
+            PyObject* ro;                                                       \
+            wxListItemAttr* ptr;                                                \
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(i)", a));    \
+            if (ro) {                                                           \
+                if (! SWIG_GetPtrObj(ro, (void **)&ptr, "_wxListItemAttr_p"))   \
+                    rval = ptr;                                                 \
+                Py_DECREF(ro);                                                  \
+            }                                                                   \
+        }                                                                       \
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \
+            rval = PCLASS::CBNAME(a);                                           \
+        return rval;                                                            \
+    }                                                                           \
+    wxListItemAttr *CLASS::base_##CBNAME(long a) {                              \
+        return PCLASS::CBNAME(a);                                               \
+    }
+
+//---------------------------------------------------------------------------

 
 

+#define DEC_PYCALLBACK_BOOL_ME(CBNAME)                                          \
+    bool CBNAME(wxMouseEvent& e);                                               \
+    bool base_##CBNAME(wxMouseEvent& e);
+
+#define IMP_PYCALLBACK_BOOL_ME(CLASS, PCLASS, CBNAME)                           \
+    bool CLASS::CBNAME(wxMouseEvent& e) {                                       \
+        bool rval=FALSE;                                                        \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                                                \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
+            PyObject* ro;                                                       \
+            PyObject* obj  = wxPyConstructObject((void*)&e, "wxMouseEvent", 0); \
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(O)",obj));   \
+            if (ro) {                                                           \
+                rval = PyInt_AsLong(ro);                                        \
+                Py_DECREF(ro);                                                  \
+            }                                                                   \
+            Py_DECREF(obj);                                                     \
+        }                                                                       \
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \
+            return PCLASS::CBNAME(e);                                           \
+        return rval;                                                            \
+    }                                                                           \
+    bool CLASS::base_##CBNAME(wxMouseEvent& e) {                                \
+        return PCLASS::CBNAME(e);                                               \
+    }

 
 
 
 

+//---------------------------------------------------------------------------
+
+#endif