X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7ea515abfb0211078d9ffcd4420ef0b53f3fcabe..b2033f1f37482ce37e5e471900874bcea1c89391:/wxPython/src/helpers.cpp diff --git a/wxPython/src/helpers.cpp b/wxPython/src/helpers.cpp index e71d858d5b..aa4ebd2986 100644 --- a/wxPython/src/helpers.cpp +++ b/wxPython/src/helpers.cpp @@ -4,7 +4,7 @@ // // Author: Robin Dunn // -// Created: 7/1/97 +// Created: 1-July-1997 // RCS-ID: $Id$ // Copyright: (c) 1998 by Total Control Software // Licence: wxWindows license @@ -13,8 +13,8 @@ #undef DEBUG #include -#include "helpers.h" -#include "pyistream.h" +#include "wx/wxPython/wxPython_int.h" +#include "wx/wxPython/pyistream.h" #ifdef __WXMSW__ #include @@ -23,9 +23,24 @@ #endif #ifdef __WXGTK__ +#include +#include #include #include #include +#define GetXWindow(wxwin) (wxwin)->m_wxwindow ? \ + GDK_WINDOW_XWINDOW(GTK_PIZZA((wxwin)->m_wxwindow)->bin_window) : \ + GDK_WINDOW_XWINDOW((wxwin)->m_widget->window) +#include +#endif + +#ifdef __WXX11__ +#include "wx/x11/privx.h" +#define GetXWindow(wxwin) ((Window)(wxwin)->GetHandle()) +#endif + +#ifdef __WXMAC__ +#include #endif #include @@ -41,8 +56,8 @@ //---------------------------------------------------------------------- wxPyApp* wxPythonApp = NULL; // Global instance of application object -bool wxPyDoCleanup = FALSE; -bool wxPyDoingCleanup = FALSE; +bool wxPyDoCleanup = false; +bool wxPyDoingCleanup = false; #ifdef WXP_WITH_THREAD @@ -65,8 +80,10 @@ wxMutex* wxPyTMutex = NULL; static PyObject* wxPython_dict = NULL; -static PyObject* wxPyPtrTypeMap = NULL; static PyObject* wxPyAssertionError = NULL; +static PyObject* wxPyNoAppError = NULL; + +PyObject* wxPyPtrTypeMap = NULL; #ifdef __WXMSW__ // If building for win32... @@ -84,7 +101,7 @@ BOOL WINAPI DllMain( // the inatance has already been set. if (! wxGetInstance()) wxSetInstance(hinstDLL); - return TRUE; + return true; } #endif @@ -97,6 +114,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxPyApp, wxApp); wxPyApp::wxPyApp() { m_assertMode = wxPYAPP_ASSERT_EXCEPTION; + m_startupComplete = false; } @@ -104,9 +122,9 @@ wxPyApp::~wxPyApp() { } -// This one isn't acutally called... We fake it with __wxStart() +// This one isn't acutally called... We fake it with _BootstrapApp bool wxPyApp::OnInit() { - return FALSE; + return false; } @@ -115,7 +133,6 @@ int wxPyApp::MainLoop() { DeletePendingObjects(); bool initialized = wxTopLevelWindows.GetCount() != 0; - if (initialized) { if ( m_exitOnFrameDelete == Later ) { m_exitOnFrameDelete = Yes; @@ -129,22 +146,22 @@ int wxPyApp::MainLoop() { bool wxPyApp::OnInitGui() { - bool rval=TRUE; + bool rval=true; wxApp::OnInitGui(); // in this case always call the base class version - // wxPyBeginBlockThreads(); *** only called from within __wxStart so we already have the GIL + bool blocked = wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "OnInitGui")) rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); - // wxPyEndBlockThreads(); *** + wxPyEndBlockThreads(blocked); return rval; } int wxPyApp::OnExit() { int rval=0; - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "OnExit")) rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); wxApp::OnExit(); // in this case always call the base class version return rval; } @@ -156,9 +173,23 @@ void wxPyApp::OnAssert(const wxChar *file, const wxChar *cond, const wxChar *msg) { + // if we're not fully initialized then just log the error + if (! m_startupComplete) { + wxString buf; + buf.Alloc(4096); + buf.Printf(wxT("%s(%d): assert \"%s\" failed"), + file, line, cond); + if (msg != NULL) { + buf += wxT(": "); + buf += msg; + } + wxLogDebug(buf); + return; + } + // If the OnAssert is overloaded in the Python class then call it... bool found; - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "OnAssert"))) { PyObject* fso = wx2PyString(file); PyObject* cso = wx2PyString(file); @@ -173,7 +204,7 @@ void wxPyApp::OnAssert(const wxChar *file, Py_DECREF(cso); Py_DECREF(mso); } - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); // ...otherwise do our own thing with it if (! found) { @@ -192,11 +223,11 @@ void wxPyApp::OnAssert(const wxChar *file, } // set the exception - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); PyObject* s = wx2PyString(buf); PyErr_SetObject(wxPyAssertionError, s); Py_DECREF(s); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); // Now when control returns to whatever API wrapper was called from // Python it should detect that an exception is set and will return @@ -224,6 +255,45 @@ void wxPyApp::OnAssert(const wxChar *file, } #endif + // For catching Apple Events +void wxPyApp::MacOpenFile(const wxString &fileName) +{ + bool blocked = wxPyBeginBlockThreads(); + if (wxPyCBH_findCallback(m_myInst, "MacOpenFile")) { + PyObject* s = wx2PyString(fileName); + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s)); + Py_DECREF(s); + } + wxPyEndBlockThreads(blocked); +} + +void wxPyApp::MacPrintFile(const wxString &fileName) +{ + bool blocked = wxPyBeginBlockThreads(); + if (wxPyCBH_findCallback(m_myInst, "MacPrintFile")) { + PyObject* s = wx2PyString(fileName); + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s)); + Py_DECREF(s); + } + wxPyEndBlockThreads(blocked); +} + +void wxPyApp::MacNewFile() +{ + bool blocked = wxPyBeginBlockThreads(); + if (wxPyCBH_findCallback(m_myInst, "MacNewFile")) + wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); + wxPyEndBlockThreads(blocked); +} + +void wxPyApp::MacReopenApp() +{ + bool blocked = wxPyBeginBlockThreads(); + if (wxPyCBH_findCallback(m_myInst, "MacReopenApp")) + wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); + wxPyEndBlockThreads(blocked); +} + /*static*/ bool wxPyApp::GetMacSupportPCMenuShortcuts() { @@ -306,6 +376,103 @@ void wxPyApp::SetMacHelpMenuTitleName(const wxString& val) { } +// This finishes the initialization of wxWindows and then calls the OnInit +// that should be present in the derived (Python) class. +void wxPyApp::_BootstrapApp() +{ + static bool haveInitialized = false; + bool result, blocked; + PyObject* retval = NULL; + PyObject* pyint = NULL; + + + // Only initialize wxWidgets once + if (! haveInitialized) { + + // Get any command-line args passed to this program from the sys module + int argc = 0; + char** argv = NULL; + blocked = wxPyBeginBlockThreads(); + PyObject* sysargv = PySys_GetObject("argv"); + if (sysargv != NULL) { + argc = PyList_Size(sysargv); + argv = new char*[argc+1]; + int x; + for(x=0; xSetStartupComplete(true); + + // Call the Python wxApp's OnInit function + blocked = wxPyBeginBlockThreads(); + if (wxPyCBH_findCallback(m_myInst, "OnInit")) { + + PyObject* method = m_myInst.GetLastFound(); + PyObject* argTuple = PyTuple_New(0); + retval = PyEval_CallObject(method, argTuple); + Py_DECREF(argTuple); + Py_DECREF(method); + if (retval == NULL) + goto error; + + pyint = PyNumber_Int(retval); + if (! pyint) { + PyErr_SetString(PyExc_TypeError, "OnInit should return a boolean value"); + goto error; + } + result = PyInt_AS_LONG(pyint); + } + else { + // Is it okay if there is no OnInit? Probably so... + result = true; + } + + if (! result) { + PyErr_SetString(PyExc_SystemExit, "OnInit returned false, exiting..."); + } + + error: + Py_XDECREF(retval); + Py_XDECREF(pyint); + + wxPyEndBlockThreads(blocked); +}; //--------------------------------------------------------------------- //---------------------------------------------------------------------- @@ -347,112 +514,55 @@ static wxChar* wxPyCopyWString(const wxChar *src) #endif +inline const char* dropwx(const char* name) { + if (name[0] == 'w' && name[1] == 'x') + return name+2; + else + return name; +} + //---------------------------------------------------------------------- -// This function is called when the wxc module is imported to do some initial -// setup. (Before there is a wxApp object.) -void __wxPreStart(PyObject* moduleDict) +// This function is called when the wx._core_ module is imported to do some +// initial setup. (Before there is a wxApp object.) The rest happens in +// wxPyApp::_BootstrapApp +void __wxPyPreStart(PyObject* moduleDict) { #ifdef __WXMSW__ -// wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF); +// wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF +// | _CRTDBG_CHECK_ALWAYS_DF +// | _CRTDBG_DELAY_FREE_MEM_DF +// ); #endif #ifdef WXP_WITH_THREAD PyEval_InitThreads(); wxPyTStates = new wxPyThreadStateArray; wxPyTMutex = new wxMutex; + + // Save the current (main) thread state in our array + PyThreadState* tstate = wxPyBeginAllowThreads(); + wxPyEndAllowThreads(tstate); #endif // Ensure that the build options in the DLL (or whatever) match this build wxApp::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE, "wxPython"); - // Create an exception object to use for wxASSERTions - wxPyAssertionError = PyErr_NewException("wxPython.wxc.wxPyAssertionError", - PyExc_AssertionError, NULL); - PyDict_SetItemString(moduleDict, "wxPyAssertionError", wxPyAssertionError); -} - - - -// Initialize wxWindows and bootstrap the user application by calling the -// wxApp's OnInit, which is a parameter to this funciton. See wxApp.__init__ -// in _extras.py to learn how the bootstrap is started. -PyObject* __wxStart(PyObject* /* self */, PyObject* args) -{ - PyObject* onInitFunc = NULL; - PyObject* arglist= NULL; - PyObject* result = NULL; - PyObject* pyint = NULL; - long bResult; - - if (!PyArg_ParseTuple(args, "O", &onInitFunc)) - return NULL; - - // Get any command-line args passed to this program from the sys module - int argc = 0; - char** argv = NULL; - PyObject* sysargv = PySys_GetObject("argv"); - if (sysargv != NULL) { - argc = PyList_Size(sysargv); - argv = new char*[argc+1]; - int x; - for(x=0; xm_obj); - wxPyEndBlockThreads(); + self->m_obj = NULL; + wxPyEndBlockThreads(blocked); } } void wxPyUserData_dtor(wxPyUserData* self) { if (! wxPyDoingCleanup) { - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); Py_DECREF(self->m_obj); - wxPyEndBlockThreads(); + self->m_obj = NULL; + wxPyEndBlockThreads(blocked); } } @@ -634,22 +892,26 @@ void wxPyUserData_dtor(wxPyUserData* self) { // the now bogus pointer... So to try and prevent this we'll do a little black // magic and change the class of the python instance to a class that will // raise an exception for any attempt to call methods with it. See -// _wxPyDeadObject in _extras.py for the implementation of this class. +// _wxPyDeadObject in _core_ex.py for the implementation of this class. void wxPyOORClientData_dtor(wxPyOORClientData* self) { static PyObject* deadObjectClass = NULL; - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); if (deadObjectClass == NULL) { deadObjectClass = PyDict_GetItemString(wxPython_dict, "_wxPyDeadObject"); - wxASSERT_MSG(deadObjectClass != NULL, wxT("Can't get _wxPyDeadObject class!")); + // TODO: Can not wxASSERT here because inside a wxPyBeginBlock Threads, + // will lead to a deadlock when it tries to aquire the GIL again. + //wxASSERT_MSG(deadObjectClass != NULL, wxT("Can't get _wxPyDeadObject class!")); Py_INCREF(deadObjectClass); } // Only if there is more than one reference to the object if ( !wxPyDoingCleanup && self->m_obj->ob_refcnt > 1 ) { - wxASSERT_MSG(PyInstance_Check(self->m_obj), wxT("m_obj not an instance!?!?!")); + // bool isInstance = wxPyInstance_Check(self->m_obj); + // TODO same here + //wxASSERT_MSG(isInstance, wxT("m_obj not an instance!?!?!")); // Call __del__, if there is one. PyObject* func = PyObject_GetAttrString(self->m_obj, "__del__"); @@ -661,19 +923,26 @@ void wxPyOORClientData_dtor(wxPyOORClientData* self) { if (PyErr_Occurred()) PyErr_Clear(); // just ignore it for now - // Clear the instance's dictionary - PyInstanceObject* inst = (PyInstanceObject*)self->m_obj; - PyDict_Clear(inst->in_dict); - // put the name of the old class into the instance, and then reset the - // class to be the dead class. - PyDict_SetItemString(inst->in_dict, "_name", inst->in_class->cl_name); - inst->in_class = (PyClassObject*)deadObjectClass; - Py_INCREF(deadObjectClass); + PyObject* dict = PyObject_GetAttrString(self->m_obj, "__dict__"); + if (dict) { + // Clear the instance's dictionary + PyDict_Clear(dict); + + // put the name of the old class into the instance, and then reset the + // class to be the dead class. + PyObject* klass = PyObject_GetAttrString(self->m_obj, "__class__"); + PyObject* name = PyObject_GetAttrString(klass, "__name__"); + PyDict_SetItemString(dict, "_name", name); + PyObject_SetAttrString(self->m_obj, "__class__", deadObjectClass); + //Py_INCREF(deadObjectClass); + Py_DECREF(klass); + Py_DECREF(name); + } } - // m_obj is DECREF's in the base class dtor... - wxPyEndBlockThreads(); + // m_obj is DECREF'd in the base class dtor... + wxPyEndBlockThreads(blocked); } @@ -697,63 +966,41 @@ void wxPyPtrTypeMap_Add(const char* commonName, const char* ptrName) { -PyObject* wxPyClassExists(const wxString& className) { - - PyObject* item; - wxString name(className); - char buff[64]; // should always be big enough... - if (!className) - return NULL; - - // Try the name as-is first - sprintf(buff, "%sPtr", (const char*)name.mbc_str()); - PyObject* classobj = PyDict_GetItemString(wxPython_dict, buff); - - // if not found see if there is a mapped name for it - if ( ! classobj) { - if ((item = PyDict_GetItemString(wxPyPtrTypeMap, (char*)(const char*)name.mbc_str())) != NULL) { - name = wxString(PyString_AsString(item), *wxConvCurrent); - sprintf(buff, "%sPtr", (const char*)name.mbc_str()); - classobj = PyDict_GetItemString(wxPython_dict, buff); - } - } - - return classobj; // returns NULL if not found -} - - -PyObject* wxPyMake_wxObject(wxObject* source, bool checkEvtHandler) { +PyObject* wxPyMake_wxObject(wxObject* source, bool setThisOwn, bool checkEvtHandler) { PyObject* target = NULL; - bool isEvtHandler = FALSE; + 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; + isEvtHandler = true; wxEvtHandler* eh = (wxEvtHandler*)source; wxPyOORClientData* data = (wxPyOORClientData*)eh->GetClientObject(); if (data) { target = data->m_obj; - Py_INCREF(target); + if (target) + 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(); - wxString name = info->GetClassName(); - PyObject* klass = wxPyClassExists(name); - while (info && !klass) { - name = (wxChar*)info->GetBaseClassName1(); - info = wxClassInfo::FindClass(name); - klass = wxPyClassExists(name); + // Otherwise make it the old fashioned way by making a new shadow + // object and putting this pointer in it. Look up the class + // heirarchy until we find a class name that is located in the + // python module. + const wxClassInfo* info = source->GetClassInfo(); + wxString name = info->GetClassName(); + bool exists = wxPyCheckSwigType(name); + while (info && !exists) { + info = info->GetBaseClass1(); + name = info->GetClassName(); + exists = wxPyCheckSwigType(name); } if (info) { - target = wxPyConstructObject(source, name, klass, FALSE); + target = wxPyConstructObject((void*)source, name, setThisOwn); if (target && isEvtHandler) ((wxEvtHandler*)source)->SetClientObject(new wxPyOORClientData(target)); } else { @@ -770,22 +1017,22 @@ PyObject* wxPyMake_wxObject(wxObject* source, bool checkEvtHandler) { } -PyObject* wxPyMake_wxSizer(wxSizer* source) { +PyObject* wxPyMake_wxSizer(wxSizer* source, bool setThisOwn) { 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. + // 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; wxPyOORClientData* data = (wxPyOORClientData*)sz->GetClientObject(); if (data) { target = data->m_obj; - Py_INCREF(target); + if (target) + Py_INCREF(target); } } if (! target) { - target = wxPyMake_wxObject(source, FALSE); + target = wxPyMake_wxObject(source, setThisOwn, false); if (target != Py_None) ((wxSizer*)source)->SetClientObject(new wxPyOORClientData(target)); } @@ -793,66 +1040,6 @@ PyObject* wxPyMake_wxSizer(wxSizer* source) { } - -//--------------------------------------------------------------------------- - -PyObject* wxPyConstructObject(void* ptr, - const wxString& className, - PyObject* klass, - int setThisOwn) { - - PyObject* obj; - PyObject* arg; - PyObject* item; - wxString name(className); - char swigptr[64]; // should always be big enough... - char buff[64]; - - if ((item = PyDict_GetItemString(wxPyPtrTypeMap, (char*)(const char*)name.mbc_str())) != NULL) { - name = wxString(PyString_AsString(item), *wxConvCurrent); - } - sprintf(buff, "_%s_p", (const char*)name.mbc_str()); - SWIG_MakePtr(swigptr, ptr, buff); - - arg = Py_BuildValue("(s)", swigptr); - obj = PyInstance_New(klass, arg, NULL); - Py_DECREF(arg); - - if (setThisOwn) { - PyObject* one = PyInt_FromLong(1); - PyObject_SetAttrString(obj, "thisown", one); - Py_DECREF(one); - } - - return obj; -} - - -PyObject* wxPyConstructObject(void* ptr, - const wxString& className, - int setThisOwn) { - if (!ptr) { - Py_INCREF(Py_None); - return Py_None; - } - - char buff[64]; // should always be big enough... - sprintf(buff, "%sPtr", (const char*)className.mbc_str()); - - wxASSERT_MSG(wxPython_dict, wxT("wxPython_dict is not set yet!!")); - - PyObject* classobj = PyDict_GetItemString(wxPython_dict, buff); - if (! classobj) { - wxString msg(wxT("wxPython class not found for ")); - msg += className; - PyErr_SetString(PyExc_NameError, msg.mbc_str()); - return NULL; - } - - return wxPyConstructObject(ptr, className, classobj, setThisOwn); -} - - //--------------------------------------------------------------------------- @@ -862,20 +1049,21 @@ unsigned long wxPyGetCurrentThreadId() { return wxThread::GetCurrentId(); } -static PyThreadState* gs_shutdownTState; +static wxPyThreadState gs_shutdownTState; + static -PyThreadState* wxPyGetThreadState() { +wxPyThreadState* wxPyGetThreadState() { if (wxPyTMutex == NULL) // Python is shutting down... - return gs_shutdownTState; + return &gs_shutdownTState; unsigned long ctid = wxPyGetCurrentThreadId(); - PyThreadState* tstate = NULL; + wxPyThreadState* 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; + tstate = &info; break; } } @@ -884,10 +1072,11 @@ PyThreadState* wxPyGetThreadState() { return tstate; } + static void wxPySaveThreadState(PyThreadState* tstate) { if (wxPyTMutex == NULL) { // Python is shutting down, assume a single thread... - gs_shutdownTState = tstate; + gs_shutdownTState.tstate = tstate; return; } unsigned long ctid = wxPyGetCurrentThreadId(); @@ -899,11 +1088,12 @@ void wxPySaveThreadState(PyThreadState* tstate) { if (info.tstate != tstate) wxLogMessage("*** tstate mismatch!???"); #endif - // info.tstate = tstate; *** DO NOT update existing ones??? + info.tstate = tstate; // allow for transient tstates // Normally it will never change, but apparently COM callbacks // (i.e. ActiveX controls) will (incorrectly IMHO) use a transient // tstate which will then be garbage the next time we try to use // it... + wxPyTMutex->Unlock(); return; } @@ -916,6 +1106,7 @@ void wxPySaveThreadState(PyThreadState* tstate) { #endif + // Calls from Python to wxWindows code are wrapped in calls to these // functions: @@ -940,19 +1131,35 @@ void wxPyEndAllowThreads(PyThreadState* saved) { // 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() { +bool wxPyBeginBlockThreads() { #ifdef WXP_WITH_THREAD - PyThreadState* tstate = wxPyGetThreadState(); - PyEval_RestoreThread(tstate); + // This works in for 2.3, maybe a good alternative to find the needed tstate? + // PyThreadState *check = PyGILState_GetThisThreadState(); + + PyThreadState *current = _PyThreadState_Current; + + // Only block if there wasn't already a tstate, or if the current one is + // not the one we are wanting to change to. This should prevent deadlock + // if there are nested calls to wxPyBeginBlockThreads + bool blocked = false; + wxPyThreadState* tstate = wxPyGetThreadState(); + if (current != tstate->tstate) { + PyEval_RestoreThread(tstate->tstate); + blocked = true; + } + return blocked; #endif } -void wxPyEndBlockThreads() { +void wxPyEndBlockThreads(bool blocked) { #ifdef WXP_WITH_THREAD - // Is there any need to save it again? - // PyThreadState* tstate = - PyEval_SaveThread(); + // Only unblock if we blocked in the last call to wxPyBeginBlockThreads. + // The value of blocked passed in needs to be the same as that returned + // from wxPyBeginBlockThreads at the same nesting level. + if ( blocked ) { + PyEval_SaveThread(); + } #endif } @@ -973,7 +1180,7 @@ bool wxPyInputStream::eof() { if (m_wxis) return m_wxis->Eof(); else - return TRUE; + return true; } wxPyInputStream::~wxPyInputStream() { @@ -990,9 +1197,9 @@ PyObject* wxPyInputStream::read(int size) { // check if we have a real wxInputStream to work with if (!m_wxis) { - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); PyErr_SetString(PyExc_IOError, "no valid C-wxInputStream"); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return NULL; } @@ -1009,7 +1216,7 @@ PyObject* wxPyInputStream::read(int size) { } // error check - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); wxStreamError err = m_wxis->GetLastError(); if (err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF) { PyErr_SetString(PyExc_IOError,"IOError in wxInputStream"); @@ -1018,7 +1225,7 @@ PyObject* wxPyInputStream::read(int size) { // We use only strings for the streams, not unicode obj = PyString_FromStringAndSize(buf, buf.GetDataLen()); } - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return obj; } @@ -1031,9 +1238,9 @@ PyObject* wxPyInputStream::readline(int size) { // check if we have a real wxInputStream to work with if (!m_wxis) { - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); PyErr_SetString(PyExc_IOError,"no valid C-wxInputStream"); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return NULL; } @@ -1044,7 +1251,7 @@ PyObject* wxPyInputStream::readline(int size) { } // errorcheck - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); wxStreamError err = m_wxis->GetLastError(); if (err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF) { PyErr_SetString(PyExc_IOError,"IOError in wxInputStream"); @@ -1053,7 +1260,7 @@ PyObject* wxPyInputStream::readline(int size) { // We use only strings for the streams, not unicode obj = PyString_FromStringAndSize((char*)buf.GetData(), buf.GetDataLen()); } - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return obj; } @@ -1063,19 +1270,21 @@ PyObject* wxPyInputStream::readlines(int sizehint) { // check if we have a real wxInputStream to work with if (!m_wxis) { - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); PyErr_SetString(PyExc_IOError,"no valid C-wxInputStream"); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return NULL; } // init list - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); pylist = PyList_New(0); + wxPyEndBlockThreads(blocked); + if (!pylist) { - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); PyErr_NoMemory(); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return NULL; } @@ -1084,24 +1293,24 @@ PyObject* wxPyInputStream::readlines(int sizehint) { for (i=0; (m_wxis->CanRead()) && ((sizehint < 0) || (i < sizehint));) { PyObject* s = this->readline(); if (s == NULL) { - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); Py_DECREF(pylist); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return NULL; } - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); PyList_Append(pylist, s); i += PyString_Size(s); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); } // error check wxStreamError err = m_wxis->GetLastError(); if (err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF) { - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); Py_DECREF(pylist); PyErr_SetString(PyExc_IOError,"IOError in wxInputStream"); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return NULL; } @@ -1129,16 +1338,18 @@ wxPyCBInputStream::wxPyCBInputStream(PyObject *r, PyObject *s, PyObject *t, bool wxPyCBInputStream::~wxPyCBInputStream() { - if (m_block) wxPyBeginBlockThreads(); + bool blocked=false; + if (m_block) blocked = wxPyBeginBlockThreads(); Py_XDECREF(m_read); Py_XDECREF(m_seek); Py_XDECREF(m_tell); - if (m_block) wxPyEndBlockThreads(); + if (m_block) wxPyEndBlockThreads(blocked); } wxPyCBInputStream* wxPyCBInputStream::create(PyObject *py, bool block) { - if (block) wxPyBeginBlockThreads(); + bool blocked=false; + if (block) blocked = wxPyBeginBlockThreads(); PyObject* read = getMethod(py, "read"); PyObject* seek = getMethod(py, "seek"); @@ -1149,11 +1360,11 @@ wxPyCBInputStream* wxPyCBInputStream::create(PyObject *py, bool block) { Py_XDECREF(read); Py_XDECREF(seek); Py_XDECREF(tell); - if (block) wxPyEndBlockThreads(); + if (block) wxPyEndBlockThreads(blocked); return NULL; } - if (block) wxPyEndBlockThreads(); + if (block) wxPyEndBlockThreads(blocked); return new wxPyCBInputStream(read, seek, tell, block); } @@ -1177,8 +1388,8 @@ PyObject* wxPyCBInputStream::getMethod(PyObject* py, char* name) { size_t wxPyCBInputStream::GetSize() const { wxPyCBInputStream* self = (wxPyCBInputStream*)this; // cast off const if (m_seek && m_tell) { - off_t temp = self->OnSysTell(); - off_t ret = self->OnSysSeek(0, wxFromEnd); + wxFileOffset temp = self->OnSysTell(); + wxFileOffset ret = self->OnSysSeek(0, wxFromEnd); self->OnSysSeek(temp, wxFromStart); return ret; } @@ -1191,7 +1402,7 @@ size_t wxPyCBInputStream::OnSysRead(void *buffer, size_t bufsize) { if (bufsize == 0) return 0; - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); PyObject* arglist = Py_BuildValue("(i)", bufsize); PyObject* result = PyEval_CallObject(m_read, arglist); Py_DECREF(arglist); @@ -1209,7 +1420,7 @@ size_t wxPyCBInputStream::OnSysRead(void *buffer, size_t bufsize) { } else m_lasterror = wxSTREAM_READ_ERROR; - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return o; } @@ -1218,10 +1429,10 @@ size_t wxPyCBInputStream::OnSysWrite(const void *buffer, size_t bufsize) { return 0; } -off_t wxPyCBInputStream::OnSysSeek(off_t off, wxSeekMode mode) { - wxPyBeginBlockThreads(); -#ifdef _LARGE_FILES - // off_t is a 64-bit value... +wxFileOffset wxPyCBInputStream::OnSysSeek(wxFileOffset off, wxSeekMode mode) { + bool blocked = wxPyBeginBlockThreads(); +#if defined( __WINCE__) || defined(_LARGE_FILES) || wxHAS_HUGE_FILES + // wxFileOffset is a 64-bit value... PyObject* arglist = Py_BuildValue("(Li)", off, mode); #else PyObject* arglist = Py_BuildValue("(ii)", off, mode); @@ -1229,28 +1440,27 @@ off_t wxPyCBInputStream::OnSysSeek(off_t off, wxSeekMode mode) { PyObject* result = PyEval_CallObject(m_seek, arglist); Py_DECREF(arglist); Py_XDECREF(result); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return OnSysTell(); } -off_t wxPyCBInputStream::OnSysTell() const { - wxPyBeginBlockThreads(); +wxFileOffset wxPyCBInputStream::OnSysTell() const { + bool blocked = wxPyBeginBlockThreads(); PyObject* arglist = Py_BuildValue("()"); PyObject* result = PyEval_CallObject(m_tell, arglist); Py_DECREF(arglist); - off_t o = 0; + wxFileOffset o = 0; if (result != NULL) { -#ifdef _LARGE_FILES +#if defined( __WINCE__) || defined(_LARGE_FILES) || wxHAS_HUGE_FILES if (PyLong_Check(result)) o = PyLong_AsLongLong(result); else -#else - o = PyInt_AsLong(result); #endif + o = PyInt_AsLong(result); Py_DECREF(result); }; - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return o; } @@ -1269,12 +1479,14 @@ wxPyCallback::wxPyCallback(const wxPyCallback& other) { } wxPyCallback::~wxPyCallback() { - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); Py_DECREF(m_func); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); } +#define wxPy_PRECALLINIT "_preCallInit" +#define wxPy_POSTCALLCLEANUP "_postCallCleanup" // This function is used for all events destined for Python event handlers. void wxPyCallback::EventThunker(wxEvent& event) { @@ -1283,9 +1495,9 @@ void wxPyCallback::EventThunker(wxEvent& event) { PyObject* result; PyObject* arg; PyObject* tuple; - bool checkSkip = FALSE; + bool checkSkip = false; - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); wxString className = event.GetClassInfo()->GetClassName(); // If the event is one of these types then pass the original @@ -1302,32 +1514,65 @@ void wxPyCallback::EventThunker(wxEvent& event) { arg = wxPyConstructObject((void*)&event, className); } - // Call the event handler, passing the event object - tuple = PyTuple_New(1); - PyTuple_SET_ITEM(tuple, 0, arg); // steals ref to arg - result = PyEval_CallObject(func, tuple); - if ( result ) { - Py_DECREF(result); // result is ignored, but we still need to decref it - PyErr_Clear(); // Just in case... - } else { + if (!arg) { PyErr_Print(); - } - - if ( checkSkip ) { - // if the event object was one of our special types and - // it had been cloned, then we need to extract the Skipped - // value from the original and set it in the clone. - result = PyObject_CallMethod(arg, "GetSkipped", ""); + } else { + // "intern" the pre/post method names to speed up the HasAttr + static PyObject* s_preName = NULL; + static PyObject* s_postName = NULL; + if (s_preName == NULL) { + s_preName = PyString_FromString(wxPy_PRECALLINIT); + s_postName = PyString_FromString(wxPy_POSTCALLCLEANUP); + } + + // Check if the event object needs some preinitialization + if (PyObject_HasAttr(arg, s_preName)) { + result = PyObject_CallMethodObjArgs(arg, s_preName, arg, NULL); + if ( result ) { + Py_DECREF(result); // result is ignored, but we still need to decref it + PyErr_Clear(); // Just in case... + } else { + PyErr_Print(); + } + } + + // Call the event handler, passing the event object + tuple = PyTuple_New(1); + PyTuple_SET_ITEM(tuple, 0, arg); // steals ref to arg + result = PyEval_CallObject(func, tuple); if ( result ) { - event.Skip(PyInt_AsLong(result)); - Py_DECREF(result); + Py_DECREF(result); // result is ignored, but we still need to decref it + PyErr_Clear(); // Just in case... } else { PyErr_Print(); } - } - Py_DECREF(tuple); - wxPyEndBlockThreads(); + // Check if the event object needs some post cleanup + if (PyObject_HasAttr(arg, s_postName)) { + result = PyObject_CallMethodObjArgs(arg, s_postName, arg, NULL); + if ( result ) { + Py_DECREF(result); // result is ignored, but we still need to decref it + PyErr_Clear(); // Just in case... + } else { + PyErr_Print(); + } + } + + if ( checkSkip ) { + // if the event object was one of our special types and + // it had been cloned, then we need to extract the Skipped + // value from the original and set it in the clone. + result = PyObject_CallMethod(arg, "GetSkipped", ""); + if ( result ) { + event.Skip(PyInt_AsLong(result)); + Py_DECREF(result); + } else { + PyErr_Print(); + } + } + Py_DECREF(tuple); + } + wxPyEndBlockThreads(blocked); } @@ -1373,7 +1618,6 @@ PyObject* PyFindClassWithAttr(PyObject *klass, PyObject *name) 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 */ @@ -1448,7 +1692,7 @@ bool wxPyCallbackHelper::findCallback(const char* name) const { // not from a base class... if (PyMethod_Check(method) && (klass = PyMethod_GetDefiningClass(method, (char*)name)) != NULL && - ((klass == m_class) || PyClass_IsSubclass(klass, m_class))) { + ((klass == m_class) || PyObject_IsSubclass(klass, m_class))) { // ...then we'll save a pointer to the method so callCallback can call it. self->m_lastFound = method; @@ -1463,7 +1707,7 @@ bool wxPyCallbackHelper::findCallback(const char* name) const { int wxPyCallbackHelper::callCallback(PyObject* argTuple) const { PyObject* result; - int retval = FALSE; + int retval = false; result = callCallbackObj(argTuple); if (result) { // Assumes an integer return type... @@ -1475,7 +1719,7 @@ 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. +// value. Caller should DECREF the return value and also manage the GIL. PyObject* wxPyCallbackHelper::callCallbackObj(PyObject* argTuple) const { PyObject* result; @@ -1513,10 +1757,10 @@ PyObject* wxPyCBH_callCallbackObj(const wxPyCallbackHelper& cbh, PyObject* argTu void wxPyCBH_delete(wxPyCallbackHelper* cbh) { if (cbh->m_incRef) { - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); Py_XDECREF(cbh->m_self); Py_XDECREF(cbh->m_class); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); } } @@ -1530,26 +1774,26 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh) { wxPyEvtSelfRef::wxPyEvtSelfRef() { //m_self = Py_None; // **** We don't do normal ref counting to prevent //Py_INCREF(m_self); // circular loops... - m_cloned = FALSE; + m_cloned = false; } wxPyEvtSelfRef::~wxPyEvtSelfRef() { - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); if (m_cloned) Py_DECREF(m_self); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); } void wxPyEvtSelfRef::SetSelf(PyObject* self, bool clone) { - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); if (m_cloned) Py_DECREF(m_self); m_self = self; if (clone) { Py_INCREF(m_self); - m_cloned = TRUE; + m_cloned = true; } - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); } PyObject* wxPyEvtSelfRef::GetSelf() const { @@ -1570,7 +1814,7 @@ wxPyEvent::wxPyEvent(int winid, wxEventType commandType) wxPyEvent::wxPyEvent(const wxPyEvent& evt) : wxEvent(evt) { - SetSelf(evt.m_self, TRUE); + SetSelf(evt.m_self, true); } @@ -1586,7 +1830,7 @@ wxPyCommandEvent::wxPyCommandEvent(wxEventType commandType, int id) wxPyCommandEvent::wxPyCommandEvent(const wxPyCommandEvent& evt) : wxCommandEvent(evt) { - SetSelf(evt.m_self, TRUE); + SetSelf(evt.m_self, true); } @@ -1596,93 +1840,47 @@ wxPyCommandEvent::~wxPyCommandEvent() { -//--------------------------------------------------------------------------- -//--------------------------------------------------------------------------- - - -wxPyTimer::wxPyTimer(PyObject* callback) { - func = callback; - Py_INCREF(func); -} - -wxPyTimer::~wxPyTimer() { - wxPyBeginBlockThreads(); - Py_DECREF(func); - wxPyEndBlockThreads(); -} - -void wxPyTimer::Notify() { - if (!func || func == Py_None) { - wxTimer::Notify(); - } - else { - 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(); - } - - wxPyEndBlockThreads(); - } -} - - //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- -// Convert a wxList to a Python List +// Convert a wxList to a Python List, only works for lists of wxObjects -PyObject* wxPy_ConvertList(wxListBase* listbase, const char* className) { +PyObject* wxPy_ConvertList(wxListBase* listbase) { wxList* list = (wxList*)listbase; // this is probably bad... PyObject* pyList; PyObject* pyObj; wxObject* wxObj; wxNode* node = list->GetFirst(); - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); pyList = PyList_New(0); while (node) { wxObj = node->GetData(); - pyObj = wxPyMake_wxObject(wxObj); //wxPyConstructObject(wxObj, className); + pyObj = wxPyMake_wxObject(wxObj,false); PyList_Append(pyList, pyObj); node = node->GetNext(); } - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return pyList; } //---------------------------------------------------------------------- long wxPyGetWinHandle(wxWindow* win) { + #ifdef __WXMSW__ return (long)win->GetHandle(); #endif -#ifdef __WXAC__ +#if defined(__WXGTK__) || defined(__WXX11) + return (long)GetXWindow(win); +#endif + +#ifdef __WXMAC__ + //return (long)MAC_WXHWND(win->MacGetTopLevelWindowRef()); return (long)win->GetHandle(); #endif - // Find and return the actual X-Window. -#ifdef __WXGTK__ - if (win->m_wxwindow) { -#ifdef __WXGTK20__ - return (long) GDK_WINDOW_XWINDOW(GTK_PIZZA(win->m_wxwindow)->bin_window); -#else - GdkWindowPrivate* bwin = (GdkWindowPrivate*)GTK_PIZZA(win->m_wxwindow)->bin_window; - if (bwin) { - return (long)bwin->xwindow; - } -#endif - } -#endif return 0; } @@ -1690,50 +1888,43 @@ long wxPyGetWinHandle(wxWindow* win) { // Some helper functions for typemaps in my_typemaps.i, so they won't be // included in every file over and over again... -#if PYTHON_API_VERSION >= 1009 - static char* wxStringErrorMsg = "String or Unicode type required"; -#else - static char* wxStringErrorMsg = "String type required"; -#endif - - wxString* wxString_in_helper(PyObject* source) { - wxString* target; -#if PYTHON_API_VERSION >= 1009 // Have Python unicode API + wxString* target = NULL; + if (!PyString_Check(source) && !PyUnicode_Check(source)) { - PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + PyErr_SetString(PyExc_TypeError, "String or Unicode type required"); return NULL; } #if wxUSE_UNICODE - if (PyUnicode_Check(source)) { - target = new wxString(); - size_t len = PyUnicode_GET_SIZE(source); - if (len) { - PyUnicode_AsWideChar((PyUnicodeObject*)source, target->GetWriteBuf(len), len); - target->UngetWriteBuf(); - } - } else { - // It is a string, get pointers to it and transform to unicode - char* tmpPtr; int tmpSize; - PyString_AsStringAndSize(source, &tmpPtr, &tmpSize); - target = new wxString(tmpPtr, *wxConvCurrent, tmpSize); + PyObject* uni = source; + if (PyString_Check(source)) { + uni = PyUnicode_FromObject(source); + if (PyErr_Occurred()) return NULL; } -#else - char* tmpPtr; int tmpSize; - if (PyString_AsStringAndSize(source, &tmpPtr, &tmpSize) == -1) { - PyErr_SetString(PyExc_TypeError, "Unable to convert string"); - return NULL; + target = new wxString(); + size_t len = PyUnicode_GET_SIZE(uni); + if (len) { + PyUnicode_AsWideChar((PyUnicodeObject*)uni, target->GetWriteBuf(len), len); + target->UngetWriteBuf(len); } - target = new wxString(tmpPtr, tmpSize); -#endif // wxUSE_UNICODE -#else // No Python unicode API (1.5.2) + if (PyString_Check(source)) + Py_DECREF(uni); +#else + // Convert to a string object if it isn't already, then to wxString + PyObject* str = source; if (!PyString_Check(source)) { - PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); - return NULL; + str = PyObject_Str(source); + if (PyErr_Occurred()) return NULL; } - target = new wxString(PyString_AS_STRING(source), PyString_GET_SIZE(source)); -#endif + char* tmpPtr; int tmpSize; + PyString_AsStringAndSize(str, &tmpPtr, &tmpSize); + target = new wxString(tmpPtr, tmpSize); + + if (!PyString_Check(source)) + Py_DECREF(str); +#endif // wxUSE_UNICODE + return target; } @@ -1742,45 +1933,37 @@ wxString* wxString_in_helper(PyObject* source) { wxString Py2wxString(PyObject* source) { wxString target; - bool doDecRef = FALSE; - -#if PYTHON_API_VERSION >= 1009 // Have Python unicode API - if (!PyString_Check(source) && !PyUnicode_Check(source)) { - // Convert to String if not one already... (TODO: Unicode too?) - source = PyObject_Str(source); - doDecRef = TRUE; - } #if wxUSE_UNICODE - if (PyUnicode_Check(source)) { - size_t len = PyUnicode_GET_SIZE(source); - if (len) { - PyUnicode_AsWideChar((PyUnicodeObject*)source, target.GetWriteBuf(len), len); - target.UngetWriteBuf(); - } - } else { - // It is a string, get pointers to it and transform to unicode - char* tmpPtr; int tmpSize; - PyString_AsStringAndSize(source, &tmpPtr, &tmpSize); - target = wxString(tmpPtr, *wxConvCurrent, tmpSize); - } + // Convert to a unicode object, if not already, then to a wxString + PyObject* uni = source; + if (!PyUnicode_Check(source)) { + uni = PyUnicode_FromObject(source); + if (PyErr_Occurred()) return wxEmptyString; // TODO: should we PyErr_Clear? + } + size_t len = PyUnicode_GET_SIZE(uni); + if (len) { + PyUnicode_AsWideChar((PyUnicodeObject*)uni, target.GetWriteBuf(len), len); + target.UngetWriteBuf(); + } + + if (!PyUnicode_Check(source)) + Py_DECREF(uni); #else + // Convert to a string object if it isn't already, then to wxString + PyObject* str = source; + if (!PyString_Check(source)) { + str = PyObject_Str(source); + if (PyErr_Occurred()) return wxEmptyString; // TODO: should we PyErr_Clear? + } char* tmpPtr; int tmpSize; - PyString_AsStringAndSize(source, &tmpPtr, &tmpSize); + PyString_AsStringAndSize(str, &tmpPtr, &tmpSize); target = wxString(tmpPtr, tmpSize); + + if (!PyString_Check(source)) + Py_DECREF(str); #endif // wxUSE_UNICODE -#else // No Python unicode API (1.5.2) - if (!PyString_Check(source)) { - // Convert to String if not one already... - source = PyObject_Str(source); - doDecRef = TRUE; - } - target = wxString(PyString_AS_STRING(source), PyString_GET_SIZE(source)); -#endif - - if (doDecRef) - Py_DECREF(source); return target; } @@ -1905,7 +2088,7 @@ static inline bool wxPointFromObjects(PyObject* o1, PyObject* o2, wxPoint* point point->y = (int)PyFloat_AS_DOUBLE(o2); return true; } - if (PyInstance_Check(o1) || PyInstance_Check(o2)) { + if (wxPySwigInstance_Check(o1) || wxPySwigInstance_Check(o2)) { // TODO: Why??? // Disallow instances because they can cause havok return false; } @@ -1963,9 +2146,9 @@ wxPoint* wxPoint_LIST_helper(PyObject* source, int *count) { goto error2; } } - else if (PyInstance_Check(o)) { + else if (wxPySwigInstance_Check(o)) { wxPoint* pt; - if (SWIG_GetPtrObj(o, (void **)&pt, "_wxPoint_p")) { + if (! wxPyConvertSwigPtr(o, (void **)&pt, wxT("wxPoint"))) { goto error2; } temp[x] = *pt; @@ -2017,10 +2200,10 @@ wxBitmap** wxBitmap_LIST_helper(PyObject* source) { } for (int x=0; x