Allow compiling when _WIN32_IE < 0x300

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

diff --git a/wxPython/src/helpers.h b/wxPython/src/helpers.h
index a39d69429c5b1768977ddccf2975a8860ff73d12..3ad0d236a71dcddb10412805b7e1be8f0078531c 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
 //


@@ -44,19 +44,23 @@ PyObject* __wxSetDictionary(PyObject*, PyObject* args);
 void wxPyEventThunker(wxObject*, wxEvent& event);
 
 PyObject* wxPyConstructObject(void* ptr,
 void wxPyEventThunker(wxObject*, wxEvent& event);
 
 PyObject* wxPyConstructObject(void* ptr,

-                              const char* className,
+                              const wxString& className,

                               int setThisOwn=0);
 PyObject* wxPyConstructObject(void* ptr,
                               int setThisOwn=0);
 PyObject* wxPyConstructObject(void* ptr,

-                              const char* className,
+                              const wxString& className,

                               PyObject* klass,
                               int setThisOwn=0);
                               PyObject* klass,
                               int setThisOwn=0);

-PyObject*  wxPyClassExists(const char* className);
-PyObject*  wxPyMake_wxObject(wxObject* source, bool checkEvtHandler=TRUE);
-PyObject*  wxPyMake_wxSizer(wxSizer* source);
-void       wxPyPtrTypeMap_Add(const char* commonName, const char* ptrName);
+
+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);
 
 PyObject* wxPy_ConvertList(wxListBase* list, const char* className);

-long wxPyGetWinHandle(wxWindow* win);
+long      wxPyGetWinHandle(wxWindow* win);

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


@@ -79,6 +83,8 @@ void wxPyEndBlockThreads();
 //----------------------------------------------------------------------
 // These are helpers used by the typemaps
 
 //----------------------------------------------------------------------
 // These are helpers used by the typemaps
 

+wxString* wxString_in_helper(PyObject* source);
+

 byte* byte_LIST_helper(PyObject* source);
 int* int_LIST_helper(PyObject* source);
 long* long_LIST_helper(PyObject* source);
 byte* byte_LIST_helper(PyObject* source);
 int* int_LIST_helper(PyObject* source);
 long* long_LIST_helper(PyObject* source);


@@ -95,6 +101,9 @@ bool wxRealPoint_helper(PyObject* source, wxRealPoint** obj);
 bool wxRect_helper(PyObject* source, wxRect** obj);
 bool wxColour_helper(PyObject* source, wxColour** 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))
 #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))


@@ -107,8 +116,9 @@ 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);
 
 PyObject* wxArrayString2PyList_helper(const wxArrayString& arr);
 PyObject* wxArrayInt2PyList_helper(const wxArrayInt& arr);
 

-
-#define RETURN_NONE()   { Py_INCREF(Py_None); return Py_None; }
+#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)

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


@@ -194,6 +204,18 @@ public:
 };
 
 
 };
 
 

+
+//----------------------------------------------------------------------
+// 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
 //---------------------------------------------------------------------------
 // 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


@@ -201,23 +223,37 @@ public:
 
 class wxPyCallbackHelper;
 
 
 class wxPyCallbackHelper;
 

+
+// Make SunCC happy and make typedef's for these that are extern "C"
+typedef void        (*p_SWIG_MakePtr_t)(char*, void*, char*);
+typedef char*       (*p_SWIG_GetPtr_t)(char*, void**, char*);
+typedef char*       (*p_SWIG_GetPtrObj_t)(PyObject*, void**, char*);
+typedef void        (*p_SWIG_RegisterMapping_t)(char*, char*, void *(*cast)(void *));
+typedef void        (*p_SWIG_addvarlink_t)(PyObject*, char*, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p));
+typedef PyObject*   (*p_SWIG_newvarlink_t)(void);
+
+

 struct wxPyCoreAPI {
 
 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);
+    p_SWIG_MakePtr_t           p_SWIG_MakePtr;
+    p_SWIG_GetPtr_t            p_SWIG_GetPtr;
+    p_SWIG_GetPtrObj_t         p_SWIG_GetPtrObj;
+    p_SWIG_RegisterMapping_t   p_SWIG_RegisterMapping;
+    p_SWIG_addvarlink_t        p_SWIG_addvarlink;
+    p_SWIG_newvarlink_t        p_SWIG_newvarlink;

 
     PyThreadState* (*p_wxPyBeginAllowThreads)();
     void           (*p_wxPyEndAllowThreads)(PyThreadState* state);
     void        (*p_wxPyBeginBlockThreads)();
     void        (*p_wxPyEndBlockThreads)();
 
 
     PyThreadState* (*p_wxPyBeginAllowThreads)();
     void           (*p_wxPyEndAllowThreads)(PyThreadState* state);
     void        (*p_wxPyBeginBlockThreads)();
     void        (*p_wxPyEndBlockThreads)();
 

-    PyObject*   (*p_wxPyConstructObject)(void *, const char *, int);
+    PyObject*   (*p_wxPyConstructObject)(void *, const wxString&, int);

     PyObject*   (*p_wxPy_ConvertList)(wxListBase* list, const char* className);
 
     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);
     byte*       (*p_byte_LIST_helper)(PyObject* source);
     int*        (*p_int_LIST_helper)(PyObject* source);
     long*       (*p_long_LIST_helper)(PyObject* source);


@@ -239,17 +275,77 @@ struct wxPyCoreAPI {
     PyObject*   (*p_wxPyCBH_callCallbackObj)(const wxPyCallbackHelper& cbh, PyObject* argTuple);
     void        (*p_wxPyCBH_delete)(wxPyCallbackHelper* cbh);
 
     PyObject*   (*p_wxPyCBH_callCallbackObj)(const wxPyCallbackHelper& cbh, PyObject* argTuple);
     void        (*p_wxPyCBH_delete)(wxPyCallbackHelper* cbh);
 

-    PyObject*   (*p_wxPyClassExists)(const char* className);
+    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);
     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
 #ifdef wxPyUSE_EXPORT

-static wxPyCoreAPI* wxPyCoreAPIPtr = NULL;  // Each module needs one, but may not use it.
+        wxPyCoreAPIPtr->p_wxPyOORClientData_dtor(this);
+#else
+        wxPyOORClientData_dtor(this);

 #endif
 #endif

+    }
+};

 
 //---------------------------------------------------------------------------
 // This class holds an instance of a Python Shadow Class object and assists
 
 //---------------------------------------------------------------------------
 // This class holds an instance of a Python Shadow Class object and assists


@@ -301,53 +397,6 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh);
 
 
 
 
 
 

-//----------------------------------------------------------------------
-
-class wxPyUserData : public wxObject {
-public:
-    wxPyUserData(PyObject* obj) {
-        m_obj = obj;
-        Py_INCREF(m_obj);
-    }
-
-    ~wxPyUserData() {
-#ifdef wxPyUSE_EXPORT
-        wxPyCoreAPIPtr->p_wxPyBeginBlockThreads();
-        Py_DECREF(m_obj);
-        wxPyCoreAPIPtr->p_wxPyEndBlockThreads();
-#else
-        wxPyBeginBlockThreads();
-        Py_DECREF(m_obj);
-        wxPyEndBlockThreads();
-#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_wxPyBeginBlockThreads();
-        Py_DECREF(m_obj);
-        wxPyCoreAPIPtr->p_wxPyEndBlockThreads();
-#else
-        wxPyBeginBlockThreads();
-        Py_DECREF(m_obj);
-        wxPyEndBlockThreads();
-#endif
-    }
-    PyObject* m_obj;
-};
-
-

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


@@ -414,10 +463,10 @@ public:
 #define IMP_PYCALLBACK_VOID_INTINT(CLASS, PCLASS, CBNAME)               \
     void CLASS::CBNAME(int a, int b) {                                  \
         bool found;                                                     \
 #define IMP_PYCALLBACK_VOID_INTINT(CLASS, PCLASS, CBNAME)               \
     void CLASS::CBNAME(int a, int b) {                                  \
         bool found;                                                     \

-        wxPyBeginBlockThreads();                    \
+        wxPyBeginBlockThreads();                                        \

         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))          \
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b));  \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))          \
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b));  \

-        wxPyEndBlockThreads();                                     \
+        wxPyEndBlockThreads();                                          \

         if (! found)                                                    \
             PCLASS::CBNAME(a,b);                                        \
     }                                                                   \
         if (! found)                                                    \
             PCLASS::CBNAME(a,b);                                        \
     }                                                                   \


@@ -427,6 +476,133 @@ public:
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

+#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);


@@ -435,10 +611,10 @@ public:
 #define IMP_PYCALLBACK_BOOL_INT(CLASS, PCLASS, CBNAME)                  \
     bool CLASS::CBNAME(int a) {                                         \
         bool rval=FALSE, found;                                         \
 #define IMP_PYCALLBACK_BOOL_INT(CLASS, PCLASS, CBNAME)                  \
     bool CLASS::CBNAME(int a) {                                         \
         bool rval=FALSE, found;                                         \

-        wxPyBeginBlockThreads();                    \
+        wxPyBeginBlockThreads();                                        \

         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))          \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)",a));\
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))          \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)",a));\

-        wxPyEndBlockThreads();                                     \
+        wxPyEndBlockThreads();                                          \

         if (! found)                                                    \
             rval = PCLASS::CBNAME(a);                                   \
         return rval;                                                    \
         if (! found)                                                    \
             rval = PCLASS::CBNAME(a);                                   \
         return rval;                                                    \


@@ -784,10 +960,10 @@ public:
 #define IMP_PYCALLBACK__BOOL2DBLINT(CLASS, PCLASS, CBNAME)                      \
     void CLASS::CBNAME(bool a, double b, double c, int d) {                     \
         bool found;                                                             \
 #define IMP_PYCALLBACK__BOOL2DBLINT(CLASS, PCLASS, CBNAME)                      \
     void CLASS::CBNAME(bool a, double b, double c, int d) {                     \
         bool found;                                                             \

-        wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                                                \

         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iddi)", (int)a,b,c,d));\
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iddi)", (int)a,b,c,d));\

-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads();                                                  \

         if (! found)                                                            \
             PCLASS::CBNAME(a, b, c, d);                                         \
     }                                                                           \
         if (! found)                                                            \
             PCLASS::CBNAME(a, b, c, d);                                         \
     }                                                                           \


@@ -802,14 +978,16 @@ 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 found;                                                             \
 #define IMP_PYCALLBACK__STRING(CLASS, PCLASS, CBNAME)                           \
     void CLASS::CBNAME(const wxString& a)  {                                    \
         bool found;                                                             \

-        wxPyBeginBlockThreads();                            \
-        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
-            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(s)", a.c_str()));    \
-        wxPyEndBlockThreads();                                             \
+        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);                                                  \
     }                                                                           \
         if (! found)                                                            \
             PCLASS::CBNAME(a);                                                  \
     }                                                                           \


@@ -823,15 +1001,17 @@ 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)  {                                    \
         bool rval=FALSE;                                                        \
         bool found;                                                             \
 #define IMP_PYCALLBACK_BOOL_STRING(CLASS, PCLASS, CBNAME)                       \
     bool CLASS::CBNAME(const wxString& a)  {                                    \
         bool rval=FALSE;                                                        \
         bool found;                                                             \

-        wxPyBeginBlockThreads();                            \
-        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
-            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(s)", a.c_str()));\
-        wxPyEndBlockThreads();                                             \
+        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);                                           \
         return rval;                                                            \
         if (! found)                                                            \
             rval = PCLASS::CBNAME(a);                                           \
         return rval;                                                            \


@@ -844,16 +1024,19 @@ public:
 
 #define DEC_PYCALLBACK_BOOL_STRING_pure(CBNAME)         \
     bool CBNAME(const wxString& a);
 
 #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))                                    \
-            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(s)", a.c_str()));     \
-        wxPyEndBlockThreads();                                                     \
-        return rval;                                                                    \
-    }                                                                                   \
+
+#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;                                                            \
+    }                                                                           \

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


@@ -863,17 +1046,18 @@ public:
 #define IMP_PYCALLBACK_STRING_STRING_pure(CLASS, PCLASS, CBNAME)                \
     wxString CLASS::CBNAME(const wxString& a)  {                                \
         wxString rval;                                                          \
 #define IMP_PYCALLBACK_STRING_STRING_pure(CLASS, PCLASS, CBNAME)                \
     wxString CLASS::CBNAME(const wxString& a)  {                                \
         wxString rval;                                                          \

-        wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                                                \

         if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
             PyObject* ro;                                                       \
         if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
             PyObject* ro;                                                       \

-            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(s)", a.c_str()));\
+            PyObject* s = wx2PyString(a);                                       \
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(O)", s));    \
+            Py_DECREF(s);                                                       \

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

-                PyObject* str = PyObject_Str(ro);                               \
-                rval = PyString_AsString(str);                                  \
-                Py_DECREF(ro);   Py_DECREF(str);                                \
+                rval = Py2wxString(ro);                                         \
+                Py_DECREF(ro);                                                  \

             }                                                                   \
         }                                                                       \
             }                                                                   \
         }                                                                       \

-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads();                                                  \

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


@@ -885,17 +1069,18 @@ public:
 #define IMP_PYCALLBACK_STRING_STRINGINT_pure(CLASS, PCLASS, CBNAME)             \
     wxString CLASS::CBNAME(const wxString& a,int b)  {                          \
         wxString rval;                                                          \
 #define IMP_PYCALLBACK_STRING_STRINGINT_pure(CLASS, PCLASS, CBNAME)             \
     wxString CLASS::CBNAME(const wxString& a,int b)  {                          \
         wxString rval;                                                          \

-        wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                                                \

         if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
             PyObject* ro;                                                       \
         if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
             PyObject* ro;                                                       \

-            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(si)", a.c_str(),b));  \
+            PyObject* s = wx2PyString(a);                                       \
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(Oi)",s,b));  \
+            Py_DECREF(s);                                                       \

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

-                PyObject* str = PyObject_Str(ro);                               \
-                rval = PyString_AsString(str);                                  \
-                Py_DECREF(ro);   Py_DECREF(str);                                \
+                rval = Py2wxString(ro);                                         \
+                Py_DECREF(ro);                                                  \

             }                                                                   \
         }                                                                       \
             }                                                                   \
         }                                                                       \

-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads();                                                  \

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


@@ -905,16 +1090,19 @@ public:
     bool CBNAME(const wxString& a, const wxString& b);        \
     bool base_##CBNAME(const wxString& a, const wxString& b);
 
     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) {                  \
         bool rval=FALSE;                                                        \
         bool found;                                                             \
 #define IMP_PYCALLBACK_BOOL_STRINGSTRING(CLASS, PCLASS, CBNAME)                 \
     bool CLASS::CBNAME(const wxString& a, const wxString& b) {                  \
         bool rval=FALSE;                                                        \
         bool found;                                                             \

-        wxPyBeginBlockThreads();                            \
-        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
-            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ss)",         \
-                                                       a.c_str(), b.c_str()));  \
-        wxPyEndBlockThreads();                                             \
+        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);                                        \
         return rval;                                                            \
         if (! found)                                                            \
             rval = PCLASS::CBNAME(a, b);                                        \
         return rval;                                                            \


@@ -929,7 +1117,6 @@ 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;                                                          \


@@ -939,12 +1126,11 @@ public:
             PyObject* ro;                                                       \
             ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));        \
             if (ro) {                                                           \
             PyObject* ro;                                                       \
             ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));        \
             if (ro) {                                                           \

-                PyObject* str = PyObject_Str(ro);                               \
-                rval = PyString_AsString(str);                                  \
-                Py_DECREF(ro);  Py_DECREF(str);                                 \
+                rval = Py2wxString(ro);                                         \
+                Py_DECREF(ro);                                                  \

             }                                                                   \
         }                                                                       \
             }                                                                   \
         }                                                                       \

-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads();                                                  \

         if (! found)                                                            \
             rval = PCLASS::CBNAME();                                            \
         return rval;                                                            \
         if (! found)                                                            \
             rval = PCLASS::CBNAME();                                            \
         return rval;                                                            \


@@ -958,7 +1144,6 @@ 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;                                                          \


@@ -967,12 +1152,11 @@ public:
             PyObject* ro;                                                       \
             ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));        \
             if (ro) {                                                           \
             PyObject* ro;                                                       \
             ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));        \
             if (ro) {                                                           \

-                PyObject* str = PyObject_Str(ro);                               \
-                rval = PyString_AsString(str);                                  \
-                Py_DECREF(ro);   Py_DECREF(str);                                \
+                rval = Py2wxString(ro);                                         \
+                Py_DECREF(ro);                                                  \

             }                                                                   \
         }                                                                       \
             }                                                                   \
         }                                                                       \

-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads();                                                  \

         return rval;                                                            \
     }
 
         return rval;                                                            \
     }
 


@@ -985,13 +1169,13 @@ public:
 #define IMP_PYCALLBACK_BOOL_TAG_pure(CLASS, PCLASS, CBNAME)                     \
     bool CLASS::CBNAME(const wxHtmlTag& a)  {                                   \
         bool rval=FALSE;                                                        \
 #define IMP_PYCALLBACK_BOOL_TAG_pure(CLASS, PCLASS, CBNAME)                     \
     bool CLASS::CBNAME(const wxHtmlTag& a)  {                                   \
         bool rval=FALSE;                                                        \

-        wxPyBeginBlockThreads();                            \
+        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);                                                     \
         }                                                                       \
         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();                                             \
+        wxPyEndBlockThreads();                                                  \

         return rval;                                                            \
     }
 
         return rval;                                                            \
     }
 


@@ -1003,15 +1187,14 @@ public:
 
 #define IMP_PYCALLBACK__CELLINTINT(CLASS, PCLASS, CBNAME)                       \
     void CLASS::CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y) {                \
 
 #define IMP_PYCALLBACK__CELLINTINT(CLASS, PCLASS, CBNAME)                       \
     void CLASS::CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y) {                \

-        wxString rval;                                                          \

         bool found;                                                             \
         bool found;                                                             \

-        wxPyBeginBlockThreads();                            \
+        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);                                                     \
         }                                                                       \
         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();                                             \
+        wxPyEndBlockThreads();                                                  \

         if (! found)                                                            \
             PCLASS::CBNAME(cell, x, y);                                         \
     }                                                                           \
         if (! found)                                                            \
             PCLASS::CBNAME(cell, x, y);                                         \
     }                                                                           \


@@ -1029,7 +1212,7 @@ public:
 #define IMP_PYCALLBACK__CELLINTINTME(CLASS, PCLASS, CBNAME)                       \
     void CLASS::CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& e) {                \
         bool found;                                                             \
 #define IMP_PYCALLBACK__CELLINTINTME(CLASS, PCLASS, CBNAME)                       \
     void CLASS::CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& e) {                \
         bool found;                                                             \

-        wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                                                \

         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
             PyObject* obj = wxPyConstructObject((void*)cell, "wxHtmlCell", 0);  \
             PyObject* o2  = wxPyConstructObject((void*)&e, "wxMouseEvent", 0);  \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
             PyObject* obj = wxPyConstructObject((void*)cell, "wxHtmlCell", 0);  \
             PyObject* o2  = wxPyConstructObject((void*)&e, "wxMouseEvent", 0);  \


@@ -1037,12 +1220,12 @@ public:
             Py_DECREF(obj);                                                     \
             Py_DECREF(o2);                                                      \
         }                                                                       \
             Py_DECREF(obj);                                                     \
             Py_DECREF(o2);                                                      \
         }                                                                       \

-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads();                                                  \

         if (! found)                                                            \
         if (! found)                                                            \

-            PCLASS::CBNAME(cell, x, y, e);                                         \
+            PCLASS::CBNAME(cell, x, y, e);                                      \

     }                                                                           \
     void CLASS::base_##CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& e) {         \
     }                                                                           \
     void CLASS::base_##CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& e) {         \

-        PCLASS::CBNAME(cell, x, y, e);                                             \
+        PCLASS::CBNAME(cell, x, y, e);                                          \

     }
 
 
     }
 
 


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

-        wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                                                \

         if (wxPyCBH_findCallback(m_myInst, #CBNAME))                            \
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));                \
         if (wxPyCBH_findCallback(m_myInst, #CBNAME))                            \
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));                \

-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads();                                                  \

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


@@ -1069,8 +1252,9 @@ 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);                                                       \

-        wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                                                \

         if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
             PyObject* ro;                                                       \
             wxSize*   ptr;                                                      \
         if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
             PyObject* ro;                                                       \
             wxSize*   ptr;                                                      \


@@ -1078,10 +1262,23 @@ public:
             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);                                                  \
             }                                                                   \
         }                                                                       \

-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads();                                                  \

         return rval;                                                            \
     }
 
         return rval;                                                            \
     }
 


@@ -1096,13 +1293,13 @@ public:
     bool CLASS::CBNAME(wxWindow* a) {                                           \
         bool rval=FALSE;                                                        \
         bool found;                                                             \
     bool CLASS::CBNAME(wxWindow* a) {                                           \
         bool rval=FALSE;                                                        \
         bool found;                                                             \

-        wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                                                \

         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
             PyObject* obj = wxPyMake_wxObject(a);                               \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj));   \
             Py_DECREF(obj);                                                     \
         }                                                                       \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
             PyObject* obj = wxPyMake_wxObject(a);                               \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj));   \
             Py_DECREF(obj);                                                     \
         }                                                                       \

-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads();                                                  \

         if (! found)                                                            \
             rval = PCLASS::CBNAME(a);                                           \
         return rval;                                                            \
         if (! found)                                                            \
             rval = PCLASS::CBNAME(a);                                           \
         return rval;                                                            \


@@ -1122,10 +1319,10 @@ public:
     bool CLASS::CBNAME() {                                                      \
         bool rval=FALSE;                                                        \
         bool found;                                                             \
     bool CLASS::CBNAME() {                                                      \
         bool rval=FALSE;                                                        \
         bool found;                                                             \

-        wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                                                \

         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));         \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));         \

-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads();                                                  \

         if (! found)                                                            \
             rval = PCLASS::CBNAME();                                            \
         return rval;                                                            \
         if (! found)                                                            \
             rval = PCLASS::CBNAME();                                            \
         return rval;                                                            \


@@ -1136,6 +1333,29 @@ public:
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

+#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);        \
     wxDragResult base_##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);


@@ -1145,10 +1365,10 @@ public:
     wxDragResult CLASS::CBNAME(wxCoord a, wxCoord b, wxDragResult c) {          \
         int rval=0;                                                             \
         bool found;                                                             \
     wxDragResult CLASS::CBNAME(wxCoord a, wxCoord b, wxDragResult c) {          \
         int rval=0;                                                             \
         bool found;                                                             \

-        wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                                                \

         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));\
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));\

-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads();                                                  \

         if (! found)                                                            \
             rval = PCLASS::CBNAME(a, b, c);                                     \
         return (wxDragResult)rval;                                              \
         if (! found)                                                            \
             rval = PCLASS::CBNAME(a, b, c);                                     \
         return (wxDragResult)rval;                                              \


@@ -1164,20 +1384,22 @@ public:
 
 #define IMP_PYCALLBACK_FSF_FSSTRING_pure(CLASS, PCLASS, CBNAME)         \
     wxFSFile* CLASS::CBNAME(wxFileSystem& a,const wxString& b) {        \
 
 #define IMP_PYCALLBACK_FSF_FSSTRING_pure(CLASS, PCLASS, CBNAME)         \
     wxFSFile* CLASS::CBNAME(wxFileSystem& a,const wxString& b) {        \

-        wxPyBeginBlockThreads();                    \
+        wxPyBeginBlockThreads();                                        \

         wxFSFile* rval=0;                                               \
         if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                  \
             PyObject* ro;                                               \
             PyObject* obj = wxPyMake_wxObject(&a);                      \
         wxFSFile* rval=0;                                               \
         if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                  \
             PyObject* ro;                                               \
             PyObject* obj = wxPyMake_wxObject(&a);                      \

-            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(Os)",\
-                                          obj, b.c_str()));             \
+            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);                                             \
             if (ro) {                                                   \
                 SWIG_GetPtrObj(ro, (void **)&rval, "_wxFSFILE_p");      \
                 Py_DECREF(ro);                                          \
             }                                                           \
             Py_DECREF(obj);                                             \

+            Py_DECREF(s);                                               \

         }                                                               \
         }                                                               \

-        wxPyEndBlockThreads();                                     \
+        wxPyEndBlockThreads();                                          \

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


@@ -1192,10 +1414,10 @@ public:
     bool CLASS::CBNAME(wxDragResult a) {                                \
         bool rval=FALSE;                                                \
         bool found;                                                     \
     bool CLASS::CBNAME(wxDragResult a) {                                \
         bool rval=FALSE;                                                \
         bool found;                                                     \

-        wxPyBeginBlockThreads();                    \
+        wxPyBeginBlockThreads();                                        \

         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))          \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a));\
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))          \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a));\

-        wxPyEndBlockThreads();                                     \
+        wxPyEndBlockThreads();                                          \

         if (! found)                                                    \
             rval = PCLASS::CBNAME(a);                                   \
         return rval;                                                    \
         if (! found)                                                    \
             rval = PCLASS::CBNAME(a);                                   \
         return rval;                                                    \


@@ -1212,11 +1434,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) {  \

-        wxPyBeginBlockThreads();                    \
+        wxPyBeginBlockThreads();                                        \

         int rval=0;                                                     \
         if (wxPyCBH_findCallback(m_myInst, #CBNAME))                    \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));\
         int rval=0;                                                     \
         if (wxPyCBH_findCallback(m_myInst, #CBNAME))                    \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));\

-        wxPyEndBlockThreads();                                     \
+        wxPyEndBlockThreads();                                          \

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


@@ -1225,14 +1447,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) {               \
         bool rval=FALSE;                                                \
 #define IMP_PYCALLBACK_BOOL_INTINTSTR_pure(CLASS, PCLASS, CBNAME)       \
     bool CLASS::CBNAME(int a, int b, const wxString& c) {               \
         bool rval=FALSE;                                                \

-        wxPyBeginBlockThreads();                    \
-        if (wxPyCBH_findCallback(m_myInst, #CBNAME))                    \
-            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iis)",a,b,c.c_str()));\
-        wxPyEndBlockThreads();                                     \
+        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;                                                    \
     }                                                                   \
 


@@ -1247,10 +1471,10 @@ public:
     size_t CLASS::CBNAME() {                                                    \
         size_t rval=0;                                                          \
         bool found;                                                             \
     size_t CLASS::CBNAME() {                                                    \
         size_t rval=0;                                                          \
         bool found;                                                             \

-        wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                                                \

         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));         \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));         \

-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads();                                                  \

         if (! found)                                                            \
             rval = PCLASS::CBNAME();                                            \
         return rval;                                                            \
         if (! found)                                                            \
             rval = PCLASS::CBNAME();                                            \
         return rval;                                                            \


@@ -1270,7 +1494,7 @@ public:
     wxDataFormat CLASS::CBNAME(size_t a) {                                      \
         wxDataFormat rval=0;                                                    \
         bool found;                                                             \
     wxDataFormat CLASS::CBNAME(size_t a) {                                      \
         wxDataFormat rval=0;                                                    \
         bool found;                                                             \

-        wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                                                \

         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
             PyObject* ro;                                                       \
             wxDataFormat* ptr;                                                  \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
             PyObject* ro;                                                       \
             wxDataFormat* ptr;                                                  \


@@ -1281,7 +1505,7 @@ public:
                 Py_DECREF(ro);                                                  \
             }                                                                   \
         }                                                                       \
                 Py_DECREF(ro);                                                  \
             }                                                                   \
         }                                                                       \

-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads();                                                  \

         if (! found)                                                            \
             rval = PCLASS::CBNAME(a);                                           \
         return rval;                                                            \
         if (! found)                                                            \
             rval = PCLASS::CBNAME(a);                                           \
         return rval;                                                            \


@@ -1300,13 +1524,13 @@ public:
 #define IMP_PYCALLBACK__constany(CLASS, PCLASS, CBNAME, Type)                   \
     void CLASS::CBNAME(const Type& a) {                                         \
         bool found;                                                             \
 #define IMP_PYCALLBACK__constany(CLASS, PCLASS, CBNAME, Type)                   \
     void CLASS::CBNAME(const Type& a) {                                         \
         bool found;                                                             \

-        wxPyBeginBlockThreads();                            \
+        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);                                                     \
         }                                                                       \
         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();                                             \
+        wxPyEndBlockThreads();                                                  \

         if (! found)                                                            \
             PCLASS::CBNAME(a);                                                  \
     }                                                                           \
         if (! found)                                                            \
             PCLASS::CBNAME(a);                                                  \
     }                                                                           \


@@ -1325,13 +1549,13 @@ public:
 #define IMP_PYCALLBACK__any(CLASS, PCLASS, CBNAME, Type)                        \
     void CLASS::CBNAME(Type& a) {                                               \
         bool found;                                                             \
 #define IMP_PYCALLBACK__any(CLASS, PCLASS, CBNAME, Type)                        \
     void CLASS::CBNAME(Type& a) {                                               \
         bool found;                                                             \

-        wxPyBeginBlockThreads();                            \
+        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);                                                     \
         }                                                                       \
         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();                                             \
+        wxPyEndBlockThreads();                                                  \

         if (! found)                                                            \
             PCLASS::CBNAME(a);                                                  \
     }                                                                           \
         if (! found)                                                            \
             PCLASS::CBNAME(a);                                                  \
     }                                                                           \


@@ -1350,13 +1574,13 @@ public:
     bool CLASS::CBNAME(Type& a) {                                               \
         bool rv=FALSE;                                                          \
         bool found;                                                             \
     bool CLASS::CBNAME(Type& a) {                                               \
         bool rv=FALSE;                                                          \
         bool found;                                                             \

-        wxPyBeginBlockThreads();                            \
+        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);                                                     \
         }                                                                       \
         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();                                             \
+        wxPyEndBlockThreads();                                                  \

         if (! found)                                                            \
             rv = PCLASS::CBNAME(a);                                             \
         return rv;                                                              \
         if (! found)                                                            \
             rv = PCLASS::CBNAME(a);                                             \
         return rv;                                                              \


@@ -1371,22 +1595,20 @@ public:
     wxString CBNAME(long a, long b) const;                                      \
     wxString base_##CBNAME(long a, long b)const ;
 
     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;                                                             \
 #define IMP_PYCALLBACK_STRING_LONGLONG(CLASS, PCLASS, CBNAME)                   \
     wxString CLASS::CBNAME(long a, long b) const {                              \
         wxString rval;                                                          \
         bool found;                                                             \

-        wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                                                \

         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
             PyObject* ro;                                                       \
             ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ll)",a,b));  \
             if (ro) {                                                           \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
             PyObject* ro;                                                       \
             ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ll)",a,b));  \
             if (ro) {                                                           \

-                PyObject* str = PyObject_Str(ro);                               \
-                rval = PyString_AsString(str);                                  \
-                Py_DECREF(ro);   Py_DECREF(str);                                \
+                rval = Py2wxString(ro);                                         \
+                Py_DECREF(ro);                                                  \

             }                                                                   \
         }                                                                       \
             }                                                                   \
         }                                                                       \

-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads();                                                  \

         if (! found)                                                            \
             rval = PCLASS::CBNAME(a,b);                                         \
         return rval;                                                            \
         if (! found)                                                            \
             rval = PCLASS::CBNAME(a,b);                                         \
         return rval;                                                            \


@@ -1406,7 +1628,7 @@ public:
     int CLASS::CBNAME(long a) const {                                           \
         int rval=-1;                                                            \
         bool found;                                                             \
     int CLASS::CBNAME(long a) const {                                           \
         int rval=-1;                                                            \
         bool found;                                                             \

-        wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                                                \

         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
             PyObject* ro;                                                       \
             ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(l)",a));     \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
             PyObject* ro;                                                       \
             ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(l)",a));     \


@@ -1415,7 +1637,7 @@ public:
                 Py_DECREF(ro);                                                  \
             }                                                                   \
         }                                                                       \
                 Py_DECREF(ro);                                                  \
             }                                                                   \
         }                                                                       \

-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads();                                                  \

         if (! found)                                                            \
             rval = PCLASS::CBNAME(a);                                           \
         return rval;                                                            \
         if (! found)                                                            \
             rval = PCLASS::CBNAME(a);                                           \
         return rval;                                                            \


@@ -1436,7 +1658,7 @@ public:
     wxListItemAttr *CLASS::CBNAME(long a) const {                               \
         wxListItemAttr *rval = NULL;                                            \
         bool found;                                                             \
     wxListItemAttr *CLASS::CBNAME(long a) const {                               \
         wxListItemAttr *rval = NULL;                                            \
         bool found;                                                             \

-        wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                                                \

         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
             PyObject* ro;                                                       \
             wxListItemAttr* ptr;                                                \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
             PyObject* ro;                                                       \
             wxListItemAttr* ptr;                                                \


@@ -1447,7 +1669,7 @@ public:
                 Py_DECREF(ro);                                                  \
             }                                                                   \
         }                                                                       \
                 Py_DECREF(ro);                                                  \
             }                                                                   \
         }                                                                       \

-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads();                                                  \

         if (! found)                                                            \
             rval = PCLASS::CBNAME(a);                                           \
         return rval;                                                            \
         if (! found)                                                            \
             rval = PCLASS::CBNAME(a);                                           \
         return rval;                                                            \


@@ -1458,32 +1680,32 @@ public:
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-#define DEC_PYCALLBACK_BOOL_ME(CBNAME) \
-    bool CBNAME(wxMouseEvent& e); \
+#define DEC_PYCALLBACK_BOOL_ME(CBNAME)                                          \
+    bool CBNAME(wxMouseEvent& e);                                               \

     bool base_##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); \
+#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);                                               \

     }
 
 
     }