Emptied patch.rsp

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

diff --git a/wxPython/src/helpers.cpp b/wxPython/src/helpers.cpp
index 32578bf5f6832591e77e785c8162a8b9cf01a2d9..8216a27e4ea2ec35062cab17465feeebb03f80e7 100644 (file)
--- a/wxPython/src/helpers.cpp
+++ b/wxPython/src/helpers.cpp
@@ -18,35 +18,16 @@
 
 #ifdef __WXMSW__
 #include <wx/msw/private.h>
 
 #ifdef __WXMSW__
 #include <wx/msw/private.h>

-#undef FindWindow
-#undef GetCharWidth
-#undef LoadAccelerators
-#undef GetClassInfo
-#undef GetClassName
+#include <wx/msw/winundef.h>

 #endif
 
 #ifdef __WXGTK__
 #include <gtk/gtk.h>
 #include <gdk/gdkprivate.h>
 #include <wx/gtk/win_gtk.h>
 #endif
 
 #ifdef __WXGTK__
 #include <gtk/gtk.h>
 #include <gdk/gdkprivate.h>
 #include <wx/gtk/win_gtk.h>

-//#include <gdk/gdk.h>
-//#include <gdk/gdkx.h>
-//#include <gtk/gtkwindow.h>
-
-//extern GtkWidget *wxRootWindow;
-

 #endif
 
 
 #endif
 
 

-//---------------------------------------------------------------------------
-
-//wxHashTable*  wxPyWindows = NULL;
-
-
-wxPoint     wxPyDefaultPosition;        //wxDefaultPosition);
-wxSize      wxPyDefaultSize;            //wxDefaultSize);
-wxString    wxPyEmptyStr("");
-

 
 
 #ifdef __WXMSW__             // If building for win32...
 
 
 #ifdef __WXMSW__             // If building for win32...


@@ -105,15 +86,19 @@ int  wxPyApp::MainLoop(void) {
 //---------------------------------------------------------------------
 //----------------------------------------------------------------------
 
 //---------------------------------------------------------------------
 //----------------------------------------------------------------------
 

+#ifdef __WXMSW__
+#include "wx/msw/msvcrt.h"
+#endif
+
+

 int  WXDLLEXPORT wxEntryStart( int argc, char** argv );
 int  WXDLLEXPORT wxEntryInitGui();
 void WXDLLEXPORT wxEntryCleanup();
 
 
 #ifdef WXP_WITH_THREAD
 int  WXDLLEXPORT wxEntryStart( int argc, char** argv );
 int  WXDLLEXPORT wxEntryInitGui();
 void WXDLLEXPORT wxEntryCleanup();
 
 
 #ifdef WXP_WITH_THREAD

-PyThreadState*  wxPyEventThreadState = NULL;
+PyInterpreterState* wxPyInterpreter = NULL;

 #endif
 #endif

-static char* __nullArgv[1] = { 0 };

 
 
 // This is where we pick up the first part of the wxEntry functionality...
 
 
 // This is where we pick up the first part of the wxEntry functionality...


@@ -121,9 +106,14 @@ static char* __nullArgv[1] = { 0 };
 // wxcmodule is imported.  (Before there is a wxApp object.)
 void __wxPreStart()
 {
 // wxcmodule is imported.  (Before there is a wxApp object.)
 void __wxPreStart()
 {

+
+#ifdef __WXMSW__
+//    wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF);
+#endif
+

 #ifdef WXP_WITH_THREAD
     PyEval_InitThreads();
 #ifdef WXP_WITH_THREAD
     PyEval_InitThreads();

-    wxPyEventThreadState = PyThreadState_Get();
+    wxPyInterpreter = PyThreadState_Get()->interp;

 #endif
 
     // Bail out if there is already windows created.  This means that the
 #endif
 
     // Bail out if there is already windows created.  This means that the


@@ -133,13 +123,17 @@ void __wxPreStart()
         return;
 
 
         return;
 
 

+    int argc = 0;
+    char** argv = NULL;

     PyObject* sysargv = PySys_GetObject("argv");
     PyObject* sysargv = PySys_GetObject("argv");

-    int argc = PyList_Size(sysargv);
-    char** argv = new char*[argc+1];
-    int x;
-    for(x=0; x<argc; x++)
-        argv[x] = PyString_AsString(PyList_GetItem(sysargv, x));
-    argv[argc] = NULL;
+    if (sysargv != NULL) {
+        argc = PyList_Size(sysargv);
+        argv = new char*[argc+1];
+        int x;
+        for(x=0; x<argc; x++)
+            argv[x] = copystring(PyString_AsString(PyList_GetItem(sysargv, x)));
+        argv[argc] = NULL;
+    }

 
     wxEntryStart(argc, argv);
     delete [] argv;
 
     wxEntryStart(argc, argv);
     delete [] argv;


@@ -158,21 +152,25 @@ PyObject* __wxStart(PyObject* /* self */, PyObject* args)
     if (!PyArg_ParseTuple(args, "O", &onInitFunc))
         return NULL;
 
     if (!PyArg_ParseTuple(args, "O", &onInitFunc))
         return NULL;
 

+#if 0  // Try it out without this check, see how it does...

     if (wxTopLevelWindows.Number() > 0) {
         PyErr_SetString(PyExc_TypeError, "Only 1 wxApp per process!");
         return NULL;
     }
     if (wxTopLevelWindows.Number() > 0) {
         PyErr_SetString(PyExc_TypeError, "Only 1 wxApp per process!");
         return NULL;
     }

-
+#endif

 
     // This is the next part of the wxEntry functionality...
 
     // This is the next part of the wxEntry functionality...

+    int argc = 0;
+    char** argv = NULL;

     PyObject* sysargv = PySys_GetObject("argv");
     PyObject* sysargv = PySys_GetObject("argv");

-    int argc = PyList_Size(sysargv);
-    char** argv = new char*[argc+1];
-    int x;
-    for(x=0; x<argc; x++)
-        argv[x] = PyString_AsString(PyList_GetItem(sysargv, x));
-    argv[argc] = NULL;
-
+    if (sysargv != NULL) {
+        argc = PyList_Size(sysargv);
+        argv = new char*[argc+1];
+        int x;
+        for(x=0; x<argc; x++)
+            argv[x] = copystring(PyString_AsString(PyList_GetItem(sysargv, x)));
+        argv[argc] = NULL;
+    }

     wxPythonApp->argc = argc;
     wxPythonApp->argv = argv;
 
     wxPythonApp->argc = argc;
     wxPythonApp->argv = argv;
 


@@ -209,7 +207,9 @@ void __wxCleanup() {
 
 
 
 
 
 

-PyObject* wxPython_dict;
+static PyObject* wxPython_dict = NULL;
+static PyObject* wxPyPtrTypeMap = NULL;
+

 PyObject* __wxSetDictionary(PyObject* /* self */, PyObject* args)
 {
 
 PyObject* __wxSetDictionary(PyObject* /* self */, PyObject* args)
 {
 


@@ -220,6 +220,12 @@ PyObject* __wxSetDictionary(PyObject* /* self */, PyObject* args)
         PyErr_SetString(PyExc_TypeError, "_wxSetDictionary must have dictionary object!");
         return NULL;
     }
         PyErr_SetString(PyExc_TypeError, "_wxSetDictionary must have dictionary object!");
         return NULL;
     }

+
+    if (! wxPyPtrTypeMap)
+        wxPyPtrTypeMap = PyDict_New();
+    PyDict_SetItemString(wxPython_dict, "__wxPyPtrTypeMap", wxPyPtrTypeMap);
+
+

 #ifdef __WXMOTIF__
 #define wxPlatform "__WXMOTIF__"
 #endif
 #ifdef __WXMOTIF__
 #define wxPlatform "__WXMOTIF__"
 #endif


@@ -244,71 +250,202 @@ PyObject* __wxSetDictionary(PyObject* /* self */, PyObject* args)
 
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------

+// Stuff used by OOR to find the right wxPython class type to return and to
+// build it.

 
 

-PyObject* wxPyConstructObject(void* ptr, const char* className) {
-    char    buff[64];               // should always be big enough...
-    char    swigptr[64];

 
 

-    sprintf(buff, "_%s_p", className);
-    SWIG_MakePtr(swigptr, ptr, buff);
+// The pointer type map is used when the "pointer" type name generated by SWIG
+// is not the same as the shadow class name, for example wxPyTreeCtrl
+// vs. wxTreeCtrl.  It needs to be referenced in Python as well as from C++,
+// so we'll just make it a Python dictionary in the wx module's namespace.
+void wxPyPtrTypeMap_Add(const char* commonName, const char* ptrName) {
+    if (! wxPyPtrTypeMap)
+        wxPyPtrTypeMap = PyDict_New();
+
+    PyDict_SetItemString(wxPyPtrTypeMap,
+                         (char*)commonName,
+                         PyString_FromString((char*)ptrName));
+}
+
+
+
+PyObject* wxPyClassExists(const char* className) {
+
+    if (!className)
+        return NULL;
+
+    char    buff[64];               // should always be big enough...

 
     sprintf(buff, "%sPtr", className);
     PyObject* classobj = PyDict_GetItemString(wxPython_dict, buff);
 
     sprintf(buff, "%sPtr", className);
     PyObject* classobj = PyDict_GetItemString(wxPython_dict, buff);

-    if (! classobj) {
-        Py_INCREF(Py_None);
-        return Py_None;
+
+    return classobj;  // returns NULL if not found
+}
+
+
+PyObject*  wxPyMake_wxObject(wxObject* source, bool checkEvtHandler) {
+    PyObject* target = NULL;
+    bool      isEvtHandler = FALSE;
+
+    if (source) {
+        // If it's derived from wxEvtHandler then there may
+        // already be a pointer to a Python object that we can use
+        // in the OOR data.
+        if (checkEvtHandler && wxIsKindOf(source, wxEvtHandler)) {
+            isEvtHandler = TRUE;
+            wxEvtHandler* eh = (wxEvtHandler*)source;
+            wxPyClientData* data = (wxPyClientData*)eh->GetClientObject();
+            if (data) {
+                target = data->m_obj;
+                Py_INCREF(target);
+            }
+        }
+
+        if (! target) {
+            // Otherwise make it the old fashioned way by making a
+            // new shadow object and putting this pointer in it.
+            wxClassInfo* info = source->GetClassInfo();
+            wxChar*      name = (wxChar*)info->GetClassName();
+            PyObject*    klass = wxPyClassExists(name);
+            while (info && !klass) {
+                name = (wxChar*)info->GetBaseClassName1();
+                info = wxClassInfo::FindClass(name);
+                klass = wxPyClassExists(name);
+            }
+            if (info) {
+                target = wxPyConstructObject(source, name, klass, FALSE);
+                if (target && isEvtHandler)
+                    ((wxEvtHandler*)source)->SetClientObject(new wxPyClientData(target));
+            } else {
+                wxString msg("wxPython class not found for ");
+                msg += source->GetClassInfo()->GetClassName();
+                PyErr_SetString(PyExc_NameError, msg.c_str());
+                target = NULL;
+            }
+        }
+    } else {  // source was NULL so return None.
+        Py_INCREF(Py_None); target = Py_None;
+    }
+    return target;
+}
+
+
+PyObject*  wxPyMake_wxSizer(wxSizer* source) {
+    PyObject* target = NULL;
+
+    if (source && wxIsKindOf(source, wxSizer)) {
+        // If it's derived from wxSizer then there may
+        // already be a pointer to a Python object that we can use
+        // in the OOR data.
+        wxSizer* sz = (wxSizer*)source;
+        wxPyClientData* data = (wxPyClientData*)sz->GetClientObject();
+        if (data) {
+            target = data->m_obj;
+            Py_INCREF(target);
+        }
+    }
+    if (! target) {
+        target = wxPyMake_wxObject(source, FALSE);
+        if (target != Py_None)
+            ((wxSizer*)source)->SetClientObject(new wxPyClientData(target));
+    }
+    return target;
+}
+
+
+
+//---------------------------------------------------------------------------
+
+PyObject* wxPyConstructObject(void* ptr,
+                              const char* className,
+                              PyObject* klass,
+                              int setThisOwn) {
+
+    PyObject* obj;
+    PyObject* arg;
+    PyObject* item;
+    char      swigptr[64];      // should always be big enough...
+    char      buff[64];
+
+    if ((item = PyDict_GetItemString(wxPyPtrTypeMap, (char*)className)) != NULL) {
+        className = PyString_AsString(item);

     }
     }

+    sprintf(buff, "_%s_p", className);
+    SWIG_MakePtr(swigptr, ptr, buff);

 
 

-    PyObject* arg = Py_BuildValue("(s)", swigptr);
-    PyObject* obj = PyInstance_New(classobj, arg, NULL);
+    arg = Py_BuildValue("(s)", swigptr);
+    obj = PyInstance_New(klass, arg, NULL);

     Py_DECREF(arg);
 
     Py_DECREF(arg);
 

+    if (setThisOwn) {
+        PyObject* one = PyInt_FromLong(1);
+        PyObject_SetAttrString(obj, "thisown", one);
+        Py_DECREF(one);
+    }
+

     return obj;
 }
 
     return obj;
 }
 

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

 
 

-static unsigned int _wxPyNestCount = 0;
+PyObject* wxPyConstructObject(void* ptr,
+                              const char* className,
+                              int setThisOwn) {
+    PyObject* obj;
+
+    if (!ptr) {
+        Py_INCREF(Py_None);
+        return Py_None;
+    }

 
 

-static PyThreadState* myPyThreadState_Get() {
-    PyThreadState* current;
-    current = PyThreadState_Swap(NULL);
-    PyThreadState_Swap(current);
-    return current;
+    char    buff[64];               // should always be big enough...
+    sprintf(buff, "%sPtr", className);
+
+        wxASSERT_MSG(wxPython_dict, "wxPython_dict is not set yet!!");
+
+    PyObject* classobj = PyDict_GetItemString(wxPython_dict, buff);
+    if (! classobj) {
+        char temp[128];
+        sprintf(temp,
+                "*** Unknown class name %s, tell Robin about it please ***",
+                buff);
+        obj = PyString_FromString(temp);
+        return obj;
+    }
+
+    return wxPyConstructObject(ptr, className, classobj, setThisOwn);

 }
 
 }
 

+//---------------------------------------------------------------------------
+

 
 

-HELPEREXPORT bool wxPyRestoreThread() {
-    // NOTE: The Python API docs state that if a thread already has the
-    // interpreter lock and calls PyEval_RestoreThread again a deadlock
-    // occurs, so I put in this code as a guard condition since there are
-    // many possibilites for nested events and callbacks in wxPython.  If
-    // The current thread is our thread, then we can assume that we
-    // already have the lock.  (I hope!)
-    //
+wxPyTState* wxPyBeginBlockThreads() {
+    wxPyTState* state = NULL;

 #ifdef WXP_WITH_THREAD
 #ifdef WXP_WITH_THREAD

-    _wxPyNestCount += 1;
-    if (wxPyEventThreadState != myPyThreadState_Get()) {
-        PyEval_RestoreThread(wxPyEventThreadState);
-        return TRUE;
+    if (1) {   // Can I check if I've already got the lock?
+        state = new wxPyTState;
+        PyEval_AcquireLock();
+        state->newState = PyThreadState_New(wxPyInterpreter);
+        state->prevState = PyThreadState_Swap(state->newState);

     }
     }

-    else

 #endif
 #endif

-        return FALSE;
+    return state;

 }
 
 
 }
 
 

-HELPEREXPORT void wxPySaveThread(bool doSave) {
+void wxPyEndBlockThreads(wxPyTState* state) {

 #ifdef WXP_WITH_THREAD
 #ifdef WXP_WITH_THREAD

-    if (doSave) {
-        wxPyEventThreadState = PyEval_SaveThread();
+    if (state) {
+        PyThreadState_Swap(state->prevState);
+        PyThreadState_Clear(state->newState);
+        PyEval_ReleaseLock();
+        PyThreadState_Delete(state->newState);
+        delete state;

     }
     }

-    _wxPyNestCount -= 1;

 #endif
 }
 
 #endif
 }
 

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

 
 

+//---------------------------------------------------------------------------

 
 IMPLEMENT_ABSTRACT_CLASS(wxPyCallback, wxObject);
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxPyCallback, wxObject);
 


@@ -323,9 +460,9 @@ wxPyCallback::wxPyCallback(const wxPyCallback& other) {
 }
 
 wxPyCallback::~wxPyCallback() {
 }
 
 wxPyCallback::~wxPyCallback() {

-    bool doSave = wxPyRestoreThread();
+    wxPyTState* state = wxPyBeginBlockThreads();

     Py_DECREF(m_func);
     Py_DECREF(m_func);

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

 }
 
 
 }
 
 


@@ -339,7 +476,7 @@ void wxPyCallback::EventThunker(wxEvent& event) {
     PyObject*       tuple;
 
 
     PyObject*       tuple;
 
 

-    bool doSave = wxPyRestoreThread();
+    wxPyTState* state = wxPyBeginBlockThreads();

     wxString className = event.GetClassInfo()->GetClassName();
 
     if (className == "wxPyEvent")
     wxString className = event.GetClassInfo()->GetClassName();
 
     if (className == "wxPyEvent")


@@ -355,33 +492,16 @@ void wxPyCallback::EventThunker(wxEvent& event) {
     Py_DECREF(tuple);
     if (result) {
         Py_DECREF(result);
     Py_DECREF(tuple);
     if (result) {
         Py_DECREF(result);

-        PyErr_Clear();
+        PyErr_Clear();       // Just in case...

     } else {
         PyErr_Print();
     }
     } else {
         PyErr_Print();
     }

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

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

-wxPyCallbackHelper::wxPyCallbackHelper() {
-    m_class = NULL;
-    m_self = NULL;
-    m_lastFound = NULL;
-    m_incRef = FALSE;
-}
-
-
-wxPyCallbackHelper::~wxPyCallbackHelper() {
-    bool doSave = wxPyRestoreThread();
-    if (m_incRef) {
-        Py_XDECREF(m_self);
-        Py_XDECREF(m_class);
-    }
-    wxPySaveThread(doSave);
-}
-

 wxPyCallbackHelper::wxPyCallbackHelper(const wxPyCallbackHelper& other) {
       m_lastFound = NULL;
       m_self = other.m_self;
 wxPyCallbackHelper::wxPyCallbackHelper(const wxPyCallbackHelper& other) {
       m_lastFound = NULL;
       m_self = other.m_self;


@@ -393,9 +513,9 @@ wxPyCallbackHelper::wxPyCallbackHelper(const wxPyCallbackHelper& other) {
 }
 
 
 }
 
 

-void wxPyCallbackHelper::setSelf(PyObject* self, PyObject* _class, int incref) {
+void wxPyCallbackHelper::setSelf(PyObject* self, PyObject* klass, int incref) {

     m_self = self;
     m_self = self;

-    m_class = _class;
+    m_class = klass;

     m_incRef = incref;
     if (incref) {
         Py_INCREF(m_self);
     m_incRef = incref;
     if (incref) {
         Py_INCREF(m_self);


@@ -404,22 +524,106 @@ void wxPyCallbackHelper::setSelf(PyObject* self, PyObject* _class, int incref) {
 }
 
 
 }
 
 

-// If the object (m_self) has an attibute of the given name, and if that
-// attribute is a method, and if that method's class is not from a base class,
-// then we'll save a pointer to the method so callCallback can call it.
-bool wxPyCallbackHelper::findCallback(const wxString& name) const {
+#if PYTHON_API_VERSION >= 1011
+
+// Prior to Python 2.2 PyMethod_GetClass returned the class object
+// in which the method was defined.  Starting with 2.2 it returns
+// "class that asked for the method" which seems totally bogus to me
+// but apprently if fixes some obscure problem waiting to happen in
+// Python.  Since the API was not documented Guido and the gang felt
+// safe in changing it.  Needless to say that totally screwed up the
+// logic below in wxPyCallbackHelper::findCallback, hence this icky
+// code to find the class where the method is actuallt defined...
+
+static
+PyObject* PyFindClassWithAttr(PyObject *klass, PyObject *name)
+{
+    int i, n;
+
+    if (PyType_Check(klass)) {      // new style classes
+        // This code is borrowed/adapted from _PyType_Lookup in typeobject.c
+        // (TODO: This part is not tested yet, so I'm not sure it is correct...)
+        PyTypeObject* type = (PyTypeObject*)klass;
+        PyObject *mro, *res, *base, *dict;
+        /* Look in tp_dict of types in MRO */
+        mro = type->tp_mro;
+        assert(PyTuple_Check(mro));
+        n = PyTuple_GET_SIZE(mro);
+        for (i = 0; i < n; i++) {
+            base = PyTuple_GET_ITEM(mro, i);
+            if (PyClass_Check(base))
+                dict = ((PyClassObject *)base)->cl_dict;
+            else {
+                assert(PyType_Check(base));
+                dict = ((PyTypeObject *)base)->tp_dict;
+            }
+            assert(dict && PyDict_Check(dict));
+            res = PyDict_GetItem(dict, name);
+            if (res != NULL)
+                return base;
+        }
+        return NULL;
+    }
+
+    else if (PyClass_Check(klass)) { // old style classes
+        // This code is borrowed/adapted from class_lookup in classobject.c
+        PyClassObject* cp = (PyClassObject*)klass;
+        PyObject *value = PyDict_GetItem(cp->cl_dict, name);
+        if (value != NULL) {
+            return (PyObject*)cp;
+        }
+        n = PyTuple_Size(cp->cl_bases);
+        for (i = 0; i < n; i++) {
+            PyObject* base = PyTuple_GetItem(cp->cl_bases, i);
+            PyObject *v = PyFindClassWithAttr(base, name);
+            if (v != NULL)
+                return v;
+        }
+        return NULL;
+    }
+}
+#endif
+
+
+static
+PyObject* PyMethod_GetDefiningClass(PyObject* method, const char* name)
+{
+    PyObject* mgc = PyMethod_GET_CLASS(method);
+
+#if PYTHON_API_VERSION <= 1010    // prior to Python 2.2, the easy way
+    return mgc;
+#else                             // 2.2 and after, the hard way...
+
+    PyObject* nameo = PyString_FromString(name);
+    PyObject* klass = PyFindClassWithAttr(mgc, nameo);
+    Py_DECREF(nameo);
+    return klass;
+#endif
+}
+
+
+
+bool wxPyCallbackHelper::findCallback(const char* name) const {

     wxPyCallbackHelper* self = (wxPyCallbackHelper*)this; // cast away const
     self->m_lastFound = NULL;
     wxPyCallbackHelper* self = (wxPyCallbackHelper*)this; // cast away const
     self->m_lastFound = NULL;

-    if (m_self && PyObject_HasAttrString(m_self, (char*)name.c_str())) {
-        PyObject* method;
-        method = PyObject_GetAttrString(m_self, (char*)name.c_str());

 
 

+    // If the object (m_self) has an attibute of the given name...
+    if (m_self && PyObject_HasAttrString(m_self, (char*)name)) {
+        PyObject *method, *klass;
+        method = PyObject_GetAttrString(m_self, (char*)name);
+
+        // ...and if that attribute is a method, and if that method's class is
+        // not from a base class...

         if (PyMethod_Check(method) &&
         if (PyMethod_Check(method) &&

-            ((PyMethod_GET_CLASS(method) == m_class) ||
-             PyClass_IsSubclass(PyMethod_GET_CLASS(method), m_class))) {
+            (klass = PyMethod_GetDefiningClass(method, (char*)name)) != NULL &&
+            ((klass == m_class) || PyClass_IsSubclass(klass, m_class))) {

 
 

+            // ...then we'll save a pointer to the method so callCallback can call it.

             self->m_lastFound = method;
         }
             self->m_lastFound = method;
         }

+        else {
+            Py_DECREF(method);
+        }

     }
     return m_lastFound != NULL;
 }
     }
     return m_lastFound != NULL;
 }


@@ -441,10 +645,16 @@ int wxPyCallbackHelper::callCallback(PyObject* argTuple) const {
 // Invoke the Python callable object, returning the raw PyObject return
 // value.  Caller should DECREF the return value and also call PyEval_SaveThread.
 PyObject* wxPyCallbackHelper::callCallbackObj(PyObject* argTuple) const {
 // Invoke the Python callable object, returning the raw PyObject return
 // value.  Caller should DECREF the return value and also call PyEval_SaveThread.
 PyObject* wxPyCallbackHelper::callCallbackObj(PyObject* argTuple) const {

-    PyObject*   result;
+    PyObject* result;
+
+    // Save a copy of the pointer in case the callback generates another
+    // callback.  In that case m_lastFound will have a different value when
+    // it gets back here...
+    PyObject* method = m_lastFound;

 
 

-    result = PyEval_CallObject(m_lastFound, argTuple);
+    result = PyEval_CallObject(method, argTuple);

     Py_DECREF(argTuple);
     Py_DECREF(argTuple);

+    Py_DECREF(method);

     if (!result) {
         PyErr_Print();
     }
     if (!result) {
         PyErr_Print();
     }


@@ -452,11 +662,36 @@ PyObject* wxPyCallbackHelper::callCallbackObj(PyObject* argTuple) const {
 }
 
 
 }
 
 

+void wxPyCBH_setCallbackInfo(wxPyCallbackHelper& cbh, PyObject* self, PyObject* klass, int incref) {
+    cbh.setSelf(self, klass, incref);
+}
+
+bool wxPyCBH_findCallback(const wxPyCallbackHelper& cbh, const char* name) {
+    return cbh.findCallback(name);
+}
+
+int  wxPyCBH_callCallback(const wxPyCallbackHelper& cbh, PyObject* argTuple) {
+    return cbh.callCallback(argTuple);
+}
+
+PyObject* wxPyCBH_callCallbackObj(const wxPyCallbackHelper& cbh, PyObject* argTuple) {
+    return cbh.callCallbackObj(argTuple);
+}
+
+
+void wxPyCBH_delete(wxPyCallbackHelper* cbh) {
+    if (cbh->m_incRef) {
+        wxPyTState* state = wxPyBeginBlockThreads();
+        Py_XDECREF(cbh->m_self);
+        Py_XDECREF(cbh->m_class);
+        wxPyEndBlockThreads(state);
+    }
+}

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

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

 // themselves and some special case handling in wxPyCallback::EventThunker.
 
 
 // themselves and some special case handling in wxPyCallback::EventThunker.
 
 


@@ -467,14 +702,14 @@ wxPyEvtSelfRef::wxPyEvtSelfRef() {
 }
 
 wxPyEvtSelfRef::~wxPyEvtSelfRef() {
 }
 
 wxPyEvtSelfRef::~wxPyEvtSelfRef() {

-    bool doSave = wxPyRestoreThread();
+    wxPyTState* state = wxPyBeginBlockThreads();

     if (m_cloned)
         Py_DECREF(m_self);
     if (m_cloned)
         Py_DECREF(m_self);

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

 }
 
 void wxPyEvtSelfRef::SetSelf(PyObject* self, bool clone) {
 }
 
 void wxPyEvtSelfRef::SetSelf(PyObject* self, bool clone) {

-    bool doSave = wxPyRestoreThread();
+    wxPyTState* state = wxPyBeginBlockThreads();

     if (m_cloned)
         Py_DECREF(m_self);
     m_self = self;
     if (m_cloned)
         Py_DECREF(m_self);
     m_self = self;


@@ -482,7 +717,7 @@ void wxPyEvtSelfRef::SetSelf(PyObject* self, bool clone) {
         Py_INCREF(m_self);
         m_cloned = TRUE;
     }
         Py_INCREF(m_self);
         m_cloned = TRUE;
     }

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

 }
 
 PyObject* wxPyEvtSelfRef::GetSelf() const {
 }
 
 PyObject* wxPyEvtSelfRef::GetSelf() const {


@@ -491,37 +726,41 @@ PyObject* wxPyEvtSelfRef::GetSelf() const {
 }
 
 
 }
 
 

+IMPLEMENT_ABSTRACT_CLASS(wxPyEvent, wxEvent);
+IMPLEMENT_ABSTRACT_CLASS(wxPyCommandEvent, wxCommandEvent);
+
+

 wxPyEvent::wxPyEvent(int id)
     : wxEvent(id) {
 }
 
 wxPyEvent::wxPyEvent(int id)
     : wxEvent(id) {
 }
 

-wxPyEvent::~wxPyEvent() {
-}

 
 

-// This one is so the event object can be Cloned...
-void wxPyEvent::CopyObject(wxObject& dest) const {
-    wxEvent::CopyObject(dest);
-    ((wxPyEvent*)&dest)->SetSelf(m_self, TRUE);
+wxPyEvent::wxPyEvent(const wxPyEvent& evt)
+    : wxEvent(evt)
+{
+    SetSelf(evt.m_self, TRUE);

 }
 
 
 }
 
 

-IMPLEMENT_DYNAMIC_CLASS(wxPyEvent, wxEvent);
+wxPyEvent::~wxPyEvent() {
+}

 
 
 wxPyCommandEvent::wxPyCommandEvent(wxEventType commandType, int id)
     : wxCommandEvent(commandType, id) {
 }
 
 
 
 wxPyCommandEvent::wxPyCommandEvent(wxEventType commandType, int id)
     : wxCommandEvent(commandType, id) {
 }
 

-wxPyCommandEvent::~wxPyCommandEvent() {
-}

 
 

-void wxPyCommandEvent::CopyObject(wxObject& dest) const {
-    wxCommandEvent::CopyObject(dest);
-    ((wxPyCommandEvent*)&dest)->SetSelf(m_self, TRUE);
+wxPyCommandEvent::wxPyCommandEvent(const wxPyCommandEvent& evt)
+    : wxCommandEvent(evt)
+{
+    SetSelf(evt.m_self, TRUE);

 }
 
 
 }
 
 

-IMPLEMENT_DYNAMIC_CLASS(wxPyCommandEvent, wxCommandEvent);
+wxPyCommandEvent::~wxPyCommandEvent() {
+}
+

 
 
 
 
 
 


@@ -535,26 +774,32 @@ wxPyTimer::wxPyTimer(PyObject* callback) {
 }
 
 wxPyTimer::~wxPyTimer() {
 }
 
 wxPyTimer::~wxPyTimer() {

-    bool doSave = wxPyRestoreThread();
+    wxPyTState* state = wxPyBeginBlockThreads();

     Py_DECREF(func);
     Py_DECREF(func);

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

 }
 
 void wxPyTimer::Notify() {
 }
 
 void wxPyTimer::Notify() {

-    bool doSave = wxPyRestoreThread();
-
-    PyObject*   result;
-    PyObject*   args = Py_BuildValue("()");
+    if (!func || func == Py_None) {
+        wxTimer::Notify();
+    }
+    else {
+        wxPyTState* state = wxPyBeginBlockThreads();
+
+        PyObject*   result;
+        PyObject*   args = Py_BuildValue("()");
+
+        result = PyEval_CallObject(func, args);
+        Py_DECREF(args);
+        if (result) {
+            Py_DECREF(result);
+            PyErr_Clear();
+        } else {
+            PyErr_Print();
+        }

 
 

-    result = PyEval_CallObject(func, args);
-    Py_DECREF(args);
-    if (result) {
-        Py_DECREF(result);
-        PyErr_Clear();
-    } else {
-        PyErr_Print();
+        wxPyEndBlockThreads(state);

     }
     }

-    wxPySaveThread(doSave);

 }
 
 
 }
 
 


@@ -569,15 +814,15 @@ PyObject* wxPy_ConvertList(wxListBase* list, const char* className) {
     wxObject*   wxObj;
     wxNode*     node = list->First();
 
     wxObject*   wxObj;
     wxNode*     node = list->First();
 

-    bool doSave = wxPyRestoreThread();
+    wxPyTState* state = wxPyBeginBlockThreads();

     pyList = PyList_New(0);
     while (node) {
         wxObj = node->Data();
     pyList = PyList_New(0);
     while (node) {
         wxObj = node->Data();

-        pyObj = wxPyConstructObject(wxObj, className);
+        pyObj = wxPyMake_wxObject(wxObj); //wxPyConstructObject(wxObj, className);

         PyList_Append(pyList, pyObj);
         node = node->Next();
     }
         PyList_Append(pyList, pyObj);
         node = node->Next();
     }

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

     return pyList;
 }
 
     return pyList;
 }
 


@@ -696,43 +941,116 @@ char** string_LIST_helper(PyObject* source) {
     return temp;
 }
 
     return temp;
 }
 

+//--------------------------------
+// Part of patch from Tim Hochberg
+static inline bool wxPointFromObjects(PyObject* o1, PyObject* o2, wxPoint* point) {
+    if (PyInt_Check(o1) && PyInt_Check(o2)) {
+        point->x = PyInt_AS_LONG(o1);
+        point->y = PyInt_AS_LONG(o2);
+        return true;
+    }
+    if (PyFloat_Check(o1) && PyFloat_Check(o2)) {
+        point->x = (int)PyFloat_AS_DOUBLE(o1);
+        point->y = (int)PyFloat_AS_DOUBLE(o2);
+        return true;
+    }
+    if (PyInstance_Check(o1) || PyInstance_Check(o2)) {
+        // Disallow instances because they can cause havok
+        return false;
+    }
+    if (PyNumber_Check(o1) && PyNumber_Check(o2)) {
+        // I believe this excludes instances, so this should be safe without INCREFFing o1 and o2
+        point->x = PyInt_AsLong(o1);
+        point->y = PyInt_AsLong(o2);
+        return true;
+    }
+    return false;
+}
+

 
 

+wxPoint* wxPoint_LIST_helper(PyObject* source, int *count) {
+    // Putting all of the declarations here allows
+    // us to put the error handling all in one place.
+    int x;
+    wxPoint* temp;
+    PyObject *o, *o1, *o2;
+    bool isFast = PyList_Check(source) || PyTuple_Check(source);

 
 

-wxPoint* wxPoint_LIST_helper(PyObject* source) {
-    if (!PyList_Check(source)) {
-        PyErr_SetString(PyExc_TypeError, "Expected a list object.");
-        return NULL;
+    if (!PySequence_Check(source)) {
+        goto error0;

     }
     }

-    int count = PyList_Size(source);
-    wxPoint* temp = new wxPoint[count];
-    if (! temp) {
+
+    // The length of the sequence is returned in count.
+    *count = PySequence_Length(source);
+    if (*count < 0) {
+        goto error0;
+    }
+
+    temp = new wxPoint[*count];
+    if (!temp) {

         PyErr_SetString(PyExc_MemoryError, "Unable to allocate temporary array");
         return NULL;
     }
         PyErr_SetString(PyExc_MemoryError, "Unable to allocate temporary array");
         return NULL;
     }

-    for (int x=0; x<count; x++) {
-        PyObject* o = PyList_GetItem(source, x);
-        if (PyTuple_Check(o)) {
-            PyObject* o1 = PyTuple_GetItem(o, 0);
-            PyObject* o2 = PyTuple_GetItem(o, 1);
+    for (x=0; x<*count; x++) {
+        // Get an item: try fast way first.
+        if (isFast) {
+            o = PySequence_Fast_GET_ITEM(source, x);
+        }
+        else {
+            o = PySequence_GetItem(source, x);
+            if (o == NULL) {
+                goto error1;
+            }
+        }

 
 

-            temp[x].x = PyInt_AsLong(o1);
-            temp[x].y = PyInt_AsLong(o2);
+        // Convert o to wxPoint.
+        if ((PyTuple_Check(o) && PyTuple_GET_SIZE(o) == 2) ||
+            (PyList_Check(o) && PyList_GET_SIZE(o) == 2)) {
+            o1 = PySequence_Fast_GET_ITEM(o, 0);
+            o2 = PySequence_Fast_GET_ITEM(o, 1);
+            if (!wxPointFromObjects(o1, o2, &temp[x])) {
+                goto error2;
+            }

         }
         else if (PyInstance_Check(o)) {
             wxPoint* pt;
         }
         else if (PyInstance_Check(o)) {
             wxPoint* pt;

-            if (SWIG_GetPtrObj(o,(void **) &pt,"_wxPoint_p")) {
-                PyErr_SetString(PyExc_TypeError,"Expected _wxPoint_p.");
-                return NULL;
+            if (SWIG_GetPtrObj(o, (void **)&pt, "_wxPoint_p")) {
+                goto error2;

             }
             temp[x] = *pt;
         }
             }
             temp[x] = *pt;
         }

+        else if (PySequence_Check(o) && PySequence_Length(o) == 2) {
+            o1 = PySequence_GetItem(o, 0);
+            o2 = PySequence_GetItem(o, 1);
+            if (!wxPointFromObjects(o1, o2, &temp[x])) {
+                goto error3;
+            }
+            Py_DECREF(o1);
+            Py_DECREF(o2);
+        }

         else {
         else {

-            PyErr_SetString(PyExc_TypeError, "Expected a list of 2-tuples or wxPoints.");
-            return NULL;
+            goto error2;

         }
         }

+        // Clean up.
+        if (!isFast)
+            Py_DECREF(o);

     }
     return temp;
     }
     return temp;

+
+error3:
+    Py_DECREF(o1);
+    Py_DECREF(o2);
+error2:
+    if (!isFast)
+        Py_DECREF(o);
+error1:
+    delete temp;
+error0:
+    PyErr_SetString(PyExc_TypeError, "Expected a sequence of length-2 sequences or wxPoints.");
+    return NULL;

 }
 }

+// end of patch
+//------------------------------

 
 
 wxBitmap** wxBitmap_LIST_helper(PyObject* source) {
 
 
 wxBitmap** wxBitmap_LIST_helper(PyObject* source) {


@@ -779,11 +1097,24 @@ wxString* wxString_LIST_helper(PyObject* source) {
     }
     for (int x=0; x<count; x++) {
         PyObject* o = PyList_GetItem(source, x);
     }
     for (int x=0; x<count; x++) {
         PyObject* o = PyList_GetItem(source, x);

+#if PYTHON_API_VERSION >= 1009
+        if (! PyString_Check(o) && ! PyUnicode_Check(o)) {
+            PyErr_SetString(PyExc_TypeError, "Expected a list of string or unicode objects.");
+            return NULL;
+        }
+
+        char* buff;
+        int   length;
+        if (PyString_AsStringAndSize(o, &buff, &length) == -1)
+            return NULL;
+        temp[x] = wxString(buff, length);
+#else

         if (! PyString_Check(o)) {
             PyErr_SetString(PyExc_TypeError, "Expected a list of strings.");
             return NULL;
         }
         temp[x] = PyString_AsString(o);
         if (! PyString_Check(o)) {
             PyErr_SetString(PyExc_TypeError, "Expected a list of strings.");
             return NULL;
         }
         temp[x] = PyString_AsString(o);

+#endif

     }
     return temp;
 }
     }
     return temp;
 }


@@ -814,10 +1145,7 @@ wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source) {
             PyObject* o1 = PyTuple_GetItem(o, 0);
             PyObject* o2 = PyTuple_GetItem(o, 1);
             PyObject* o3 = PyTuple_GetItem(o, 2);
             PyObject* o1 = PyTuple_GetItem(o, 0);
             PyObject* o2 = PyTuple_GetItem(o, 1);
             PyObject* o3 = PyTuple_GetItem(o, 2);

-
-            temp[x].m_flags   = PyInt_AsLong(o1);
-            temp[x].m_keyCode = PyInt_AsLong(o2);
-            temp[x].m_command = PyInt_AsLong(o3);
+            temp[x].Set(PyInt_AsLong(o1), PyInt_AsLong(o2), PyInt_AsLong(o3));

         }
         else {
             PyErr_SetString(PyExc_TypeError, "Expected a list of 3-tuples or wxAcceleratorEntry objects.");
         }
         else {
             PyErr_SetString(PyExc_TypeError, "Expected a list of 3-tuples or wxAcceleratorEntry objects.");


@@ -828,6 +1156,99 @@ wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source) {
 }
 
 
 }
 
 

+wxPen** wxPen_LIST_helper(PyObject* source) {
+    if (!PyList_Check(source)) {
+        PyErr_SetString(PyExc_TypeError, "Expected a list object.");
+        return NULL;
+    }
+    int count = PyList_Size(source);
+    wxPen** temp = new wxPen*[count];
+    if (!temp) {
+        PyErr_SetString(PyExc_MemoryError, "Unable to allocate temporary array");
+        return NULL;
+    }
+    for (int x=0; x<count; x++) {
+        PyObject* o = PyList_GetItem(source, x);
+        if (PyInstance_Check(o)) {
+            wxPen*  pt;
+            if (SWIG_GetPtrObj(o, (void **) &pt,"_wxPen_p")) {
+                delete temp;
+                PyErr_SetString(PyExc_TypeError,"Expected _wxPen_p.");
+                return NULL;
+            }
+            temp[x] = pt;
+        }
+        else {
+            delete temp;
+            PyErr_SetString(PyExc_TypeError, "Expected a list of wxPens.");
+            return NULL;
+        }
+    }
+    return temp;
+}
+
+
+bool _2int_seq_helper(PyObject* source, int* i1, int* i2) {
+    bool isFast = PyList_Check(source) || PyTuple_Check(source);
+    PyObject *o1, *o2;
+
+    if (!PySequence_Check(source) || PySequence_Length(source) != 2)
+        return FALSE;
+
+    if (isFast) {
+        o1 = PySequence_Fast_GET_ITEM(source, 0);
+        o2 = PySequence_Fast_GET_ITEM(source, 1);
+    }
+    else {
+        o1 = PySequence_GetItem(source, 0);
+        o2 = PySequence_GetItem(source, 1);
+    }
+
+    *i1 = PyInt_AsLong(o1);
+    *i2 = PyInt_AsLong(o2);
+
+    if (! isFast) {
+        Py_DECREF(o1);
+        Py_DECREF(o2);
+    }
+    return TRUE;
+}
+
+
+bool _4int_seq_helper(PyObject* source, int* i1, int* i2, int* i3, int* i4) {
+    bool isFast = PyList_Check(source) || PyTuple_Check(source);
+    PyObject *o1, *o2, *o3, *o4;
+
+    if (!PySequence_Check(source) || PySequence_Length(source) != 4)
+        return FALSE;
+
+    if (isFast) {
+        o1 = PySequence_Fast_GET_ITEM(source, 0);
+        o2 = PySequence_Fast_GET_ITEM(source, 1);
+        o3 = PySequence_Fast_GET_ITEM(source, 2);
+        o4 = PySequence_Fast_GET_ITEM(source, 3);
+    }
+    else {
+        o1 = PySequence_GetItem(source, 0);
+        o2 = PySequence_GetItem(source, 1);
+        o3 = PySequence_GetItem(source, 2);
+        o4 = PySequence_GetItem(source, 3);
+    }
+
+    *i1 = PyInt_AsLong(o1);
+    *i2 = PyInt_AsLong(o2);
+    *i3 = PyInt_AsLong(o3);
+    *i4 = PyInt_AsLong(o4);
+
+    if (! isFast) {
+        Py_DECREF(o1);
+        Py_DECREF(o2);
+        Py_DECREF(o3);
+        Py_DECREF(o4);
+    }
+    return TRUE;
+}
+

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


@@ -864,14 +1285,21 @@ bool wxPoint_helper(PyObject* source, wxPoint** obj) {
         *obj = ptr;
         return TRUE;
     }
         *obj = ptr;
         return TRUE;
     }

-    // otherwise a 2-tuple of integers is expected
-    else if (PySequence_Check(source) && PyObject_Length(source) == 2) {
+    // otherwise a length-2 sequence of integers is expected
+    if (PySequence_Check(source) && PySequence_Length(source) == 2) {

         PyObject* o1 = PySequence_GetItem(source, 0);
         PyObject* o2 = PySequence_GetItem(source, 1);
         PyObject* o1 = PySequence_GetItem(source, 0);
         PyObject* o2 = PySequence_GetItem(source, 1);

-        **obj = wxPoint(PyInt_AsLong(o1), PyInt_AsLong(o2));
+                // This should really check for integers, not numbers -- but that would break code.
+                if (!PyNumber_Check(o1) || !PyNumber_Check(o2)) {
+                        Py_DECREF(o1);
+                    Py_DECREF(o2);
+                        goto error;
+                }
+                **obj = wxPoint(PyInt_AsLong(o1), PyInt_AsLong(o2));
+                Py_DECREF(o1);
+                Py_DECREF(o2);

         return TRUE;
     }
         return TRUE;
     }

-

  error:
     PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of integers or a wxPoint object.");
     return FALSE;
  error:
     PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of integers or a wxPoint object.");
     return FALSE;


@@ -946,7 +1374,7 @@ bool wxColour_helper(PyObject* source, wxColour** obj) {
     // otherwise a string is expected
     else if (PyString_Check(source)) {
         wxString spec = PyString_AS_STRING(source);
     // otherwise a string is expected
     else if (PyString_Check(source)) {
         wxString spec = PyString_AS_STRING(source);

-        if (spec[0] == '#' && spec.Length() == 7) {  // It's  #RRGGBB
+        if (spec[0U] == '#' && spec.Length() == 7) {  // It's  #RRGGBB

             char* junk;
             int red   = strtol(spec.Mid(1,2), &junk, 16);
             int green = strtol(spec.Mid(3,2), &junk, 16);
             char* junk;
             int red   = strtol(spec.Mid(1,2), &junk, 16);
             int green = strtol(spec.Mid(3,2), &junk, 16);


@@ -961,14 +1389,28 @@ bool wxColour_helper(PyObject* source, wxColour** obj) {
     }
 
  error:
     }
 
  error:

-    PyErr_SetString(PyExc_TypeError, "Expected a wxColour object or a string containing a colour name or #RRGGBB.");
+    PyErr_SetString(PyExc_TypeError, "Expected a wxColour object or a string containing a colour name or '#RRGGBB'.");

     return FALSE;
 }
 
 
 //----------------------------------------------------------------------
     return FALSE;
 }
 
 
 //----------------------------------------------------------------------

+
+PyObject* wxArrayString2PyList_helper(const wxArrayString& arr) {
+
+    PyObject* list = PyList_New(0);
+    for (size_t i=0; i < arr.GetCount(); i++) {
+        PyObject* str = PyString_FromString(arr[i].c_str());
+        PyList_Append(list, str);
+        Py_DECREF(str);
+    }
+    return list;
+}
+
+

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

+