Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-22 06:05:36 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Changed (again) how the GIL is aquired and the tstate restored. This

Browse Source 
time it's simpler, better, and handles the case where there is a wx
calback/event while the GIL has been released by a non-wxPython
extension module.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-03-24 23:09:59 +00:00
parent 70a4ef826f
commit da32eb53cb
31 changed files with 494 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wxPython/contrib/gizmos/gizmos.i
+12 -12
View File
@@ -272,7 +272,7 @@ public:
virtual void DrawItem(wxDC& dc, wxTreeItemId id, const wxRect& rect) {
bool found;
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "DrawItem"))) {
PyObject* dcobj = wxPyMake_wxObject(&dc);
PyObject* idobj = wxPyConstructObject((void*)&id, wxT("wxTreeItemId"), False);
@@ -282,7 +282,7 @@ public:
Py_DECREF(idobj);
Py_DECREF(recobj);
}
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
if (! found)
wxTreeCompanionWindow::DrawItem(dc, id, rect);
}
@@ -457,7 +457,7 @@ public:
const wxTreeItemId& item2) {
int rval = 0;
bool found;
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "OnCompareItems"))) {
PyObject *o1 = wxPyConstructObject((void*)&item1, wxT("wxTreeItemId"), 0);
PyObject *o2 = wxPyConstructObject((void*)&item2, wxT("wxTreeItemId"), 0);
@@ -465,7 +465,7 @@ public:
Py_DECREF(o1);
Py_DECREF(o2);
}
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
if (! found)
rval = wxTreeListCtrl::OnCompareItems(item1, item2);
return rval;
@@ -715,7 +715,7 @@ public:
//size_t GetSelections(wxArrayTreeItemIds&) const;
%extend {
PyObject* GetSelections() {
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
PyObject* rval = PyList_New(0);
wxArrayTreeItemIds array;
size_t num, x;
@@ -725,7 +725,7 @@ public:
PyObject* item = wxPyConstructObject((void*)tii, wxT("wxTreeItemId"), True);
PyList_Append(rval, item);
}
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return rval;
}
}
@@ -749,11 +749,11 @@ public:
PyObject* GetFirstChild(const wxTreeItemId& item) {
long cookie = 0;
wxTreeItemId ritem = self->GetFirstChild(item, cookie);
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(2);
PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(&ritem, wxT("wxTreeItemId"), true));
PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(cookie));
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return tup;
}
@@ -764,11 +764,11 @@ public:
// passed to GetNextChild in order to continue the search.
PyObject* GetNextChild(const wxTreeItemId& item, long cookie) {
wxTreeItemId ritem = self->GetNextChild(item, cookie);
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(2);
PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(&ritem, wxT("wxTreeItemId"), true));
PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(cookie));
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return tup;
}
}
@@ -877,10 +877,10 @@ public:
PyObject* GetBoundingRect(const wxTreeItemId& item, bool textOnly = False) {
wxRect rect;
if (self->GetBoundingRect(item, rect, textOnly)) {
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
wxRect* r = new wxRect(rect);
PyObject* val = wxPyConstructObject((void*)r, wxT("wxRect"), 1);
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return val;
}
else {
wxPython/contrib/ogl/_oglshapes2.i
+4 -4
View File
@@ -287,7 +287,7 @@ public:
wxObject* wxObj;
wxNode* node = list->GetFirst();
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
pyList = PyList_New(0);
while (node) {
wxObj = node->GetData();
@@ -295,7 +295,7 @@ public:
PyList_Append(pyList, pyObj);
node = node->GetNext();
}
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return pyList;
}
@@ -306,7 +306,7 @@ public:
wxObject* wxObj;
wxNode* node = list->GetFirst();
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
pyList = PyList_New(0);
while (node) {
wxObj = node->GetData();
@@ -314,7 +314,7 @@ public:
PyList_Append(pyList, pyObj);
node = node->GetNext();
}
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return pyList;
}
}
wxPython/contrib/ogl/ogl.i
+12 -12
View File
@@ -157,17 +157,17 @@ void wxOGLCleanUp();
// work for any class for the VERY generic cases, but beyond that the helper
// needs to know more about the type.
wxList* wxPy_wxListHelper(PyObject* pyList, const wxChar* className) {
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
if (!PyList_Check(pyList)) {
PyErr_SetString(PyExc_TypeError, "Expected a list object.");
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return NULL;
}
int count = PyList_Size(pyList);
wxList* list = new wxList;
if (! list) {
PyErr_SetString(PyExc_MemoryError, "Unable to allocate wxList object");
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return NULL;
}
for (int x=0; x<count; x++) {
@@ -178,29 +178,29 @@ wxList* wxPy_wxListHelper(PyObject* pyList, const wxChar* className) {
wxString errmsg;
errmsg.Printf(wxT("Type error, expected list of %s objects"), className);
PyErr_SetString(PyExc_TypeError, errmsg.mb_str());
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return NULL;
}
list->Append(wxo);
}
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return list;
}
//---------------------------------------------------------------------------
wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList) {
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
if (!PyList_Check(pyList)) {
PyErr_SetString(PyExc_TypeError, "Expected a list object.");
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return NULL;
}
int count = PyList_Size(pyList);
wxList* list = new wxList;
if (! list) {
PyErr_SetString(PyExc_MemoryError, "Unable to allocate wxList object");
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return NULL;
}
for (int x=0; x<count; x++) {
@@ -219,13 +219,13 @@ wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList) {
wxRealPoint* wxo = NULL;
if (wxPyConvertSwigPtr(pyo, (void **)&wxo, wxT("wxRealPoint"))) {
PyErr_SetString(PyExc_TypeError, "Type error, expected list of wxRealPoint objects or 2-tuples");
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return NULL;
}
list->Append((wxObject*) new wxRealPoint(*wxo));
}
}
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return list;
}
@@ -262,7 +262,7 @@ PyObject* wxPy_ConvertShapeList(wxListBase* listbase) {
wxObject* wxObj;
wxNode* node = list->GetFirst();
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
pyList = PyList_New(0);
while (node) {
wxObj = node->GetData();
@@ -270,7 +270,7 @@ PyObject* wxPy_ConvertShapeList(wxListBase* listbase) {
PyList_Append(pyList, pyObj);
node = node->GetNext();
}
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return pyList;
}
wxPython/include/wx/wxPython/pyclasses.h
+2 -2
View File
@@ -45,7 +45,7 @@ public:
wxPyValidator* ptr = NULL;
wxPyValidator* self = (wxPyValidator*)this;
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(self->m_myInst, "Clone")) {
PyObject* ro;
ro = wxPyCBH_callCallbackObj(self->m_myInst, Py_BuildValue("()"));
@@ -54,7 +54,7 @@ public:
Py_DECREF(ro);
}
}
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
// This is very dangerous!!! But is the only way I could find
// to squash a memory leak. Currently it is okay, but if the
wxPython/include/wx/wxPython/pytree.h
+4 -4
View File
@@ -25,9 +25,9 @@ public:
}
~wxPyTreeItemData() {
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
Py_DECREF(m_obj);
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
}
PyObject* GetData() {
@@ -36,9 +36,9 @@ public:
}
void SetData(PyObject* obj) {
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
Py_DECREF(m_obj);
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
m_obj = obj;
Py_INCREF(obj);
}
wxPython/include/wx/wxPython/wxPython.h
+1 -1
View File
@@ -63,7 +63,7 @@ static void wxPyCoreAPI_IMPORT() {
#define wxPyBeginAllowThreads() (wxPyCoreAPIPtr->p_wxPyBeginAllowThreads())
#define wxPyEndAllowThreads(a) (wxPyCoreAPIPtr->p_wxPyEndAllowThreads(a))
#define wxPyBeginBlockThreads() (wxPyCoreAPIPtr->p_wxPyBeginBlockThreads())
#define wxPyEndBlockThreads() (wxPyCoreAPIPtr->p_wxPyEndBlockThreads())
#define wxPyEndBlockThreads(a) (wxPyCoreAPIPtr->p_wxPyEndBlockThreads(a))
#define wxPyConstructObject(a,b,c) (wxPyCoreAPIPtr->p_wxPyConstructObject(a,b,c))
#define wxPy_ConvertList(a) (wxPyCoreAPIPtr->p_wxPy_ConvertList(a))
wxPython/include/wx/wxPython/wxPython_int.h
+155 -155
View File
File diff suppressed because it is too large Load Diff
wxPython/samples/embedded/embedded.cpp
+8 -10
View File
@@ -41,8 +41,6 @@ public:
virtual bool OnInit();
virtual ~MyApp();
void Init_wxPython();
private:
PyThreadState* m_mainTState;
};
@@ -91,14 +89,14 @@ void MyApp::Init_wxPython()
// Save the current Python thread state and release the
// Global Interpreter Lock.
m_mainTState = wxPyBeginAllowThreads();
wxPyBeginAllowThreads();
}
MyApp::~MyApp()
{
// Restore the thread state and tell Python to cleanup after itself.
wxPyEndAllowThreads(m_mainTState);
wxPyEndAllowThreads(true);
Py_Finalize();
}
@@ -176,13 +174,13 @@ void MyFrame::OnPyFrame(wxCommandEvent& event)
// First, whenever you do anyting with Python objects or code, you
// *MUST* aquire the Global Interpreter Lock and block other
// Python threads from running.
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
// Execute the code in the __main__ module
PyRun_SimpleString(python_code1);
// Finally, release the GIL and let other Python threads run.
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
}
@@ -197,9 +195,9 @@ from wxPython.wx import wxPyOnDemandOutputWindow\n\
output = wxPyOnDemandOutputWindow()\n\
sys.stdin = sys.stderr = output\n\
";
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
PyRun_SimpleString(python_redirect);
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
}
@@ -226,7 +224,7 @@ wxWindow* MyFrame::DoPythonStuff(wxWindow* parent)
PyObject* result;
// As always, first grab the GIL
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
// Now make a dictionary to serve as the global namespace when the code is
// executed. Put a reference to the builtins module in it. (Yes, the
@@ -277,7 +275,7 @@ wxWindow* MyFrame::DoPythonStuff(wxWindow* parent)
Py_DECREF(tuple);
// Finally, after all Python stuff is done, release the GIL
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return window;
}
wxPython/src/_artprov.i
+2 -2
View File
@@ -75,7 +75,7 @@ public:
const wxArtClient& client,
const wxSize& size) {
wxBitmap rval = wxNullBitmap;
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
if ((wxPyCBH_findCallback(m_myInst, "CreateBitmap"))) {
PyObject* so = wxPyConstructObject((void*)&size, wxT("wxSize"), 0);
PyObject* ro;
@@ -93,7 +93,7 @@ public:
Py_DECREF(ro);
}
}
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return rval;
}
wxPython/src/_dataobj.i
+8 -8
View File
@@ -238,7 +238,7 @@ bool wxPyDataObjectSimple::GetDataHere(void *buf) const {
// C++ version.
bool rval = False;
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "GetDataHere")) {
PyObject* ro;
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));
@@ -249,7 +249,7 @@ bool wxPyDataObjectSimple::GetDataHere(void *buf) const {
Py_DECREF(ro);
}
}
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return rval;
}
@@ -257,13 +257,13 @@ bool wxPyDataObjectSimple::SetData(size_t len, const void *buf) const{
// For this one we simply need to make a string from buf and len
// and send it to the Python method.
bool rval = False;
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "SetData")) {
PyObject* data = PyString_FromStringAndSize((char*)buf, len);
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", data));
Py_DECREF(data);
}
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return rval;
}
%}
@@ -364,7 +364,7 @@ public:
wxBitmap wxPyBitmapDataObject::GetBitmap() const {
wxBitmap* rval = &wxNullBitmap;
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "GetBitmap")) {
PyObject* ro;
wxBitmap* ptr;
@@ -375,18 +375,18 @@ wxBitmap wxPyBitmapDataObject::GetBitmap() const {
Py_DECREF(ro);
}
}
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return *rval;
}
void wxPyBitmapDataObject::SetBitmap(const wxBitmap& bitmap) {
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "SetBitmap")) {
PyObject* bo = wxPyConstructObject((void*)&bitmap, wxT("wxBitmap"), False);
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", bo));
Py_DECREF(bo);
}
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
}
%}
wxPython/src/_display.i
+2 -2
View File
@@ -163,14 +163,14 @@ platform.");
PyObject* GetModes(const wxVideoMode& mode = wxDefaultVideoMode) {
PyObject* pyList = NULL;
wxArrayVideoModes arr = self->GetModes(mode);
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
pyList = PyList_New(0);
for (int i=0; i < arr.GetCount(); i++) {
wxVideoMode* m = new wxVideoMode(arr.Item(i));
PyObject* pyObj = wxPyConstructObject(m, wxT("wxVideoMode"), true);
PyList_Append(pyList, pyObj);
}
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return pyList;
}
}
wxPython/src/_dnd.i
+2 -2
View File
@@ -217,13 +217,13 @@ public:
bool wxPyFileDropTarget::OnDropFiles(wxCoord x, wxCoord y,
const wxArrayString& filenames) {
bool rval = False;
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "OnDropFiles")) {
PyObject* list = wxArrayString2PyList_helper(filenames);
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",x,y,list));
Py_DECREF(list);
}
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return rval;
}
wxPython/src/_gbsizer.i
+6 -6
View File
@@ -88,11 +88,11 @@ public:
}
PyObject* Get() {
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(2);
PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRow()));
PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->GetCol()));
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return tup;
}
}
@@ -145,11 +145,11 @@ public:
}
PyObject* Get() {
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(2);
PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRowspan()));
PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->GetColspan()));
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return tup;
}
}
@@ -268,11 +268,11 @@ public:
PyObject* userData = NULL ) {
wxPyUserData* data = NULL;
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, True, False);
if ( userData && (info.window || info.sizer || info.gotSize) )
data = new wxPyUserData(userData);
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
// Now call the real Add method if a valid item type was found
if ( info.window )
wxPython/src/_gdicmn.i
+12 -12
View File
@@ -178,11 +178,11 @@ public:
"Get() -> (width,height)",
"Returns the width and height properties as a tuple.");
PyObject* Get() {
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(2);
PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x));
PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return tup;
}
}
@@ -251,11 +251,11 @@ public:
"Get() -> (x,y)",
"Return the x and y properties as a tuple. ");
PyObject* Get() {
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(2);
PyTuple_SET_ITEM(tup, 0, PyFloat_FromDouble(self->x));
PyTuple_SET_ITEM(tup, 1, PyFloat_FromDouble(self->y));
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return tup;
}
}
@@ -364,11 +364,11 @@ public:
"Get() -> (x,y)",
"Return the x and y properties as a tuple. ");
PyObject* Get() {
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(2);
PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x));
PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return tup;
}
}
@@ -532,13 +532,13 @@ public:
"Get() -> (x,y,width,height)",
"Return the rectangle properties as a tuple.");
PyObject* Get() {
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(4);
PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x));
PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));
PyTuple_SET_ITEM(tup, 2, PyInt_FromLong(self->width));
PyTuple_SET_ITEM(tup, 3, PyInt_FromLong(self->height));
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return tup;
}
}
@@ -576,10 +576,10 @@ DocAStr(wxIntersectRect,
dest = reg1.GetBox();
if (dest != wxRect(0,0,0,0)) {
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
wxRect* newRect = new wxRect(dest);
obj = wxPyConstructObject((void*)newRect, wxT("wxRect"), True);
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return obj;
}
Py_INCREF(Py_None);
@@ -663,11 +663,11 @@ public:
"Get() -> (x,y)",
"Return x and y properties as a tuple.");
PyObject* Get() {
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(2);
PyTuple_SET_ITEM(tup, 0, PyFloat_FromDouble(self->m_x));
PyTuple_SET_ITEM(tup, 1, PyFloat_FromDouble(self->m_y));
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return tup;
}
}
wxPython/src/_image.i
+4 -4
View File
@@ -204,7 +204,7 @@ public:
unsigned char* buffer;
int size;
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
if (!PyArg_Parse(data, "t#", &buffer, &size))
goto done;
@@ -214,7 +214,7 @@ public:
}
self->SetData(buffer);
done:
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
}
@@ -258,7 +258,7 @@ public:
unsigned char* buffer;
int size;
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
if (!PyArg_Parse(data, "t#", &buffer, &size))
goto done;
@@ -268,7 +268,7 @@ public:
}
self->SetAlpha(buffer);
done:
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
}
}
wxPython/src/_joystick.i
+2 -2
View File
@@ -48,10 +48,10 @@ enum
class wxJoystick : public wxObject {
public:
wxJoystick(int joystick = wxJOYSTICK1) {
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
PyErr_SetString(PyExc_NotImplementedError,
"wxJoystick is not available on this platform.");
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
}
wxPoint GetPosition() { return wxPoint(-1,-1); }
int GetZPosition() { return -1; }
wxPython/src/_listctrl.i
+2 -2
View File
@@ -341,7 +341,7 @@ EVT_LIST_ITEM_FOCUSED = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED
static int wxCALLBACK wxPyListCtrl_SortItems(long item1, long item2, long funcPtr) {
int retval = 0;
PyObject* func = (PyObject*)funcPtr;
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
PyObject* args = Py_BuildValue("(ii)", item1, item2);
PyObject* result = PyEval_CallObject(func, args);
@@ -351,7 +351,7 @@ EVT_LIST_ITEM_FOCUSED = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED
Py_DECREF(result);
}
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return retval;
}
%}
wxPython/src/_log.i
+4 -4
View File
@@ -250,26 +250,26 @@ public:
virtual void DoLog(wxLogLevel level, const wxChar *szString, time_t t) {
bool found;
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "DoLog"))) {
PyObject* s = wx2PyString(szString);
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iOi)", level, s, t));
Py_DECREF(s);
}
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
if (! found)
wxLog::DoLog(level, szString, t);
}
virtual void DoLogString(const wxChar *szString, time_t t) {
bool found;
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "DoLogString"))) {
PyObject* s = wx2PyString(szString);
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", s, t));
Py_DECREF(s);
}
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
if (! found)
wxLog::DoLogString(szString, t);
}
wxPython/src/_mimetype.i
+4 -4
View File
@@ -190,13 +190,13 @@ public:
iconIndex = loc.GetIndex();
#endif
// Make a tuple and put the values in it
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
PyObject* tuple = PyTuple_New(3);
PyTuple_SetItem(tuple, 0, wxPyConstructObject(new wxIcon(loc),
wxT("wxIcon"), True));
PyTuple_SetItem(tuple, 1, wx2PyString(iconFile));
PyTuple_SetItem(tuple, 2, PyInt_FromLong(iconIndex));
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return tuple;
}
else
@@ -250,11 +250,11 @@ public:
wxArrayString commands;
if (self->GetAllCommands(&verbs, &commands,
wxFileType::MessageParameters(filename, mimetype))) {
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
PyObject* tuple = PyTuple_New(2);
PyTuple_SetItem(tuple, 0, wxArrayString2PyList_helper(verbs));
PyTuple_SetItem(tuple, 1, wxArrayString2PyList_helper(commands));
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return tuple;
}
else
wxPython/src/_pen.i
+2 -2
View File
@@ -54,11 +54,11 @@ public:
PyObject* GetDashes() {
wxDash* dashes;
int count = self->GetDashes(&dashes);
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
PyObject* retval = PyList_New(0);
for (int x=0; x<count; x++)
PyList_Append(retval, PyInt_FromLong(dashes[x]));
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return retval;
}
}
wxPython/src/_printfw.i
+4 -4
View File
@@ -270,7 +270,7 @@ void wxPyPrintout::GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *p
bool hadErr = False;
bool found;
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "GetPageInfo"))) {
PyObject* result = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));
if (result && PyTuple_Check(result) && PyTuple_Size(result) == 4) {
@@ -301,7 +301,7 @@ void wxPyPrintout::GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *p
}
Py_DECREF(result);
}
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
if (! found)
wxPrintout::GetPageInfo(minPage, maxPage, pageFrom, pageTo);
}
@@ -527,7 +527,7 @@ public:
bool CLASS::CBNAME(wxPreviewCanvas* a, wxDC& b) { \
bool rval=False; \
bool found; \
wxPyBeginBlockThreads(); \
bool blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* win = wxPyMake_wxObject(a); \
PyObject* dc = wxPyMake_wxObject(&b); \
@@ -535,7 +535,7 @@ public:
Py_DECREF(win); \
Py_DECREF(dc); \
} \
wxPyEndBlockThreads(); \
wxPyEndBlockThreads(blocked); \
if (! found) \
rval = PCLASS::CBNAME(a, b); \
return rval; \
wxPython/src/_sizers.i
+10 -10
View File
@@ -176,11 +176,11 @@ public:
PyObject* userData=NULL) {
wxPyUserData* data = NULL;
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, True, False);
if ( userData && (info.window || info.sizer || info.gotSize) )
data = new wxPyUserData(userData);
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
// Now call the real Add method if a valid item type was found
if ( info.window )
@@ -197,11 +197,11 @@ public:
int border=0, PyObject* userData=NULL) {
wxPyUserData* data = NULL;
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, True, False);
if ( userData && (info.window || info.sizer || info.gotSize) )
data = new wxPyUserData(userData);
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
// Now call the real Insert method if a valid item type was found
if ( info.window )
@@ -219,11 +219,11 @@ public:
PyObject* userData=NULL) {
wxPyUserData* data = NULL;
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, True, False);
if ( userData && (info.window || info.sizer || info.gotSize) )
data = new wxPyUserData(userData);
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
// Now call the real Prepend method if a valid item type was found
if ( info.window )
@@ -237,9 +237,9 @@ public:
bool Remove(PyObject* item) {
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, False, True);
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
if ( info.window )
return self->Remove(info.window);
else if ( info.sizer )
@@ -252,9 +252,9 @@ public:
void _SetItemMinSize(PyObject* item, const wxSize& size) {
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, False, True);
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
if ( info.window )
self->SetItemMinSize(info.window, size);
else if ( info.sizer )
wxPython/src/_sound.i
+8 -8
View File
@@ -38,22 +38,22 @@ class wxSound : public wxObject
{
public:
wxSound() {
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
PyErr_SetString(PyExc_NotImplementedError,
"wxSound is not available on this platform.");
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
}
wxSound(const wxString&, bool) {
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
PyErr_SetString(PyExc_NotImplementedError,
"wxSound is not available on this platform.");
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
}
wxSound(int, const wxByte*) {
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
PyErr_SetString(PyExc_NotImplementedError,
"wxSound is not available on this platform.");
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
}
~wxSound() {};
@@ -92,10 +92,10 @@ public:
#else
%extend {
bool Create(int size, const wxByte* data) {
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
PyErr_SetString(PyExc_NotImplementedError,
"Create from data is not available on this platform.");
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return False;
}
}
wxPython/src/_timer.i
+2 -2
View File
@@ -36,10 +36,10 @@ enum {
void wxPyTimer::Notify() {
bool found;
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "Notify")))
wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
if (! found)
wxTimer::Notify();
}
wxPython/src/_treectrl.i
+10 -10
View File
@@ -286,7 +286,7 @@ public:
const wxTreeItemId& item2) {
int rval = 0;
bool found;
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "OnCompareItems"))) {
PyObject *o1 = wxPyConstructObject((void*)&item1, wxT("wxTreeItemId"), False);
PyObject *o2 = wxPyConstructObject((void*)&item2, wxT("wxTreeItemId"), False);
@@ -294,7 +294,7 @@ public:
Py_DECREF(o1);
Py_DECREF(o2);
}
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
if (! found)
rval = wxTreeCtrl::OnCompareItems(item1, item2);
return rval;
@@ -501,7 +501,7 @@ public:
// NB: this operation is expensive and can take a long time for a
// control with a lot of items (~ O(number of items)).
PyObject* GetSelections() {
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
PyObject* rval = PyList_New(0);
wxArrayTreeItemIds array;
size_t num, x;
@@ -511,7 +511,7 @@ public:
PyObject* item = wxPyConstructObject((void*)tii, wxT("wxTreeItemId"), True);
PyList_Append(rval, item);
}
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return rval;
}
}
@@ -528,11 +528,11 @@ public:
PyObject* GetFirstChild(const wxTreeItemId& item) {
void* cookie = 0;
wxTreeItemId* ritem = new wxTreeItemId(self->GetFirstChild(item, cookie));
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(2);
PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), True));
PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void")));
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return tup;
}
@@ -543,11 +543,11 @@ public:
// passed to GetNextChild in order to continue the search.
PyObject* GetNextChild(const wxTreeItemId& item, void* cookie) {
wxTreeItemId* ritem = new wxTreeItemId(self->GetNextChild(item, cookie));
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(2);
PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), True));
PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void")));
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return tup;
}
}
@@ -696,10 +696,10 @@ public:
PyObject* GetBoundingRect(const wxTreeItemId& item, bool textOnly = False) {
wxRect rect;
if (self->GetBoundingRect(item, rect, textOnly)) {
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
wxRect* r = new wxRect(rect);
PyObject* val = wxPyConstructObject((void*)r, wxT("wxRect"), True);
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return val;
}
else
wxPython/src/calendar.i
+2 -2
View File
@@ -352,12 +352,12 @@ validity of the remaining two values. The result codes are:
wxDateTime* date = new wxDateTime;
wxDateTime::WeekDay wd;
wxCalendarHitTestResult result = self->HitTest(pos, date, &wd);
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(3);
PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(result));
PyTuple_SET_ITEM(tup, 1, wxPyConstructObject(date, wxT("wxDateTime"), 1));
PyTuple_SET_ITEM(tup, 2, PyInt_FromLong(wd));
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return tup;
}
}
wxPython/src/drawlist.cpp
+4 -4
View File
@@ -30,7 +30,7 @@ void wxPyDrawList_SetAPIPtr()
PyObject* wxPyDrawXXXList(wxDC& dc, wxPyDrawListOp_t doDraw,
PyObject* pyCoords, PyObject* pyPens, PyObject* pyBrushes)
{
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
bool isFastSeq = PyList_Check(pyCoords) || PyTuple_Check(pyCoords);
bool isFastPens = PyList_Check(pyPens) || PyTuple_Check(pyPens);
@@ -138,7 +138,7 @@ PyObject* wxPyDrawXXXList(wxDC& dc, wxPyDrawListOp_t doDraw,
exit:
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return retval;
}
@@ -214,7 +214,7 @@ bool wxPyDrawXXXPolygon(wxDC& dc, PyObject* coords)
PyObject* wxPyDrawTextList(wxDC& dc, PyObject* textList, PyObject* pyPoints, PyObject* foregroundList, PyObject* backgroundList)
{
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
bool isFastSeq = PyList_Check(pyPoints) || PyTuple_Check(pyPoints);
bool isFastText = PyList_Check(textList) || PyTuple_Check(textList);
@@ -353,7 +353,7 @@ PyObject* wxPyDrawTextList(wxDC& dc, PyObject* textList, PyObject* pyPoints, PyO
goto exit;
exit:
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return retval;
}
wxPython/src/grid.i
+74 -74
View File
File diff suppressed because it is too large Load Diff
wxPython/src/helpers.cpp
+116 -81
View File
File diff suppressed because it is too large Load Diff
wxPython/src/html.i
+13 -13
View File
@@ -312,21 +312,21 @@ public:
}
void OnExit() {
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
Py_DECREF(m_tagHandlerClass);
m_tagHandlerClass = NULL;
for (size_t x=0; x < m_objArray.GetCount(); x++) {
PyObject* obj = (PyObject*)m_objArray.Item(x);
Py_DECREF(obj);
}
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
};
void FillHandlersTable(wxHtmlWinParser *parser) {
// Wave our magic wand... (if it works it's a miracle! ;-)
// First, make a new instance of the tag handler
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
PyObject* arg = PyTuple_New(0);
PyObject* obj = PyObject_CallObject(m_tagHandlerClass, arg);
Py_DECREF(arg);
@@ -334,10 +334,10 @@ public:
// now figure out where it's C++ object is...
wxPyHtmlWinTagHandler* thPtr;
if (! wxPyConvertSwigPtr(obj, (void **)&thPtr, wxT("wxPyHtmlWinTagHandler"))) {
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return;
}
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
// add it,
parser->AddTagHandler(thPtr);
@@ -625,13 +625,13 @@ public:
virtual bool CanRead(const wxFSFile& file) const {
bool rval = False;
bool found;
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "CanRead"))) {
PyObject* obj = wxPyMake_wxObject((wxFSFile*)&file); // cast away const
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj));
Py_DECREF(obj);
}
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return rval;
}
@@ -641,7 +641,7 @@ public:
virtual wxString ReadFile(const wxFSFile& file) const {
wxString rval;
bool found;
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "ReadFile"))) {
PyObject* obj = wxPyMake_wxObject((wxFSFile*)&file); // cast away const
PyObject* ro;
@@ -652,7 +652,7 @@ public:
Py_DECREF(ro);
}
}
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
return rval;
}
@@ -724,13 +724,13 @@ IMP_PYCALLBACK__CELLINTINTME(wxPyHtmlWindow, wxHtmlWindow, OnCellClicked);
void wxPyHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) {
bool found;
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "OnLinkClicked"))) {
PyObject* obj = wxPyConstructObject((void*)&link, wxT("wxHtmlLinkInfo"), 0);
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj));
Py_DECREF(obj);
}
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
if (! found)
wxHtmlWindow::OnLinkClicked(link);
}
@@ -744,7 +744,7 @@ wxHtmlOpeningStatus wxPyHtmlWindow::OnOpeningURL(wxHtmlURLType type,
wxString *redirect) const {
bool found;
wxHtmlOpeningStatus rval;
wxPyBeginBlockThreads();
bool blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "OnOpeningURL"))) {
PyObject* ro;
PyObject* s = wx2PyString(url);
@@ -765,7 +765,7 @@ wxHtmlOpeningStatus wxPyHtmlWindow::OnOpeningURL(wxHtmlURLType type,
}
Py_DECREF(ro);
}
wxPyEndBlockThreads();
wxPyEndBlockThreads(blocked);
if (! found)
rval = wxHtmlWindow::OnOpeningURL(type, url, redirect);
return rval;
wxPython/src/my_typemaps.i
+3 -1
View File
@@ -268,7 +268,9 @@
//---------------------------------------------------------------------------
%typemap(out) bool "$result = PyBool_FromLong((bool)$1);"
%typemap(out) bool {
$result = $1 ? Py_True : Py_False; Py_INCREF($result);
}
//---------------------------------------------------------------------------