X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f845b22151aa252447d4805bdbfefe2ef66f3e2..d1cf7e2aa447ca21e187e49bb2b106c869306c3f:/wxPython/src/helpers.cpp diff --git a/wxPython/src/helpers.cpp b/wxPython/src/helpers.cpp index e85e1fac53..7bfbb60175 100644 --- a/wxPython/src/helpers.cpp +++ b/wxPython/src/helpers.cpp @@ -15,6 +15,8 @@ #include #include "wx/wxPython/wxPython_int.h" #include "wx/wxPython/pyistream.h" +#include "wx/wxPython/swigver.h" +#include "wx/wxPython/twoitem.h" #ifdef __WXMSW__ #include @@ -28,7 +30,9 @@ #include #include #include -#define GetXWindow(wxwin) GDK_WINDOW_XWINDOW((wxwin)->m_widget->window) +#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 @@ -47,18 +51,19 @@ //---------------------------------------------------------------------- -#if PYTHON_API_VERSION <= 1007 && wxUSE_UNICODE +#if PYTHON_API_VERSION < 1009 && wxUSE_UNICODE #error Python must support Unicode to use wxWindows Unicode #endif //---------------------------------------------------------------------- wxPyApp* wxPythonApp = NULL; // Global instance of application object -bool wxPyDoCleanup = False; -bool wxPyDoingCleanup = False; +bool wxPyDoCleanup = false; +bool wxPyDoingCleanup = false; #ifdef WXP_WITH_THREAD +#if !wxPyUSE_GIL_STATE struct wxPyThreadState { unsigned long tid; PyThreadState* tstate; @@ -74,9 +79,14 @@ WX_DEFINE_OBJARRAY(wxPyThreadStateArray); wxPyThreadStateArray* wxPyTStates = NULL; wxMutex* wxPyTMutex = NULL; + +#endif #endif +#define DEFAULTENCODING_SIZE 64 +static char wxPyDefaultEncoding[DEFAULTENCODING_SIZE] = "ascii"; + static PyObject* wxPython_dict = NULL; static PyObject* wxPyAssertionError = NULL; static PyObject* wxPyNoAppError = NULL; @@ -89,17 +99,18 @@ PyObject* wxPyPtrTypeMap = NULL; // This gets run when the DLL is loaded. We just need to save a handle. //---------------------------------------------------------------------- +extern "C" BOOL WINAPI DllMain( HINSTANCE hinstDLL, // handle to DLL module DWORD fdwReason, // reason for calling function LPVOID lpvReserved // reserved ) { - // If wxPython is embedded in another wxWindows app then - // the inatance has already been set. + // If wxPython is embedded in another wxWidgets app then + // the instance has already been set. if (! wxGetInstance()) wxSetInstance(hinstDLL); - return True; + return true; } #endif @@ -112,17 +123,19 @@ IMPLEMENT_ABSTRACT_CLASS(wxPyApp, wxApp); wxPyApp::wxPyApp() { m_assertMode = wxPYAPP_ASSERT_EXCEPTION; - m_startupComplete = False; + m_startupComplete = false; } wxPyApp::~wxPyApp() { + wxPythonApp = NULL; + wxApp::SetInstance(NULL); } // This one isn't acutally called... We fake it with _BootstrapApp bool wxPyApp::OnInit() { - return False; + return false; } @@ -144,9 +157,9 @@ int wxPyApp::MainLoop() { bool wxPyApp::OnInitGui() { - bool rval=True; + bool rval=true; wxApp::OnInitGui(); // in this case always call the base class version - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "OnInitGui")) rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); wxPyEndBlockThreads(blocked); @@ -156,7 +169,7 @@ bool wxPyApp::OnInitGui() { int wxPyApp::OnExit() { int rval=0; - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "OnExit")) rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); wxPyEndBlockThreads(blocked); @@ -165,29 +178,43 @@ int wxPyApp::OnExit() { } -#ifdef __WXDEBUG__ -void wxPyApp::OnAssert(const wxChar *file, - int line, - const wxChar *cond, - const wxChar *msg) { +void wxPyApp::ExitMainLoop() { + bool found; + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + if ((found = wxPyCBH_findCallback(m_myInst, "ExitMainLoop"))) + wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); + wxPyEndBlockThreads(blocked); + if (! found) + wxApp::ExitMainLoop(); +} + + +#ifdef __WXDEBUG__ +void wxPyApp::OnAssertFailure(const wxChar *file, + int line, + const wxChar *func, + 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; - } + if ( func && *func ) + buf << wxT(" in ") << func << wxT("()"); + if (msg != NULL) + buf << wxT(": ") << msg; + wxLogDebug(buf); return; } // If the OnAssert is overloaded in the Python class then call it... bool found; - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "OnAssert"))) { PyObject* fso = wx2PyString(file); PyObject* cso = wx2PyString(file); @@ -214,14 +241,15 @@ void wxPyApp::OnAssert(const wxChar *file, if (m_assertMode & wxPYAPP_ASSERT_EXCEPTION) { wxString buf; buf.Alloc(4096); - buf.Printf(wxT("C++ assertion \"%s\" failed in %s(%d)"), cond, file, line); - if (msg != NULL) { - buf += wxT(": "); - buf += msg; - } + buf.Printf(wxT("C++ assertion \"%s\" failed at %s(%d)"), cond, file, line); + if ( func && *func ) + buf << wxT(" in ") << func << wxT("()"); + if (msg != NULL) + buf << wxT(": ") << msg; + // set the exception - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyObject* s = wx2PyString(buf); PyErr_SetObject(wxPyAssertionError, s); Py_DECREF(s); @@ -239,16 +267,16 @@ void wxPyApp::OnAssert(const wxChar *file, buf.Alloc(4096); buf.Printf(wxT("%s(%d): assert \"%s\" failed"), file, line, cond); - if (msg != NULL) { - buf += wxT(": "); - buf += msg; - } + if ( func && *func ) + buf << wxT(" in ") << func << wxT("()"); + if (msg != NULL) + buf << wxT(": ") << msg; wxLogDebug(buf); } // do the normal wx assert dialog? if (m_assertMode & wxPYAPP_ASSERT_DIALOG) - wxApp::OnAssert(file, line, cond, msg); + wxApp::OnAssertFailure(file, line, func, cond, msg); } } #endif @@ -256,7 +284,7 @@ void wxPyApp::OnAssert(const wxChar *file, // For catching Apple Events void wxPyApp::MacOpenFile(const wxString &fileName) { - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "MacOpenFile")) { PyObject* s = wx2PyString(fileName); wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s)); @@ -267,7 +295,7 @@ void wxPyApp::MacOpenFile(const wxString &fileName) void wxPyApp::MacPrintFile(const wxString &fileName) { - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "MacPrintFile")) { PyObject* s = wx2PyString(fileName); wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s)); @@ -278,7 +306,7 @@ void wxPyApp::MacPrintFile(const wxString &fileName) void wxPyApp::MacNewFile() { - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "MacNewFile")) wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); wxPyEndBlockThreads(blocked); @@ -286,7 +314,7 @@ void wxPyApp::MacNewFile() void wxPyApp::MacReopenApp() { - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "MacReopenApp")) wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); wxPyEndBlockThreads(blocked); @@ -295,11 +323,7 @@ void wxPyApp::MacReopenApp() /*static*/ bool wxPyApp::GetMacSupportPCMenuShortcuts() { -#ifdef __WXMAC__ - return s_macSupportPCMenuShortcuts; -#else return 0; -#endif } /*static*/ @@ -339,10 +363,7 @@ wxString wxPyApp::GetMacHelpMenuTitleName() { } /*static*/ -void wxPyApp::SetMacSupportPCMenuShortcuts(bool val) { -#ifdef __WXMAC__ - s_macSupportPCMenuShortcuts = val; -#endif +void wxPyApp::SetMacSupportPCMenuShortcuts(bool) { } /*static*/ @@ -379,26 +400,31 @@ void wxPyApp::SetMacHelpMenuTitleName(const wxString& val) { void wxPyApp::_BootstrapApp() { static bool haveInitialized = false; - bool result, blocked; + bool result; + wxPyBlock_t 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); + PyObject* executable = PySys_GetObject("executable"); + + if (sysargv != NULL && executable != NULL) { + argc = PyList_Size(sysargv) + 1; argv = new char*[argc+1]; + argv[0] = strdup(PyString_AsString(executable)); int x; - for(x=0; xargc = 0; + this->argv = NULL; + } + // It's now ok to generate exceptions for assertion errors. - wxPythonApp->SetStartupComplete(True); + wxPythonApp->SetStartupComplete(true); - // Call the Python wxApp's OnInit function + + // Call the Python wxApp's OnPreInit and OnInit functions blocked = wxPyBeginBlockThreads(); + if (wxPyCBH_findCallback(m_myInst, "OnPreInit")) { + PyObject* method = m_myInst.GetLastFound(); + PyObject* argTuple = PyTuple_New(0); + retval = PyEval_CallObject(method, argTuple); + m_myInst.clearRecursionGuard(method); + Py_DECREF(argTuple); + Py_DECREF(method); + if (retval == NULL) + goto error; + } if (wxPyCBH_findCallback(m_myInst, "OnInit")) { PyObject* method = m_myInst.GetLastFound(); PyObject* argTuple = PyTuple_New(0); retval = PyEval_CallObject(method, argTuple); + m_myInst.clearRecursionGuard(method); Py_DECREF(argTuple); Py_DECREF(method); if (retval == NULL) + // Don't PyErr_Print here, let the exception in this case go back + // up to the wx.PyApp.__init__ scope. goto error; pyint = PyNumber_Int(retval); @@ -458,11 +501,11 @@ void wxPyApp::_BootstrapApp() } else { // Is it okay if there is no OnInit? Probably so... - result = True; + result = true; } if (! result) { - PyErr_SetString(PyExc_SystemExit, "OnInit returned False, exiting..."); + PyErr_SetString(PyExc_SystemExit, "OnInit returned false, exiting..."); } error: @@ -530,11 +573,14 @@ void __wxPyPreStart(PyObject* moduleDict) #ifdef __WXMSW__ // wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF // | _CRTDBG_CHECK_ALWAYS_DF -// | _CRTDBG_DELAY_FREE_MEM_DF +// | _CRTDBG_DELAY_FREE_MEM_DF // ); #endif #ifdef WXP_WITH_THREAD +#if wxPyUSE_GIL_STATE + PyEval_InitThreads(); +#else PyEval_InitThreads(); wxPyTStates = new wxPyThreadStateArray; wxPyTMutex = new wxMutex; @@ -542,32 +588,32 @@ void __wxPyPreStart(PyObject* moduleDict) // Save the current (main) thread state in our array PyThreadState* tstate = wxPyBeginAllowThreads(); wxPyEndAllowThreads(tstate); +#endif #endif // Ensure that the build options in the DLL (or whatever) match this build wxApp::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE, "wxPython"); - // Init the stock objects to a non-NULL value so SWIG doesn't create them as None - wxPy_ReinitStockObjects(1); - wxInitAllImageHandlers(); } void __wxPyCleanup() { - wxPyDoingCleanup = True; + wxPyDoingCleanup = true; if (wxPyDoCleanup) { - wxPyDoCleanup = False; + wxPyDoCleanup = false; wxEntryCleanup(); } #ifdef WXP_WITH_THREAD +#if !wxPyUSE_GIL_STATE delete wxPyTMutex; wxPyTMutex = NULL; wxPyTStates->Empty(); delete wxPyTStates; wxPyTStates = NULL; #endif +#endif } @@ -598,7 +644,7 @@ PyObject* __wxPySetDictionary(PyObject* /* self */, PyObject* args) wxPyNoAppError = PyErr_NewException("wx._core.PyNoAppError", PyExc_RuntimeError, NULL); PyDict_SetItemString(wxPython_dict, "PyNoAppError", wxPyNoAppError); - + #ifdef __WXMOTIF__ @@ -633,7 +679,7 @@ PyObject* __wxPySetDictionary(PyObject* /* self */, PyObject* args) PyDict_SetItemString(wxPython_dict, "USE_UNICODE", PyInt_FromLong(wxUSE_UNICODE)); PyDict_SetItemString(wxPython_dict, "__WXDEBUG__", PyInt_FromLong(wxdebug)); - + // Make a tuple of strings that gives more info about the platform. PyObject* PlatInfo = PyList_New(0); PyObject* obj; @@ -647,7 +693,7 @@ PyObject* __wxPySetDictionary(PyObject* /* self */, PyObject* args) #if wxUSE_UNICODE _AddInfoString("unicode"); #else - _AddInfoString("ascii"); + _AddInfoString("ansi"); #endif #ifdef __WXGTK__ #ifdef __WXGTK20__ @@ -661,189 +707,30 @@ PyObject* __wxPySetDictionary(PyObject* /* self */, PyObject* args) #else _AddInfoString("wx-assertions-off"); #endif - + _AddInfoString(wxPy_SWIG_VERSION); +#ifdef __WXMAC__ + #if wxMAC_USE_CORE_GRAPHICS + _AddInfoString("mac-cg"); + #else + _AddInfoString("mac-qd"); + #endif + #if wxMAC_USE_NATIVE_TOOLBAR + _AddInfoString("mac-native-tb"); + #else + _AddInfoString("mac-no-native-tb"); + #endif +#endif + #undef _AddInfoString PyObject* PlatInfoTuple = PyList_AsTuple(PlatInfo); Py_DECREF(PlatInfo); PyDict_SetItemString(wxPython_dict, "PlatformInfo", PlatInfoTuple); - - RETURN_NONE(); -} - -//--------------------------------------------------------------------------- - -// Python's PyInstance_Check does not return True for instances of new-style -// classes. This should get close enough for both new and old classes but I -// should re-evaluate the need for doing instance checks... -bool wxPyInstance_Check(PyObject* obj) { - return PyObject_HasAttrString(obj, "__class__") != 0; -} - - -// This one checks if the object is an instance of a SWIG proxy class (it has -// a .this attribute) -bool wxPySwigInstance_Check(PyObject* obj) { - return PyObject_HasAttrString(obj, "this") != 0; -} - -//--------------------------------------------------------------------------- - -// The stock objects are no longer created when the wx._core_ module is -// imported, but only after the app object has been created. The -// wxPy_ReinitStockObjects function will be called 3 times to pass the stock -// objects though various stages of evolution: -// -// pass 1: Set all the pointers to a non-NULL value so the Python proxy -// object will be created (otherwise SWIG will just use None.) -// -// pass 2: After the module has been imported and the python proxys have -// been created, then set the __class__ to be _wxPyUnbornObject so -// it will catch any access to the object and will raise an exception. -// -// pass 3: Finally, from BootstrapApp patch things up so the stock objects -// can be used. - - -PyObject* __wxPyFixStockObjects(PyObject* /* self */, PyObject* args) -{ - wxPy_ReinitStockObjects(2); RETURN_NONE(); } -static void rsoPass2(const char* name) -{ - static PyObject* unbornObjectClass = NULL; - PyObject* obj; - - if (unbornObjectClass == NULL) { - unbornObjectClass = PyDict_GetItemString(wxPython_dict, "_wxPyUnbornObject"); - Py_INCREF(unbornObjectClass); - } - - // Find the object instance - obj = PyDict_GetItemString(wxPython_dict, (char*)dropwx(name)); - wxCHECK_RET(obj != NULL, wxT("Unable to find stock object")); - wxCHECK_RET(wxPySwigInstance_Check(obj), wxT("Not a swig instance")); - - // Change its class - PyObject_SetAttrString(obj, "__class__", unbornObjectClass); - -} - -static void rsoPass3(const char* name, const char* classname, void* ptr) -{ - PyObject* obj; - PyObject* classobj; - PyObject* ptrobj; - - // Find the object instance - obj = PyDict_GetItemString(wxPython_dict, (char*)dropwx(name)); - wxCHECK_RET(obj != NULL, wxT("Unable to find stock object")); - wxCHECK_RET(wxPySwigInstance_Check(obj), wxT("Not a swig instance")); - - // Find the class object and put it back in the instance - classobj = PyDict_GetItemString(wxPython_dict, (char*)dropwx(classname)); - wxCHECK_RET(classobj != NULL, wxT("Unable to find stock class object")); - PyObject_SetAttrString(obj, "__class__", classobj); - - // Rebuild the .this swigified pointer with the new value of the C++ pointer - ptrobj = wxPyMakeSwigPtr(ptr, wxString(classname, *wxConvCurrent)); - PyObject_SetAttrString(obj, "this", ptrobj); - Py_DECREF(ptrobj); -} - - - -void wxPy_ReinitStockObjects(int pass) -{ - - // If there is already an App object then wxPython is probably embedded in - // a wx C++ application, so there is no need to do all this. - static bool embedded = false; - if ((pass == 1 || pass == 2) && wxTheApp) { - embedded = true; - return; - } - if (pass == 3 && embedded) - return; - - -#define REINITOBJ(name, classname) \ - if (pass == 1) { name = (classname*)0xC0C0C0C0; } \ - else if (pass == 2) { rsoPass2(#name); } \ - else if (pass == 3) { rsoPass3(#name, #classname, (void*)name); } - - -#define REINITOBJ2(name, classname) \ - if (pass == 1) { } \ - else if (pass == 2) { rsoPass2(#name); } \ - else if (pass == 3) { rsoPass3(#name, #classname, (void*)&name); } - - - REINITOBJ(wxNORMAL_FONT, wxFont); - REINITOBJ(wxSMALL_FONT, wxFont); - REINITOBJ(wxITALIC_FONT, wxFont); - REINITOBJ(wxSWISS_FONT, wxFont); - - REINITOBJ(wxRED_PEN, wxPen); - REINITOBJ(wxCYAN_PEN, wxPen); - REINITOBJ(wxGREEN_PEN, wxPen); - REINITOBJ(wxBLACK_PEN, wxPen); - REINITOBJ(wxWHITE_PEN, wxPen); - REINITOBJ(wxTRANSPARENT_PEN, wxPen); - REINITOBJ(wxBLACK_DASHED_PEN, wxPen); - REINITOBJ(wxGREY_PEN, wxPen); - REINITOBJ(wxMEDIUM_GREY_PEN, wxPen); - REINITOBJ(wxLIGHT_GREY_PEN, wxPen); - - REINITOBJ(wxBLUE_BRUSH, wxBrush); - REINITOBJ(wxGREEN_BRUSH, wxBrush); - REINITOBJ(wxWHITE_BRUSH, wxBrush); - REINITOBJ(wxBLACK_BRUSH, wxBrush); - REINITOBJ(wxTRANSPARENT_BRUSH, wxBrush); - REINITOBJ(wxCYAN_BRUSH, wxBrush); - REINITOBJ(wxRED_BRUSH, wxBrush); - REINITOBJ(wxGREY_BRUSH, wxBrush); - REINITOBJ(wxMEDIUM_GREY_BRUSH, wxBrush); - REINITOBJ(wxLIGHT_GREY_BRUSH, wxBrush); - - REINITOBJ(wxBLACK, wxColour); - REINITOBJ(wxWHITE, wxColour); - REINITOBJ(wxRED, wxColour); - REINITOBJ(wxBLUE, wxColour); - REINITOBJ(wxGREEN, wxColour); - REINITOBJ(wxCYAN, wxColour); - REINITOBJ(wxLIGHT_GREY, wxColour); - - REINITOBJ(wxSTANDARD_CURSOR, wxCursor); - REINITOBJ(wxHOURGLASS_CURSOR, wxCursor); - REINITOBJ(wxCROSS_CURSOR, wxCursor); - - REINITOBJ2(wxNullBitmap, wxBitmap); - REINITOBJ2(wxNullIcon, wxIcon); - REINITOBJ2(wxNullCursor, wxCursor); - REINITOBJ2(wxNullPen, wxPen); - REINITOBJ2(wxNullBrush, wxBrush); - REINITOBJ2(wxNullPalette, wxPalette); - REINITOBJ2(wxNullFont, wxFont); - REINITOBJ2(wxNullColour, wxColour); - - REINITOBJ(wxTheFontList, wxFontList); - REINITOBJ(wxThePenList, wxPenList); - REINITOBJ(wxTheBrushList, wxBrushList); - REINITOBJ(wxTheColourDatabase, wxColourDatabase); - - - REINITOBJ2(wxDefaultValidator, wxValidator); - REINITOBJ2(wxNullImage, wxImage); - REINITOBJ2(wxNullAcceleratorTable, wxAcceleratorTable); - -#undef REINITOBJ -#undef REINITOBJ2 -} //--------------------------------------------------------------------------- @@ -862,27 +749,30 @@ bool wxPyCheckForApp() { //--------------------------------------------------------------------------- - -void wxPyClientData_dtor(wxPyClientData* self) { - if (! wxPyDoingCleanup) { // Don't do it during cleanup as Python - // may have already garbage collected the object... - bool blocked = wxPyBeginBlockThreads(); +void wxPyUserData_dtor(wxPyUserData* self) { + if (! wxPyDoingCleanup) { + wxPyBlock_t blocked = wxPyBeginBlockThreads(); Py_DECREF(self->m_obj); self->m_obj = NULL; wxPyEndBlockThreads(blocked); } } -void wxPyUserData_dtor(wxPyUserData* self) { - if (! wxPyDoingCleanup) { - bool blocked = wxPyBeginBlockThreads(); - Py_DECREF(self->m_obj); + +void wxPyClientData_dtor(wxPyClientData* self) { + if (! wxPyDoingCleanup) { // Don't do it during cleanup as Python + // may have already garbage collected the object... + if (self->m_incRef) { + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + Py_DECREF(self->m_obj); + wxPyEndBlockThreads(blocked); + } self->m_obj = NULL; - wxPyEndBlockThreads(blocked); } } + // This is called when an OOR controled object is being destroyed. Although // the C++ object is going away there is no way to force the Python object // (and all references to it) to die too. This causes problems (crashes) in @@ -895,7 +785,7 @@ void wxPyOORClientData_dtor(wxPyOORClientData* self) { static PyObject* deadObjectClass = NULL; - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if (deadObjectClass == NULL) { deadObjectClass = PyDict_GetItemString(wxPython_dict, "_wxPyDeadObject"); // TODO: Can not wxASSERT here because inside a wxPyBeginBlock Threads, @@ -905,8 +795,9 @@ void wxPyOORClientData_dtor(wxPyOORClientData* self) { } - // Only if there is more than one reference to the object - if ( !wxPyDoingCleanup && self->m_obj->ob_refcnt > 1 ) { + // Only if there is more than one reference to the object and we are + // holding the OOR reference: + if ( !wxPyDoingCleanup && self->m_obj->ob_refcnt > 1 && self->m_incRef) { // bool isInstance = wxPyInstance_Check(self->m_obj); // TODO same here //wxASSERT_MSG(isInstance, wxT("m_obj not an instance!?!?!")); @@ -967,14 +858,15 @@ void wxPyPtrTypeMap_Add(const char* commonName, const char* ptrName) { PyObject* wxPyMake_wxObject(wxObject* source, bool setThisOwn, bool checkEvtHandler) { PyObject* target = NULL; - bool isEvtHandler = False; + bool isEvtHandler = false; + bool isSizer = 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) { @@ -984,6 +876,18 @@ PyObject* wxPyMake_wxObject(wxObject* source, bool setThisOwn, bool checkEvtHan } } + // Also check for wxSizer + if (!target && wxIsKindOf(source, wxSizer)) { + isSizer = true; + wxSizer* sz = (wxSizer*)source; + wxPyOORClientData* data = (wxPyOORClientData*)sz->GetClientObject(); + if (data) { + target = data->m_obj; + 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. Look up the class @@ -1001,6 +905,8 @@ PyObject* wxPyMake_wxObject(wxObject* source, bool setThisOwn, bool checkEvtHan target = wxPyConstructObject((void*)source, name, setThisOwn); if (target && isEvtHandler) ((wxEvtHandler*)source)->SetClientObject(new wxPyOORClientData(target)); + if (target && isSizer) + ((wxSizer*)source)->SetClientObject(new wxPyOORClientData(target)); } else { wxString msg(wxT("wxPython class not found for ")); msg += source->GetClassInfo()->GetClassName(); @@ -1016,25 +922,8 @@ PyObject* wxPyMake_wxObject(wxObject* source, bool setThisOwn, bool checkEvtHan 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. - wxSizer* sz = (wxSizer*)source; - wxPyOORClientData* data = (wxPyOORClientData*)sz->GetClientObject(); - if (data) { - target = data->m_obj; - if (target) - Py_INCREF(target); - } - } - if (! target) { - target = wxPyMake_wxObject(source, setThisOwn, False); - if (target != Py_None) - ((wxSizer*)source)->SetClientObject(new wxPyOORClientData(target)); - } - return target; + return wxPyMake_wxObject(source, setThisOwn); } @@ -1042,6 +931,8 @@ PyObject* wxPyMake_wxSizer(wxSizer* source, bool setThisOwn) { #ifdef WXP_WITH_THREAD +#if !wxPyUSE_GIL_STATE + inline unsigned long wxPyGetCurrentThreadId() { return wxThread::GetCurrentId(); @@ -1086,11 +977,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; } @@ -1101,6 +993,7 @@ void wxPySaveThreadState(PyThreadState* tstate) { } #endif +#endif @@ -1110,7 +1003,9 @@ void wxPySaveThreadState(PyThreadState* tstate) { PyThreadState* wxPyBeginAllowThreads() { #ifdef WXP_WITH_THREAD PyThreadState* saved = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS; +#if !wxPyUSE_GIL_STATE wxPySaveThreadState(saved); +#endif return saved; #else return NULL; @@ -1128,17 +1023,21 @@ 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: -bool wxPyBeginBlockThreads() { +wxPyBlock_t wxPyBeginBlockThreads() { #ifdef WXP_WITH_THREAD - // This works in for 2.3, maybe a good alternative to find the needed tstate? - // PyThreadState *check = PyGILState_GetThisThreadState(); - + if (! Py_IsInitialized()) { + return (wxPyBlock_t)0; + } +#if wxPyUSE_GIL_STATE + PyGILState_STATE state = PyGILState_Ensure(); + return state; +#else 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; + wxPyBlock_t blocked = false; wxPyThreadState* tstate = wxPyGetThreadState(); if (current != tstate->tstate) { PyEval_RestoreThread(tstate->tstate); @@ -1146,11 +1045,20 @@ bool wxPyBeginBlockThreads() { } return blocked; #endif +#else + return (wxPyBlock_t)0; +#endif } -void wxPyEndBlockThreads(bool blocked) { +void wxPyEndBlockThreads(wxPyBlock_t blocked) { #ifdef WXP_WITH_THREAD + if (! Py_IsInitialized()) { + return; + } +#if wxPyUSE_GIL_STATE + PyGILState_Release(blocked); +#else // 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. @@ -1158,6 +1066,7 @@ void wxPyEndBlockThreads(bool blocked) { PyEval_SaveThread(); } #endif +#endif } @@ -1177,11 +1086,12 @@ bool wxPyInputStream::eof() { if (m_wxis) return m_wxis->Eof(); else - return True; + return true; } wxPyInputStream::~wxPyInputStream() { - /* do nothing */ + if (m_wxis) + delete m_wxis; } @@ -1194,7 +1104,7 @@ PyObject* wxPyInputStream::read(int size) { // check if we have a real wxInputStream to work with if (!m_wxis) { - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyErr_SetString(PyExc_IOError, "no valid C-wxInputStream"); wxPyEndBlockThreads(blocked); return NULL; @@ -1213,7 +1123,7 @@ PyObject* wxPyInputStream::read(int size) { } // error check - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); wxStreamError err = m_wxis->GetLastError(); if (err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF) { PyErr_SetString(PyExc_IOError,"IOError in wxInputStream"); @@ -1235,7 +1145,7 @@ PyObject* wxPyInputStream::readline(int size) { // check if we have a real wxInputStream to work with if (!m_wxis) { - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyErr_SetString(PyExc_IOError,"no valid C-wxInputStream"); wxPyEndBlockThreads(blocked); return NULL; @@ -1248,7 +1158,7 @@ PyObject* wxPyInputStream::readline(int size) { } // errorcheck - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); wxStreamError err = m_wxis->GetLastError(); if (err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF) { PyErr_SetString(PyExc_IOError,"IOError in wxInputStream"); @@ -1267,19 +1177,19 @@ PyObject* wxPyInputStream::readlines(int sizehint) { // check if we have a real wxInputStream to work with if (!m_wxis) { - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyErr_SetString(PyExc_IOError,"no valid C-wxInputStream"); wxPyEndBlockThreads(blocked); return NULL; } // init list - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); pylist = PyList_New(0); wxPyEndBlockThreads(blocked); - + if (!pylist) { - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyErr_NoMemory(); wxPyEndBlockThreads(blocked); return NULL; @@ -1290,12 +1200,12 @@ PyObject* wxPyInputStream::readlines(int sizehint) { for (i=0; (m_wxis->CanRead()) && ((sizehint < 0) || (i < sizehint));) { PyObject* s = this->readline(); if (s == NULL) { - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); Py_DECREF(pylist); wxPyEndBlockThreads(blocked); return NULL; } - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyList_Append(pylist, s); i += PyString_Size(s); wxPyEndBlockThreads(blocked); @@ -1304,7 +1214,7 @@ PyObject* wxPyInputStream::readlines(int sizehint) { // error check wxStreamError err = m_wxis->GetLastError(); if (err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF) { - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); Py_DECREF(pylist); PyErr_SetString(PyExc_IOError,"IOError in wxInputStream"); wxPyEndBlockThreads(blocked); @@ -1333,9 +1243,20 @@ wxPyCBInputStream::wxPyCBInputStream(PyObject *r, PyObject *s, PyObject *t, bool : wxInputStream(), m_read(r), m_seek(s), m_tell(t), m_block(block) {} +wxPyCBInputStream::wxPyCBInputStream(const wxPyCBInputStream& other) +{ + m_read = other.m_read; + m_seek = other.m_seek; + m_tell = other.m_tell; + m_block = other.m_block; + Py_INCREF(m_read); + Py_INCREF(m_seek); + Py_INCREF(m_tell); +} + wxPyCBInputStream::~wxPyCBInputStream() { - bool blocked=false; + wxPyBlock_t blocked; if (m_block) blocked = wxPyBeginBlockThreads(); Py_XDECREF(m_read); Py_XDECREF(m_seek); @@ -1345,7 +1266,7 @@ wxPyCBInputStream::~wxPyCBInputStream() { wxPyCBInputStream* wxPyCBInputStream::create(PyObject *py, bool block) { - bool blocked=false; + wxPyBlock_t blocked; if (block) blocked = wxPyBeginBlockThreads(); PyObject* read = getMethod(py, "read"); @@ -1370,6 +1291,10 @@ wxPyCBInputStream* wxPyCBInputStream_create(PyObject *py, bool block) { return wxPyCBInputStream::create(py, block); } +wxPyCBInputStream* wxPyCBInputStream_copy(wxPyCBInputStream* other) { + return new wxPyCBInputStream(*other); +} + PyObject* wxPyCBInputStream::getMethod(PyObject* py, char* name) { if (!PyObject_HasAttrString(py, name)) return NULL; @@ -1382,16 +1307,16 @@ PyObject* wxPyCBInputStream::getMethod(PyObject* py, char* name) { } -size_t wxPyCBInputStream::GetSize() const { +wxFileOffset wxPyCBInputStream::GetLength() 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; } else - return 0; + return wxInvalidOffset; } @@ -1399,7 +1324,7 @@ size_t wxPyCBInputStream::OnSysRead(void *buffer, size_t bufsize) { if (bufsize == 0) return 0; - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyObject* arglist = Py_BuildValue("(i)", bufsize); PyObject* result = PyEval_CallObject(m_read, arglist); Py_DECREF(arglist); @@ -1426,14 +1351,20 @@ size_t wxPyCBInputStream::OnSysWrite(const void *buffer, size_t bufsize) { return 0; } -off_t wxPyCBInputStream::OnSysSeek(off_t off, wxSeekMode mode) { - bool blocked = wxPyBeginBlockThreads(); -#ifdef _LARGE_FILES - // off_t is a 64-bit value... - PyObject* arglist = Py_BuildValue("(Li)", off, mode); -#else - PyObject* arglist = Py_BuildValue("(ii)", off, mode); -#endif + +wxFileOffset wxPyCBInputStream::OnSysSeek(wxFileOffset off, wxSeekMode mode) { + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + PyObject* arglist = PyTuple_New(2); + + if (sizeof(wxFileOffset) > sizeof(long)) + // wxFileOffset is a 64-bit value... + PyTuple_SET_ITEM(arglist, 0, PyLong_FromLongLong(off)); + else + PyTuple_SET_ITEM(arglist, 0, PyInt_FromLong(off)); + + PyTuple_SET_ITEM(arglist, 1, PyInt_FromLong(mode)); + + PyObject* result = PyEval_CallObject(m_seek, arglist); Py_DECREF(arglist); Py_XDECREF(result); @@ -1442,18 +1373,16 @@ off_t wxPyCBInputStream::OnSysSeek(off_t off, wxSeekMode mode) { } -off_t wxPyCBInputStream::OnSysTell() const { - bool blocked = wxPyBeginBlockThreads(); +wxFileOffset wxPyCBInputStream::OnSysTell() const { + wxPyBlock_t 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 (PyLong_Check(result)) o = PyLong_AsLongLong(result); else -#endif o = PyInt_AsLong(result); Py_DECREF(result); }; @@ -1476,7 +1405,7 @@ wxPyCallback::wxPyCallback(const wxPyCallback& other) { } wxPyCallback::~wxPyCallback() { - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); Py_DECREF(m_func); wxPyEndBlockThreads(blocked); } @@ -1492,9 +1421,9 @@ void wxPyCallback::EventThunker(wxEvent& event) { PyObject* result; PyObject* arg; PyObject* tuple; - bool checkSkip = False; + bool checkSkip = false; - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); wxString className = event.GetClassInfo()->GetClassName(); // If the event is one of these types then pass the original @@ -1521,7 +1450,7 @@ void wxPyCallback::EventThunker(wxEvent& event) { 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); @@ -1530,9 +1459,9 @@ void wxPyCallback::EventThunker(wxEvent& event) { 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 @@ -1552,7 +1481,7 @@ void wxPyCallback::EventThunker(wxEvent& event) { PyErr_Clear(); // Just in case... } else { PyErr_Print(); - } + } } if ( checkSkip ) { @@ -1659,52 +1588,88 @@ PyObject* PyFindClassWithAttr(PyObject *klass, PyObject *name) static -PyObject* PyMethod_GetDefiningClass(PyObject* method, const char* name) +PyObject* PyMethod_GetDefiningClass(PyObject* method, PyObject* nameo) { 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; + return PyFindClassWithAttr(mgc, nameo); #endif } -bool wxPyCallbackHelper::findCallback(const char* name) const { +// To avoid recursion when an overridden virtual method wants to call the base +// class version, temporarily set an attribute in the instance with the same +// name as the method. Then the PyObject_GetAttr in the next findCallback +// will return this attribute and the PyMethod_Check will fail. + +void wxPyCallbackHelper::setRecursionGuard(PyObject* method) const +{ + PyFunctionObject* func = (PyFunctionObject*)PyMethod_Function(method); + PyObject_SetAttr(m_self, func->func_name, Py_None); +} + +void wxPyCallbackHelper::clearRecursionGuard(PyObject* method) const +{ + PyFunctionObject* func = (PyFunctionObject*)PyMethod_Function(method); + if (PyObject_HasAttr(m_self, func->func_name)) { + PyObject_DelAttr(m_self, func->func_name); + } +} + +// bool wxPyCallbackHelper::hasRecursionGuard(PyObject* method) const +// { +// PyFunctionObject* func = (PyFunctionObject*)PyMethod_Function(method); +// if (PyObject_HasAttr(m_self, func->func_name)) { +// PyObject* attr = PyObject_GetAttr(m_self, func->func_name); +// bool retval = (attr == Py_None); +// Py_DECREF(attr); +// return retval; +// } +// return false; +// } + + +bool wxPyCallbackHelper::findCallback(const char* name, bool setGuard) const { wxPyCallbackHelper* self = (wxPyCallbackHelper*)this; // cast away const + PyObject *method, *klass; + PyObject* nameo = PyString_FromString(name); 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)) { - PyObject *method, *klass; - method = PyObject_GetAttrString(m_self, (char*)name); + if (m_self && PyObject_HasAttr(m_self, nameo)) { + method = PyObject_GetAttr(m_self, nameo); // ...and if that attribute is a method, and if that method's class is - // not from a base class... + // not from the registered class or a base class... if (PyMethod_Check(method) && - (klass = PyMethod_GetDefiningClass(method, (char*)name)) != NULL && - ((klass == m_class) || PyObject_IsSubclass(klass, m_class))) { - - // ...then we'll save a pointer to the method so callCallback can call it. + (klass = PyMethod_GetDefiningClass(method, nameo)) != NULL && + (klass != m_class) && + PyObject_IsSubclass(klass, m_class)) { + + // ...then we'll save a pointer to the method so callCallback can + // call it. But first, set a recursion guard in case the + // overridden method wants to call the base class version. + if (setGuard) + setRecursionGuard(method); self->m_lastFound = method; } else { Py_DECREF(method); } } + + Py_DECREF(nameo); return m_lastFound != NULL; } int wxPyCallbackHelper::callCallback(PyObject* argTuple) const { PyObject* result; - int retval = False; + int retval = false; result = callCallbackObj(argTuple); if (result) { // Assumes an integer return type... @@ -1726,6 +1691,8 @@ PyObject* wxPyCallbackHelper::callCallbackObj(PyObject* argTuple) const { PyObject* method = m_lastFound; result = PyEval_CallObject(method, argTuple); + clearRecursionGuard(method); + Py_DECREF(argTuple); Py_DECREF(method); if (!result) { @@ -1739,8 +1706,8 @@ void wxPyCBH_setCallbackInfo(wxPyCallbackHelper& cbh, PyObject* self, PyObject* cbh.setSelf(self, klass, incref); } -bool wxPyCBH_findCallback(const wxPyCallbackHelper& cbh, const char* name) { - return cbh.findCallback(name); +bool wxPyCBH_findCallback(const wxPyCallbackHelper& cbh, const char* name, bool setGuard) { + return cbh.findCallback(name, setGuard); } int wxPyCBH_callCallback(const wxPyCallbackHelper& cbh, PyObject* argTuple) { @@ -1754,7 +1721,7 @@ PyObject* wxPyCBH_callCallbackObj(const wxPyCallbackHelper& cbh, PyObject* argTu void wxPyCBH_delete(wxPyCallbackHelper* cbh) { if (cbh->m_incRef) { - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); Py_XDECREF(cbh->m_self); Py_XDECREF(cbh->m_class); wxPyEndBlockThreads(blocked); @@ -1771,24 +1738,24 @@ 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() { - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if (m_cloned) Py_DECREF(m_self); wxPyEndBlockThreads(blocked); } void wxPyEvtSelfRef::SetSelf(PyObject* self, bool clone) { - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t 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(blocked); } @@ -1811,7 +1778,7 @@ wxPyEvent::wxPyEvent(int winid, wxEventType commandType) wxPyEvent::wxPyEvent(const wxPyEvent& evt) : wxEvent(evt) { - SetSelf(evt.m_self, True); + SetSelf(evt.m_self, true); } @@ -1827,7 +1794,7 @@ wxPyCommandEvent::wxPyCommandEvent(wxEventType commandType, int id) wxPyCommandEvent::wxPyCommandEvent(const wxPyCommandEvent& evt) : wxCommandEvent(evt) { - SetSelf(evt.m_self, True); + SetSelf(evt.m_self, true); } @@ -1849,7 +1816,7 @@ PyObject* wxPy_ConvertList(wxListBase* listbase) { wxObject* wxObj; wxNode* node = list->GetFirst(); - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); pyList = PyList_New(0); while (node) { wxObj = node->GetData(); @@ -1872,7 +1839,7 @@ long wxPyGetWinHandle(wxWindow* win) { #if defined(__WXGTK__) || defined(__WXX11) return (long)GetXWindow(win); #endif - + #ifdef __WXMAC__ //return (long)MAC_WXHWND(win->MacGetTopLevelWindowRef()); return (long)win->GetHandle(); @@ -1895,27 +1862,37 @@ wxString* wxString_in_helper(PyObject* source) { #if wxUSE_UNICODE PyObject* uni = source; if (PyString_Check(source)) { - uni = PyUnicode_FromObject(source); + uni = PyUnicode_FromEncodedObject(source, wxPyDefaultEncoding, "strict"); if (PyErr_Occurred()) return NULL; } target = new wxString(); size_t len = PyUnicode_GET_SIZE(uni); if (len) { PyUnicode_AsWideChar((PyUnicodeObject*)uni, target->GetWriteBuf(len), len); - target->UngetWriteBuf(); + target->UngetWriteBuf(len); } if (PyString_Check(source)) Py_DECREF(uni); #else - char* tmpPtr; int tmpSize; - if (PyString_AsStringAndSize(source, &tmpPtr, &tmpSize) == -1) { - PyErr_SetString(PyExc_TypeError, "Unable to convert string"); - return NULL; + // Convert to a string object if it isn't already, then to wxString + PyObject* str = source; + if (PyUnicode_Check(source)) { + str = PyUnicode_AsEncodedString(source, wxPyDefaultEncoding, "strict"); + if (PyErr_Occurred()) return NULL; + } + else if (!PyString_Check(source)) { + str = PyObject_Str(source); + if (PyErr_Occurred()) return NULL; } + char* tmpPtr; Py_ssize_t tmpSize; + PyString_AsStringAndSize(str, &tmpPtr, &tmpSize); target = new wxString(tmpPtr, tmpSize); + + if (!PyString_Check(source)) + Py_DECREF(str); #endif // wxUSE_UNICODE - + return target; } @@ -1929,28 +1906,32 @@ wxString Py2wxString(PyObject* source) // Convert to a unicode object, if not already, then to a wxString PyObject* uni = source; if (!PyUnicode_Check(source)) { - uni = PyUnicode_FromObject(source); + uni = PyUnicode_FromEncodedObject(source, wxPyDefaultEncoding, "strict"); 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)) { + if (PyUnicode_Check(source)) { + str = PyUnicode_AsEncodedString(source, wxPyDefaultEncoding, "strict"); + if (PyErr_Occurred()) return wxEmptyString; // TODO: should we PyErr_Clear? + } + else if (!PyString_Check(source)) { str = PyObject_Str(source); if (PyErr_Occurred()) return wxEmptyString; // TODO: should we PyErr_Clear? } - char* tmpPtr; int tmpSize; + char* tmpPtr; Py_ssize_t tmpSize; PyString_AsStringAndSize(str, &tmpPtr, &tmpSize); target = wxString(tmpPtr, tmpSize); - + if (!PyString_Check(source)) Py_DECREF(str); #endif // wxUSE_UNICODE @@ -1972,6 +1953,17 @@ PyObject* wx2PyString(const wxString& src) } + +void wxSetDefaultPyEncoding(const char* encoding) +{ + strncpy(wxPyDefaultEncoding, encoding, DEFAULTENCODING_SIZE); +} + +const char* wxGetDefaultPyEncoding() +{ + return wxPyDefaultEncoding; +} + //---------------------------------------------------------------------- @@ -2066,37 +2058,73 @@ char** string_LIST_helper(PyObject* source) { 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)) { +//--------------------------------------------------------------------------- +// NOTE: The following functions could really use some refactoring using +// templates to make things somewhat simpler... + +inline bool wxPointFromObjects(PyObject* o1, PyObject* o2, wxPoint* point) +{ + // get the x value + if (PyInt_Check(o1)) + point->x = (int)PyInt_AS_LONG(o1); + else if (PyFloat_Check(o1)) point->x = (int)PyFloat_AS_DOUBLE(o1); + else if (PyNumber_Check(o1)) + point->x = (int)PyInt_AsLong(o1); + else + return false; + + // get the y value + if (PyInt_Check(o2)) + point->y = (int)PyInt_AS_LONG(o2); + else if (PyFloat_Check(o2)) point->y = (int)PyFloat_AS_DOUBLE(o2); - return True; - } - if (wxPySwigInstance_Check(o1) || wxPySwigInstance_Check(o2)) { // TODO: Why??? - // 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; + else if (PyNumber_Check(o2)) + point->y = (int)PyInt_AsLong(o2); + else + return false; + + return true; + +// NOTE: This function used to have this code in it, but I don't know why it +// is a problem nor what havok it will cause, so removing for now... +// if (wxPySwigInstance_Check(o1) || wxPySwigInstance_Check(o2)) { +// // Disallow instances because they can cause havok +// return false; +// } +} + + +inline bool wxPoint2DFromObjects(PyObject* o1, PyObject* o2, wxPoint2D* point) +{ + // get the x value + if (PyInt_Check(o1)) + point->m_x = (double)PyInt_AS_LONG(o1); + else if (PyFloat_Check(o1)) + point->m_x = (double)PyFloat_AS_DOUBLE(o1); + else if (PyNumber_Check(o1)) + point->m_x = (double)PyFloat_AsDouble(o1); + else + return false; + + // get the y value + if (PyInt_Check(o2)) + point->m_y = (double)PyInt_AS_LONG(o2); + else if (PyFloat_Check(o2)) + point->m_y = (double)PyFloat_AS_DOUBLE(o2); + else if (PyNumber_Check(o2)) + point->m_y = (double)PyFloat_AsDouble(o2); + else + return false; + + return true; } -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* wxPoint_LIST_helper(PyObject* source, int *count) +{ + int idx; wxPoint* temp; PyObject *o, *o1, *o2; bool isFast = PyList_Check(source) || PyTuple_Check(source); @@ -2116,13 +2144,13 @@ wxPoint* wxPoint_LIST_helper(PyObject* source, int *count) { PyErr_SetString(PyExc_MemoryError, "Unable to allocate temporary array"); return NULL; } - for (x=0; x<*count; x++) { + for (idx=0; idx<*count; idx++) { // Get an item: try fast way first. if (isFast) { - o = PySequence_Fast_GET_ITEM(source, x); + o = PySequence_Fast_GET_ITEM(source, idx); } else { - o = PySequence_GetItem(source, x); + o = PySequence_GetItem(source, idx); if (o == NULL) { goto error1; } @@ -2133,7 +2161,7 @@ wxPoint* wxPoint_LIST_helper(PyObject* source, int *count) { (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])) { + if (!wxPointFromObjects(o1, o2, &temp[idx])) { goto error2; } } @@ -2142,12 +2170,12 @@ wxPoint* wxPoint_LIST_helper(PyObject* source, int *count) { if (! wxPyConvertSwigPtr(o, (void **)&pt, wxT("wxPoint"))) { goto error2; } - temp[x] = *pt; + temp[idx] = *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])) { + if (!wxPointFromObjects(o1, o2, &temp[idx])) { goto error3; } Py_DECREF(o1); @@ -2174,8 +2202,91 @@ error0: PyErr_SetString(PyExc_TypeError, "Expected a sequence of length-2 sequences or wxPoints."); return NULL; } -// end of patch -//------------------------------ + + + +wxPoint2D* wxPoint2D_LIST_helper(PyObject* source, size_t *count) +{ + size_t idx; + wxPoint2D* temp; + PyObject *o, *o1, *o2; + bool isFast = PyList_Check(source) || PyTuple_Check(source); + + if (!PySequence_Check(source)) { + goto error0; + } + + // The length of the sequence is returned in count. + *count = PySequence_Length(source); + if (*count < 0) { + goto error0; + } + + temp = new wxPoint2D[*count]; + if (!temp) { + PyErr_SetString(PyExc_MemoryError, "Unable to allocate temporary array"); + return NULL; + } + for (idx=0; idx<*count; idx++) { + // Get an item: try fast way first. + if (isFast) { + o = PySequence_Fast_GET_ITEM(source, idx); + } + else { + o = PySequence_GetItem(source, idx); + if (o == NULL) { + goto error1; + } + } + + // 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 (!wxPoint2DFromObjects(o1, o2, &temp[idx])) { + goto error2; + } + } + else if (wxPySwigInstance_Check(o)) { + wxPoint2D* pt; + if (! wxPyConvertSwigPtr(o, (void **)&pt, wxT("wxPoint2D"))) { + goto error2; + } + temp[idx] = *pt; + } + else if (PySequence_Check(o) && PySequence_Length(o) == 2) { + o1 = PySequence_GetItem(o, 0); + o2 = PySequence_GetItem(o, 1); + if (!wxPoint2DFromObjects(o1, o2, &temp[idx])) { + goto error3; + } + Py_DECREF(o1); + Py_DECREF(o2); + } + else { + goto error2; + } + // Clean up. + if (!isFast) + Py_DECREF(o); + } + 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 wxPoint2Ds."); + return NULL; +} + +//--------------------------------------------------------------------------- wxBitmap** wxBitmap_LIST_helper(PyObject* source) { @@ -2315,7 +2426,7 @@ bool wxPy2int_seq_helper(PyObject* source, int* i1, int* i2) { PyObject *o1, *o2; if (!PySequence_Check(source) || PySequence_Length(source) != 2) - return False; + return false; if (isFast) { o1 = PySequence_Fast_GET_ITEM(source, 0); @@ -2333,7 +2444,7 @@ bool wxPy2int_seq_helper(PyObject* source, int* i1, int* i2) { Py_DECREF(o1); Py_DECREF(o2); } - return True; + return true; } @@ -2342,7 +2453,7 @@ bool wxPy4int_seq_helper(PyObject* source, int* i1, int* i2, int* i3, int* i4) { PyObject *o1, *o2, *o3, *o4; if (!PySequence_Check(source) || PySequence_Length(source) != 4) - return False; + return false; if (isFast) { o1 = PySequence_Fast_GET_ITEM(source, 0); @@ -2368,7 +2479,7 @@ bool wxPy4int_seq_helper(PyObject* source, int* i1, int* i2, int* i3, int* i4) { Py_DECREF(o3); Py_DECREF(o4); } - return True; + return true; } @@ -2380,20 +2491,20 @@ bool wxPySimple_typecheck(PyObject* source, const wxChar* classname, int seqLen) if (wxPySwigInstance_Check(source) && wxPyConvertSwigPtr(source, (void **)&ptr, classname)) - return True; + return true; PyErr_Clear(); if (PySequence_Check(source) && PySequence_Length(source) == seqLen) - return True; + return true; - return False; + return false; } bool wxSize_helper(PyObject* source, wxSize** obj) { if (source == Py_None) { **obj = wxSize(-1,-1); - return True; + return true; } return wxPyTwoIntItem_helper(source, obj, wxT("wxSize")); } @@ -2403,7 +2514,7 @@ bool wxPoint_helper(PyObject* source, wxPoint** obj) { if (source == Py_None) { **obj = wxPoint(-1,-1); - return True; + return true; } return wxPyTwoIntItem_helper(source, obj, wxT("wxPoint")); } @@ -2414,7 +2525,7 @@ bool wxRealPoint_helper(PyObject* source, wxRealPoint** obj) { if (source == Py_None) { **obj = wxRealPoint(-1,-1); - return True; + return true; } // If source is an object instance then it may already be the right type @@ -2423,7 +2534,7 @@ bool wxRealPoint_helper(PyObject* source, wxRealPoint** obj) { if (! wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxRealPoint"))) goto error; *obj = ptr; - return True; + return true; } // otherwise a 2-tuple of floats is expected else if (PySequence_Check(source) && PyObject_Length(source) == 2) { @@ -2437,12 +2548,12 @@ bool wxRealPoint_helper(PyObject* source, wxRealPoint** obj) { **obj = wxRealPoint(PyFloat_AsDouble(o1), PyFloat_AsDouble(o2)); Py_DECREF(o1); Py_DECREF(o2); - return True; + return true; } error: PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of floats or a wxRealPoint object."); - return False; + return false; } @@ -2451,7 +2562,7 @@ bool wxRect_helper(PyObject* source, wxRect** obj) { if (source == Py_None) { **obj = wxRect(-1,-1,-1,-1); - return True; + return true; } // If source is an object instance then it may already be the right type @@ -2460,7 +2571,7 @@ bool wxRect_helper(PyObject* source, wxRect** obj) { if (! wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxRect"))) goto error; *obj = ptr; - return True; + return true; } // otherwise a 4-tuple of integers is expected else if (PySequence_Check(source) && PyObject_Length(source) == 4) { @@ -2482,12 +2593,12 @@ bool wxRect_helper(PyObject* source, wxRect** obj) { Py_DECREF(o2); Py_DECREF(o3); Py_DECREF(o4); - return True; + return true; } error: PyErr_SetString(PyExc_TypeError, "Expected a 4-tuple of integers or a wxRect object."); - return False; + return false; } @@ -2496,7 +2607,7 @@ bool wxColour_helper(PyObject* source, wxColour** obj) { if (source == Py_None) { **obj = wxNullColour; - return True; + return true; } // If source is an object instance then it may already be the right type @@ -2505,7 +2616,7 @@ bool wxColour_helper(PyObject* source, wxColour** obj) { if (! wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxColour"))) goto error; *obj = ptr; - return True; + return true; } // otherwise check for a string else if (PyString_Check(source) || PyUnicode_Check(source)) { @@ -2518,14 +2629,14 @@ bool wxColour_helper(PyObject* source, wxColour** obj) { spec.Mid(5,2).ToLong(&blue, 16); **obj = wxColour(red, green, blue); - return True; + return true; } else { // it's a colour name **obj = wxColour(spec); - return True; + return true; } } - // last chance: 3-tuple of integers is expected + // last chance: 3-tuple or 4-tuple of integers is expected else if (PySequence_Check(source) && PyObject_Length(source) == 3) { PyObject* o1 = PySequence_GetItem(source, 0); PyObject* o2 = PySequence_GetItem(source, 1); @@ -2540,25 +2651,44 @@ bool wxColour_helper(PyObject* source, wxColour** obj) { Py_DECREF(o1); Py_DECREF(o2); Py_DECREF(o3); - return True; + return true; + } + else if (PySequence_Check(source) && PyObject_Length(source) == 4) { + PyObject* o1 = PySequence_GetItem(source, 0); + PyObject* o2 = PySequence_GetItem(source, 1); + PyObject* o3 = PySequence_GetItem(source, 2); + PyObject* o4 = PySequence_GetItem(source, 3); + if (!PyNumber_Check(o1) || !PyNumber_Check(o2) || !PyNumber_Check(o3) || !PyNumber_Check(o4)) { + Py_DECREF(o1); + Py_DECREF(o2); + Py_DECREF(o3); + Py_DECREF(o4); + goto error; + } + **obj = wxColour(PyInt_AsLong(o1), PyInt_AsLong(o2), PyInt_AsLong(o3), PyInt_AsLong(o4)); + Py_DECREF(o1); + Py_DECREF(o2); + Py_DECREF(o3); + Py_DECREF(o4); + return true; } error: PyErr_SetString(PyExc_TypeError, - "Expected a wxColour object or a string containing a colour name or '#RRGGBB'."); - return False; + "Expected a wxColour object, a string containing a colour name or '#RRGGBB', or a 3- or 4-tuple of integers."); + return false; } bool wxColour_typecheck(PyObject* source) { if (wxPySimple_typecheck(source, wxT("wxColour"), 3)) - return True; + return true; if (PyString_Check(source) || PyUnicode_Check(source)) - return True; + return true; - return False; + return false; } @@ -2567,7 +2697,7 @@ bool wxPoint2D_helper(PyObject* source, wxPoint2D** obj) { if (source == Py_None) { **obj = wxPoint2D(-1,-1); - return True; + return true; } // If source is an object instance then it may already be the right type @@ -2576,7 +2706,7 @@ bool wxPoint2D_helper(PyObject* source, wxPoint2D** obj) { if (! wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxPoint2D"))) goto error; *obj = ptr; - return True; + return true; } // otherwise a length-2 sequence of floats is expected if (PySequence_Check(source) && PySequence_Length(source) == 2) { @@ -2591,18 +2721,18 @@ bool wxPoint2D_helper(PyObject* source, wxPoint2D** obj) { **obj = wxPoint2D(PyFloat_AsDouble(o1), PyFloat_AsDouble(o2)); Py_DECREF(o1); Py_DECREF(o2); - return True; + return true; } error: PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of floats or a wxPoint2D object."); - return False; + return false; } //---------------------------------------------------------------------- -PyObject* wxArrayString2PyList_helper(const wxArrayString& arr) { - +PyObject* wxArrayString2PyList_helper(const wxArrayString& arr) +{ PyObject* list = PyList_New(0); for (size_t i=0; i < arr.GetCount(); i++) { #if wxUSE_UNICODE @@ -2617,8 +2747,8 @@ PyObject* wxArrayString2PyList_helper(const wxArrayString& arr) { } -PyObject* wxArrayInt2PyList_helper(const wxArrayInt& arr) { - +PyObject* wxArrayInt2PyList_helper(const wxArrayInt& arr) +{ PyObject* list = PyList_New(0); for (size_t i=0; i < arr.GetCount(); i++) { PyObject* number = PyInt_FromLong(arr[i]); @@ -2629,6 +2759,213 @@ PyObject* wxArrayInt2PyList_helper(const wxArrayInt& arr) { } +PyObject* wxArrayDouble2PyList_helper(const wxArrayDouble& arr) +{ + PyObject* list = PyList_New(0); + for (size_t i=0; i < arr.GetCount(); i++) { + PyObject* number = PyFloat_FromDouble(arr[i]); + PyList_Append(list, number); + Py_DECREF(number); + } + return list; +} + + +//---------------------------------------------------------------------- +// wxPyImageHandler methods +// +// TODO: Switch these to use wxPython's standard macros and helper classes +// for calling callbacks. + +PyObject* wxPyImageHandler::m_DoCanRead_Name = NULL; +PyObject* wxPyImageHandler::m_GetImageCount_Name = NULL; +PyObject* wxPyImageHandler::m_LoadFile_Name = NULL; +PyObject* wxPyImageHandler::m_SaveFile_Name = NULL; + +PyObject* wxPyImageHandler::py_InputStream(wxInputStream* stream) { + return wxPyConstructObject(new wxPyInputStream(stream), + wxT("wxPyInputStream"), 0); +} + +PyObject* wxPyImageHandler::py_Image(wxImage* image) { + return wxPyConstructObject(image, wxT("wxImage"), 0); +} + +PyObject* wxPyImageHandler::py_OutputStream(wxOutputStream* stream) { + return wxPyConstructObject(stream, wxT("wxOutputStream"), 0); +} + +wxPyImageHandler::wxPyImageHandler(): + m_self(NULL) +{ + if (!m_DoCanRead_Name) { + m_DoCanRead_Name = PyString_FromString("DoCanRead"); + m_GetImageCount_Name = PyString_FromString("GetImageCount"); + m_LoadFile_Name = PyString_FromString("LoadFile"); + m_SaveFile_Name = PyString_FromString("SaveFile"); + } +} + +wxPyImageHandler::~wxPyImageHandler() { + if (m_self) { + Py_DECREF(m_self); + m_self = NULL; + } +} + +void wxPyImageHandler::_SetSelf(PyObject *self) { + // should check here for isinstance(PyImageHandler) ?? + m_self = self; + Py_INCREF(m_self); +} + +bool wxPyImageHandler::DoCanRead(wxInputStream& stream) { + // check if our object has this method + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + if (!m_self || !PyObject_HasAttr(m_self, m_DoCanRead_Name)) { + wxPyEndBlockThreads(blocked); + return false; + } + + PyObject* res = PyObject_CallMethodObjArgs(m_self, m_DoCanRead_Name, + py_InputStream(&stream), NULL); + bool retval = false; + if (res) { + retval = PyInt_AsLong(res); + Py_DECREF(res); + PyErr_Clear(); + } + else + PyErr_Print(); + wxPyEndBlockThreads(blocked); + return retval; +} + +bool wxPyImageHandler::LoadFile( wxImage* image, wxInputStream& stream, + bool verbose, int index ) { + // check if our object has this method + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + if (!m_self || !PyObject_HasAttr(m_self, m_LoadFile_Name)) { + wxPyEndBlockThreads(blocked); + return false; + } + PyObject* res = PyObject_CallMethodObjArgs(m_self, m_LoadFile_Name, + py_Image(image), + py_InputStream(&stream), + PyInt_FromLong(verbose), + PyInt_FromLong(index), + NULL); + bool retval = false; + if (res) { + retval = PyInt_AsLong(res); + Py_DECREF(res); + PyErr_Clear(); + } else + PyErr_Print(); + wxPyEndBlockThreads(blocked); + return retval; +} + +bool wxPyImageHandler::SaveFile( wxImage* image, wxOutputStream& stream, + bool verbose ) { + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + if (!m_self || !PyObject_HasAttr(m_self, m_SaveFile_Name)) { + wxPyEndBlockThreads(blocked); + return false; + } + PyObject* res = PyObject_CallMethodObjArgs(m_self, m_SaveFile_Name, + py_Image(image), + py_OutputStream(&stream), + PyInt_FromLong(verbose), + NULL); + bool retval = false; + if(res) { + retval=PyInt_AsLong(res); + Py_DECREF(res); + PyErr_Clear(); + } else + PyErr_Print(); + wxPyEndBlockThreads(blocked); + return retval; +} + +int wxPyImageHandler::GetImageCount( wxInputStream& stream ) { + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + if (!m_self || !PyObject_HasAttr(m_self, m_GetImageCount_Name)) { + wxPyEndBlockThreads(blocked); + return 1; + } + PyObject *res=PyObject_CallMethodObjArgs(m_self, m_GetImageCount_Name, + py_InputStream(&stream), + NULL); + int retval = 1; + if(res) { + retval=PyInt_AsLong(res); + Py_DECREF(res); + PyErr_Clear(); + } else + PyErr_Print(); + wxPyEndBlockThreads(blocked); + return retval; +} + + +//---------------------------------------------------------------------- +// Function to test if the Display (or whatever is the platform equivallent) +// can be connected to. This is accessable from wxPython as a staticmethod of +// wx.App called DisplayAvailable(). + + +bool wxPyTestDisplayAvailable() +{ +#ifdef __WXGTK__ + Display* display; + display = XOpenDisplay(NULL); + if (display == NULL) + return false; + XCloseDisplay(display); + return true; +#endif + +#ifdef __WXMAC__ + // This is adapted from Python's Mac/Modules/MacOS.c in the + // MacOS_WMAvailable function. + bool rv; + ProcessSerialNumber psn; + + /* + ** This is a fairly innocuous call to make if we don't have a window + ** manager, or if we have no permission to talk to it. It will print + ** a message on stderr, but at least it won't abort the process. + ** It appears the function caches the result itself, and it's cheap, so + ** no need for us to cache. + */ +#ifdef kCGNullDirectDisplay + /* On 10.1 CGMainDisplayID() isn't available, and + ** kCGNullDirectDisplay isn't defined. + */ + if (CGMainDisplayID() == 0) { + rv = false; + } else +#endif + { + // Also foreground the application on the first call as a side-effect. + if (GetCurrentProcess(&psn) < 0 || SetFrontProcess(&psn) < 0) { + rv = false; + } else { + rv = true; + } + } + return rv; +#endif + +#ifdef __WXMSW__ + // TODO... + return true; +#endif +} + + //---------------------------------------------------------------------- //----------------------------------------------------------------------