added SetStatusText method (avoiding dc.Clear)

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

diff --git a/wxPython/src/helpers.cpp b/wxPython/src/helpers.cpp
index d6492ce70ed6b6c522e5c2fb07e8c3aa55acb336..b7c8510f85eac14c30fb7563ad600bae5daca792 100644 (file)
--- a/wxPython/src/helpers.cpp
+++ b/wxPython/src/helpers.cpp
@@ -18,11 +18,8 @@
 
 #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>
+#include <wx/msw/msvcrt.h>

 #endif
 
 #ifdef __WXGTK__
 #endif
 
 #ifdef __WXGTK__


@@ -32,6 +29,33 @@
 #endif
 
 
 #endif
 
 

+//----------------------------------------------------------------------
+
+
+int  WXDLLEXPORT wxEntryStart( int argc, char** argv );
+int  WXDLLEXPORT wxEntryInitGui();
+void WXDLLEXPORT wxEntryCleanup();
+
+wxPyApp* wxPythonApp = NULL;  // Global instance of application object
+
+
+#ifdef WXP_WITH_THREAD
+struct wxPyThreadState {
+    unsigned long  tid;
+    PyThreadState* tstate;
+
+    wxPyThreadState(unsigned long _tid=0, PyThreadState* _tstate=NULL)
+        : tid(_tid), tstate(_tstate) {}
+};
+
+#include <wx/dynarray.h>
+WX_DECLARE_OBJARRAY(wxPyThreadState, wxPyThreadStateArray);
+#include <wx/arrimpl.cpp>
+WX_DEFINE_OBJARRAY(wxPyThreadStateArray);
+
+wxPyThreadStateArray* wxPyTStates = NULL;
+wxMutex*              wxPyTMutex = NULL;
+#endif

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


@@ -51,11 +75,9 @@ BOOL WINAPI DllMain(
 #endif
 
 //----------------------------------------------------------------------
 #endif
 
 //----------------------------------------------------------------------

-// Class for implementing the wxp main application shell.
+// Classes for implementing the wxp main application shell.

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

-wxPyApp *wxPythonApp = NULL;            // Global instance of application object
-

 
 wxPyApp::wxPyApp() {
 //    printf("**** ctor\n");
 
 wxPyApp::wxPyApp() {
 //    printf("**** ctor\n");


@@ -67,43 +89,32 @@ wxPyApp::~wxPyApp() {
 
 
 // This one isn't acutally called...  See __wxStart()
 
 
 // This one isn't acutally called...  See __wxStart()

-bool wxPyApp::OnInit(void) {
+bool wxPyApp::OnInit() {

     return FALSE;
 }
 
     return FALSE;
 }
 

-int  wxPyApp::MainLoop(void) {
+
+int  wxPyApp::MainLoop() {

     int retval = 0;
 
     DeletePendingObjects();
     int retval = 0;
 
     DeletePendingObjects();

+    bool initialized = wxTopLevelWindows.GetCount() != 0;

 #ifdef __WXGTK__
 #ifdef __WXGTK__

-    m_initialized = wxTopLevelWindows.GetCount() != 0;
+    m_initialized = initialized;

 #endif
 
 #endif
 

-    if (Initialized()) {
+    if (initialized) {

         retval = wxApp::MainLoop();
         retval = wxApp::MainLoop();

-        wxPythonApp->OnExit();
+        OnExit();

     }
     return retval;
 }
 
 
     }
     return retval;
 }
 
 

+

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

-#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
-PyThreadState*  wxPyEventThreadState = NULL;
-#endif
-

 
 // This is where we pick up the first part of the wxEntry functionality...
 // The rest is in __wxStart and  __wxCleanup.  This function is called when
 
 // This is where we pick up the first part of the wxEntry functionality...
 // The rest is in __wxStart and  __wxCleanup.  This function is called when


@@ -112,12 +123,13 @@ void __wxPreStart()
 {
 
 #ifdef __WXMSW__
 {
 
 #ifdef __WXMSW__

-//    wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF);
+    wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF);

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

-    wxPyEventThreadState = PyThreadState_Get(); // PyThreadState_New(PyThreadState_Get()->interp);
+    wxPyTStates = new wxPyThreadStateArray;
+    wxPyTMutex = new wxMutex;

 #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


@@ -205,8 +217,14 @@ PyObject* __wxStart(PyObject* /* self */, PyObject* args)
     return Py_None;
 }
 
     return Py_None;
 }
 

+

 void __wxCleanup() {
     wxEntryCleanup();
 void __wxCleanup() {
     wxEntryCleanup();

+    delete wxPyTMutex;
+    wxPyTMutex = NULL;
+    wxPyTStates->Empty();
+    delete wxPyTStates;
+    wxPyTStates = NULL;

 }
 
 
 }
 
 


@@ -265,7 +283,6 @@ PyObject* __wxSetDictionary(PyObject* /* self */, PyObject* args)
 void wxPyPtrTypeMap_Add(const char* commonName, const char* ptrName) {
     if (! wxPyPtrTypeMap)
         wxPyPtrTypeMap = PyDict_New();
 void wxPyPtrTypeMap_Add(const char* commonName, const char* ptrName) {
     if (! wxPyPtrTypeMap)
         wxPyPtrTypeMap = PyDict_New();

-

     PyDict_SetItemString(wxPyPtrTypeMap,
                          (char*)commonName,
                          PyString_FromString((char*)ptrName));
     PyDict_SetItemString(wxPyPtrTypeMap,
                          (char*)commonName,
                          PyString_FromString((char*)ptrName));


@@ -287,25 +304,45 @@ PyObject* wxPyClassExists(const char* className) {
 }
 
 
 }
 
 

-PyObject*  wxPyMake_wxObject(wxObject* source) {
-    PyObject* target;
+PyObject*  wxPyMake_wxObject(wxObject* source, bool checkEvtHandler) {
+    PyObject* target = NULL;
+    bool      isEvtHandler = FALSE;

 
     if (source) {
 
     if (source) {

-        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 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 (info) {
-            target = wxPyConstructObject(source, name, klass, FALSE);
-        } else {
-            wxString msg("wxPython class not found for ");
-            msg += source->GetClassInfo()->GetClassName();
-            PyErr_SetString(PyExc_NameError, msg.c_str());
-            target = NULL;
+
+        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;
         }
     } else {  // source was NULL so return None.
         Py_INCREF(Py_None); target = Py_None;


@@ -313,6 +350,31 @@ PyObject*  wxPyMake_wxObject(wxObject* source) {
     return target;
 }
 
     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,
 //---------------------------------------------------------------------------
 
 PyObject* wxPyConstructObject(void* ptr,


@@ -357,8 +419,10 @@ PyObject* wxPyConstructObject(void* ptr,
     }
 
     char    buff[64];               // should always be big enough...
     }
 
     char    buff[64];               // should always be big enough...

-

     sprintf(buff, "%sPtr", className);
     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];
     PyObject* classobj = PyDict_GetItemString(wxPython_dict, buff);
     if (! classobj) {
         char temp[128];


@@ -374,44 +438,108 @@ PyObject* wxPyConstructObject(void* ptr,
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-static PyThreadState* myPyThreadState_Get() {
-    PyThreadState* current;
-    current = PyThreadState_Swap(NULL);
-    PyThreadState_Swap(current);
-    return current;
+// TODO:  This should really be wxThread::GetCurrentId(), and I will do so
+//        after I make a quick 2.3.2.1 release.
+#ifdef WXP_WITH_THREAD
+#ifdef __WXGTK__  // does wxGTK always use pthreads?
+#include <unistd.h>
+#include <pthread.h>
+#endif
+inline
+unsigned long wxPyGetCurrentThreadId() {
+#ifdef __WXMSW__
+    return (unsigned long)::GetCurrentThreadId();
+#endif
+#ifdef __WXGTK__  // does wxGTK always use pthreads?
+    return (unsigned long)pthread_self();
+#endif
+#ifdef __WXMAC__
+#error Fix this!
+#endif

 }
 
 
 }
 
 

-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!)
-    //
-#ifdef WXP_WITH_THREAD
-    if (wxPyEventThreadState != myPyThreadState_Get()) {
-        PyEval_AcquireThread(wxPyEventThreadState);
-        return TRUE;
+
+static
+PyThreadState* wxPyGetThreadState() {
+    unsigned long ctid = wxPyGetCurrentThreadId();
+    PyThreadState* tstate = NULL;
+
+    wxPyTMutex->Lock();
+    for(size_t i=0; i < wxPyTStates->GetCount(); i++) {
+        wxPyThreadState& info = wxPyTStates->Item(i);
+        if (info.tid == ctid) {
+            tstate = info.tstate;
+            break;
+        }

     }
     }

-    else
+    wxPyTMutex->Unlock();
+    wxASSERT_MSG(tstate, "PyThreadState should not be NULL!");
+    return tstate;
+}
+
+static
+void wxPySaveThreadState(PyThreadState* tstate) {
+    unsigned long ctid = wxPyGetCurrentThreadId();
+    wxPyTMutex->Lock();
+    for(size_t i=0; i < wxPyTStates->GetCount(); i++) {
+        wxPyThreadState& info = wxPyTStates->Item(i);
+        if (info.tid == ctid) {
+            info.tstate = tstate;
+            wxPyTMutex->Unlock();
+            return;
+        }
+    }
+    // not found, so add it...
+    wxPyTStates->Add(new wxPyThreadState(ctid, tstate));
+    wxPyTMutex->Unlock();
+}
+
+#endif
+
+
+// Calls from Python to wxWindows code are wrapped in calls to these
+// functions:
+
+PyThreadState* wxPyBeginAllowThreads() {
+#ifdef WXP_WITH_THREAD
+    PyThreadState* saved = PyEval_SaveThread();  // Py_BEGIN_ALLOW_THREADS;
+    wxPySaveThreadState(saved);
+    return saved;
+#else
+    return NULL;
+#endif
+}
+
+void wxPyEndAllowThreads(PyThreadState* saved) {
+#ifdef WXP_WITH_THREAD
+    PyEval_RestoreThread(saved);   // Py_END_ALLOW_THREADS;

 #endif
 #endif

-        return FALSE;

 }
 
 
 }
 
 

-void wxPySaveThread(bool doSave) {
+
+// Calls from wxWindows back to Python code, or even any PyObject
+// manipulations, PyDECREF's and etc. are wrapped in calls to these functions:
+
+void wxPyBeginBlockThreads() {

 #ifdef WXP_WITH_THREAD
 #ifdef WXP_WITH_THREAD

-    if (doSave) {
-        PyEval_ReleaseThread(wxPyEventThreadState);
-    }
+    PyThreadState* tstate = wxPyGetThreadState();
+    PyEval_RestoreThread(tstate);

 #endif
 }
 
 #endif
 }
 

-//---------------------------------------------------------------------------
+
+void wxPyEndBlockThreads() {
+#ifdef WXP_WITH_THREAD
+    PyThreadState* tstate = PyEval_SaveThread();
+    // Is there any need to save it again?
+#endif
+}

 
 
 
 

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

 IMPLEMENT_ABSTRACT_CLASS(wxPyCallback, wxObject);
 
 wxPyCallback::wxPyCallback(PyObject* func) {
 IMPLEMENT_ABSTRACT_CLASS(wxPyCallback, wxObject);
 
 wxPyCallback::wxPyCallback(PyObject* func) {


@@ -425,9 +553,9 @@ wxPyCallback::wxPyCallback(const wxPyCallback& other) {
 }
 
 wxPyCallback::~wxPyCallback() {
 }
 
 wxPyCallback::~wxPyCallback() {

-    bool doSave = wxPyRestoreThread();
+    wxPyBeginBlockThreads();

     Py_DECREF(m_func);
     Py_DECREF(m_func);

-    wxPySaveThread(doSave);
+    wxPyEndBlockThreads();

 }
 
 
 }
 
 


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

-    bool doSave = wxPyRestoreThread();
+    wxPyBeginBlockThreads();

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


@@ -457,11 +585,11 @@ 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();

 }
 
 
 }
 
 


@@ -489,20 +617,101 @@ void wxPyCallbackHelper::setSelf(PyObject* self, PyObject* klass, 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.
+#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;
 bool wxPyCallbackHelper::findCallback(const char* name) const {
     wxPyCallbackHelper* self = (wxPyCallbackHelper*)this; // cast away const
     self->m_lastFound = NULL;

+
+    // If the object (m_self) has an attibute of the given name...

     if (m_self && PyObject_HasAttrString(m_self, (char*)name)) {
     if (m_self && PyObject_HasAttrString(m_self, (char*)name)) {

-        PyObject* method;
+        PyObject *method, *klass;

         method = PyObject_GetAttrString(m_self, (char*)name);
 
         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;
         }
         else {
             self->m_lastFound = method;
         }
         else {


@@ -546,7 +755,7 @@ PyObject* wxPyCallbackHelper::callCallbackObj(PyObject* argTuple) const {
 }
 
 
 }
 
 

-void wxPyCBH_setSelf(wxPyCallbackHelper& cbh, PyObject* self, PyObject* klass, int incref) {
+void wxPyCBH_setCallbackInfo(wxPyCallbackHelper& cbh, PyObject* self, PyObject* klass, int incref) {

     cbh.setSelf(self, klass, incref);
 }
 
     cbh.setSelf(self, klass, incref);
 }
 


@@ -564,17 +773,17 @@ PyObject* wxPyCBH_callCallbackObj(const wxPyCallbackHelper& cbh, PyObject* argTu
 
 
 void wxPyCBH_delete(wxPyCallbackHelper* cbh) {
 
 
 void wxPyCBH_delete(wxPyCallbackHelper* cbh) {

-    bool doSave = wxPyRestoreThread();

     if (cbh->m_incRef) {
     if (cbh->m_incRef) {

+        wxPyBeginBlockThreads();

         Py_XDECREF(cbh->m_self);
         Py_XDECREF(cbh->m_class);
         Py_XDECREF(cbh->m_self);
         Py_XDECREF(cbh->m_class);

+        wxPyEndBlockThreads();

     }
     }

-    wxPySaveThread(doSave);

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

-// These classes can be derived from in Python and passed through the event
+// 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.
 
 // system without losing anything.  They do this by keeping a reference to
 // themselves and some special case handling in wxPyCallback::EventThunker.
 


@@ -586,14 +795,14 @@ wxPyEvtSelfRef::wxPyEvtSelfRef() {
 }
 
 wxPyEvtSelfRef::~wxPyEvtSelfRef() {
 }
 
 wxPyEvtSelfRef::~wxPyEvtSelfRef() {

-    bool doSave = wxPyRestoreThread();
+    wxPyBeginBlockThreads();

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

-    wxPySaveThread(doSave);
+    wxPyEndBlockThreads();

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

-    bool doSave = wxPyRestoreThread();
+    wxPyBeginBlockThreads();

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


@@ -601,7 +810,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();

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


@@ -610,37 +819,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() {
+}
+

 
 
 
 
 
 


@@ -654,9 +867,9 @@ wxPyTimer::wxPyTimer(PyObject* callback) {
 }
 
 wxPyTimer::~wxPyTimer() {
 }
 
 wxPyTimer::~wxPyTimer() {

-    bool doSave = wxPyRestoreThread();
+    wxPyBeginBlockThreads();

     Py_DECREF(func);
     Py_DECREF(func);

-    wxPySaveThread(doSave);
+    wxPyEndBlockThreads();

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


@@ -664,7 +877,7 @@ void wxPyTimer::Notify() {
         wxTimer::Notify();
     }
     else {
         wxTimer::Notify();
     }
     else {

-        bool doSave = wxPyRestoreThread();
+        wxPyBeginBlockThreads();

 
         PyObject*   result;
         PyObject*   args = Py_BuildValue("()");
 
         PyObject*   result;
         PyObject*   args = Py_BuildValue("()");


@@ -678,7 +891,7 @@ void wxPyTimer::Notify() {
             PyErr_Print();
         }
 
             PyErr_Print();
         }
 

-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads();

     }
 }
 
     }
 }
 


@@ -694,7 +907,7 @@ PyObject* wxPy_ConvertList(wxListBase* list, const char* className) {
     wxObject*   wxObj;
     wxNode*     node = list->First();
 
     wxObject*   wxObj;
     wxNode*     node = list->First();
 

-    bool doSave = wxPyRestoreThread();
+    wxPyBeginBlockThreads();

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


@@ -702,7 +915,7 @@ PyObject* wxPy_ConvertList(wxListBase* list, const char* className) {
         PyList_Append(pyList, pyObj);
         node = node->Next();
     }
         PyList_Append(pyList, pyObj);
         node = node->Next();
     }

-    wxPySaveThread(doSave);
+    wxPyEndBlockThreads();

     return pyList;
 }
 
     return pyList;
 }
 


@@ -848,23 +1061,19 @@ static inline bool wxPointFromObjects(PyObject* o1, PyObject* o2, wxPoint* point
 }
 
 
 }
 
 

-#if PYTHON_API_VERSION < 1009
-#define PySequence_Fast_GET_ITEM(o, i)\
-     (PyList_Check(o) ? PyList_GET_ITEM(o, i) : PyTuple_GET_ITEM(o, i))
-#endif
-

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

-    int isFast = PyList_Check(source) || PyTuple_Check(source);
+    bool isFast = PyList_Check(source) || PyTuple_Check(source);

 
 

-    // The length of the sequence is returned in count.

     if (!PySequence_Check(source)) {
         goto error0;
     }
     if (!PySequence_Check(source)) {
         goto error0;
     }

+
+    // The length of the sequence is returned in count.

     *count = PySequence_Length(source);
     if (*count < 0) {
         goto error0;
     *count = PySequence_Length(source);
     if (*count < 0) {
         goto error0;


@@ -981,11 +1190,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;
 }


@@ -1016,10 +1238,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.");


@@ -1030,6 +1249,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;
+}
+

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


@@ -1070,15 +1382,15 @@ bool wxPoint_helper(PyObject* source, wxPoint** obj) {
     if (PySequence_Check(source) && PySequence_Length(source) == 2) {
         PyObject* o1 = PySequence_GetItem(source, 0);
         PyObject* o2 = PySequence_GetItem(source, 1);
     if (PySequence_Check(source) && PySequence_Length(source) == 2) {
         PyObject* o1 = PySequence_GetItem(source, 0);
         PyObject* o2 = PySequence_GetItem(source, 1);

-               // 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);
+                // 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;
     }
  error:
         return TRUE;
     }
  error:


@@ -1176,6 +1488,19 @@ bool wxColour_helper(PyObject* source, wxColour** obj) {
 
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------

+
+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;
+}
+
+

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