X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da32eb53cbe7947f3f4599d7b6b5caa21a68d27f..ef8b9c3eb8259b8e5673b46f526b0da3b363927e:/wxPython/src/helpers.cpp diff --git a/wxPython/src/helpers.cpp b/wxPython/src/helpers.cpp index 81c954bc70..5629feac3e 100644 --- a/wxPython/src/helpers.cpp +++ b/wxPython/src/helpers.cpp @@ -23,9 +23,17 @@ #endif #ifdef __WXGTK__ +#include +#include #include #include #include +#define GetXWindow(wxwin) GDK_WINDOW_XWINDOW((wxwin)->m_widget->window) +#endif + +#ifdef __WXX11__ +#include "wx/x11/privx.h" +#define GetXWindow(wxwin) ((Window)(wxwin)->GetHandle()) #endif #ifdef __WXMAC__ @@ -723,6 +731,16 @@ void wxPy_ReinitStockObjects(int pass) else if (pass == 2) { rsoPass2(#name); } \ else if (pass == 3) { rsoPass3(#name, #classname, (void*)&name); } + // 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; + REINITOBJ(wxNORMAL_FONT, wxFont); REINITOBJ(wxSMALL_FONT, wxFont); @@ -1059,15 +1077,14 @@ bool wxPyBeginBlockThreads() { // This works in for 2.3, maybe a good alternative to find the needed tstate? // PyThreadState *check = PyGILState_GetThisThreadState(); - // get the currect tstate by swapping in NULL and then putting it back. - PyThreadState *current = PyThreadState_Swap(NULL); - PyThreadState_Swap(current); + PyThreadState *current = _PyThreadState_Current; - // Only block if there wasn't alrady a tstate. This cen happen with - // nested calls to wxPyBeginBlockThreads + // 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; - if (current == NULL) { - wxPyThreadState* tstate = wxPyGetThreadState(); + wxPyThreadState* tstate = wxPyGetThreadState(); + if (current != tstate->tstate) { PyEval_RestoreThread(tstate->tstate); blocked = true; } @@ -1796,20 +1813,10 @@ long wxPyGetWinHandle(wxWindow* win) { 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; - } +#if defined(__WXGTK__) || defined(__WXX11) + return (long)GetXWindow(win); #endif - } -#endif - + #ifdef __WXMAC__ return (long)MAC_WXHWND(win->MacGetRootWindow()); #endif @@ -1821,34 +1828,28 @@ 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; } + target = new wxString(); + size_t len = PyUnicode_GET_SIZE(uni); + if (len) { + PyUnicode_AsWideChar((PyUnicodeObject*)uni, target->GetWriteBuf(len), len); + target->UngetWriteBuf(); + } + + if (PyString_Check(source)) + Py_DECREF(uni); #else char* tmpPtr; int tmpSize; if (PyString_AsStringAndSize(source, &tmpPtr, &tmpSize) == -1) { @@ -1857,14 +1858,7 @@ wxString* wxString_in_helper(PyObject* source) { } target = new wxString(tmpPtr, tmpSize); #endif // wxUSE_UNICODE - -#else // No Python unicode API (1.5.2) - if (!PyString_Check(source)) { - PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); - return NULL; - } - target = new wxString(PyString_AS_STRING(source), PyString_GET_SIZE(source)); -#endif + return target; } @@ -1873,45 +1867,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; }