#include <wx/gtk/win_gtk.h>
#endif
+#ifdef __WXMAC__
+#include <wx/mac/private.h>
+#endif
+
#include <wx/clipbrd.h>
#include <wx/mimetype.h>
#include <wx/image.h>
bool wxPyApp::OnInitGui() {
bool rval=True;
wxApp::OnInitGui(); // in this case always call the base class version
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "OnInitGui"))
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
return rval;
}
int wxPyApp::OnExit() {
int rval=0;
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "OnExit"))
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
wxApp::OnExit(); // in this case always call the base class version
return rval;
}
}
wxLogDebug(buf);
return;
- }
-
+ }
+
// If the OnAssert is overloaded in the Python class then call it...
bool found;
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "OnAssert"))) {
PyObject* fso = wx2PyString(file);
PyObject* cso = wx2PyString(file);
Py_DECREF(cso);
Py_DECREF(mso);
}
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
// ...otherwise do our own thing with it
if (! found) {
}
// set the exception
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
PyObject* s = wx2PyString(buf);
PyErr_SetObject(wxPyAssertionError, s);
Py_DECREF(s);
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
// Now when control returns to whatever API wrapper was called from
// Python it should detect that an exception is set and will return
}
#endif
+ // For catching Apple Events
+void wxPyApp::MacOpenFile(const wxString &fileName)
+{
+ bool blocked = wxPyBeginBlockThreads();
+ if (wxPyCBH_findCallback(m_myInst, "MacOpenFile")) {
+ PyObject* s = wx2PyString(fileName);
+ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s));
+ Py_DECREF(s);
+ }
+ wxPyEndBlockThreads(blocked);
+}
+
+void wxPyApp::MacPrintFile(const wxString &fileName)
+{
+ bool blocked = wxPyBeginBlockThreads();
+ if (wxPyCBH_findCallback(m_myInst, "MacPrintFile")) {
+ PyObject* s = wx2PyString(fileName);
+ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s));
+ Py_DECREF(s);
+ }
+ wxPyEndBlockThreads(blocked);
+}
+
+void wxPyApp::MacNewFile()
+{
+ bool blocked = wxPyBeginBlockThreads();
+ if (wxPyCBH_findCallback(m_myInst, "MacNewFile"))
+ wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));
+ wxPyEndBlockThreads(blocked);
+}
+
+void wxPyApp::MacReopenApp()
+{
+ bool blocked = wxPyBeginBlockThreads();
+ if (wxPyCBH_findCallback(m_myInst, "MacReopenApp"))
+ wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));
+ wxPyEndBlockThreads(blocked);
+}
/*static*/
bool result;
PyObject* retval = NULL;
PyObject* pyint = NULL;
-
-
+
+
// Get any command-line args passed to this program from the sys module
int argc = 0;
char** argv = NULL;
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
PyObject* sysargv = PySys_GetObject("argv");
if (sysargv != NULL) {
argc = PyList_Size(sysargv);
}
argv[argc] = NULL;
}
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
result = wxEntryStart(argc, argv);
delete [] argv;
-
- wxPyBeginBlockThreads();
+
+ blocked = wxPyBeginBlockThreads();
if (! result) {
PyErr_SetString(PyExc_SystemError, "wxEntryStart failed!");
goto error;
// It's now ok to generate exceptions for assertion errors.
wxPythonApp->SetStartupComplete(True);
-
+
// Call the Python wxApp's OnInit function
- if (wxPyCBH_findCallback(m_myInst, "OnInit")) {
+ if (wxPyCBH_findCallback(m_myInst, "OnInit")) {
PyObject* method = m_myInst.GetLastFound();
PyObject* argTuple = PyTuple_New(0);
Py_DECREF(method);
if (retval == NULL)
goto error;
-
- pyint = PyNumber_Int(retval);
+
+ pyint = PyNumber_Int(retval);
if (! pyint) {
PyErr_SetString(PyExc_TypeError, "OnInit should return a boolean value");
goto error;
// Is it okay if there is no OnInit? Probably so...
result = True;
}
-
-
+
+
if (! result) {
PyErr_SetString(PyExc_SystemExit, "OnInit returned False, exiting...");
}
error:
Py_XDECREF(retval);
Py_XDECREF(pyint);
-
- wxPyEndBlockThreads();
+
+ wxPyEndBlockThreads(blocked);
};
//---------------------------------------------------------------------
#ifdef __WXMOTIF__
#define wxPlatform "__WXMOTIF__"
+#define wxPlatName "wxMotif"
#endif
#ifdef __WXX11__
#define wxPlatform "__WXX11__"
+#define wxPlatName "wxX11"
#endif
#ifdef __WXGTK__
#define wxPlatform "__WXGTK__"
+#define wxPlatName "wxGTK"
#endif
-#if defined(__WIN32__) || defined(__WXMSW__)
+#ifdef __WXMSW__
#define wxPlatform "__WXMSW__"
+#define wxPlatName "wxMSW"
#endif
#ifdef __WXMAC__
#define wxPlatform "__WXMAC__"
+#define wxPlatName "wxMac"
#endif
#ifdef __WXDEBUG__
int wxdebug = 0;
#endif
+ // These should be deprecated in favor of the PlatformInfo tuple built below...
PyDict_SetItemString(wxPython_dict, "Platform", PyString_FromString(wxPlatform));
PyDict_SetItemString(wxPython_dict, "USE_UNICODE", PyInt_FromLong(wxUSE_UNICODE));
PyDict_SetItemString(wxPython_dict, "__WXDEBUG__", PyInt_FromLong(wxdebug));
+
+ PyObject* PlatInfo = PyList_New(0);
+ PyObject* obj;
+
+#define _AddInfoString(st) \
+ obj = PyString_FromString(st); \
+ PyList_Append(PlatInfo, obj); \
+ Py_DECREF(obj)
+
+ _AddInfoString(wxPlatform);
+ _AddInfoString(wxPlatName);
+#if wxUSE_UNICODE
+ _AddInfoString("unicode");
+#else
+ _AddInfoString("ascii");
+#endif
+#ifdef __WXGTK__
+#ifdef __WXGTK20__
+ _AddInfoString("gtk2");
+#else
+ _AddInfoString("gtk1");
+#endif
+#endif
+
+#undef _AddInfoString
+
+ PyObject* PlatInfoTuple = PyList_AsTuple(PlatInfo);
+ Py_DECREF(PlatInfo);
+ PyDict_SetItemString(wxPython_dict, "PlatformInfo", PlatInfoTuple);
+
RETURN_NONE();
}
PyObject* __wxPyFixStockObjects(PyObject* /* self */, PyObject* args)
{
- wxPy_ReinitStockObjects(2);
+ wxPy_ReinitStockObjects(2);
RETURN_NONE();
}
{
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, dropwx(name));
+ 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* ptrobj;
// Find the object instance
- obj = PyDict_GetItemString(wxPython_dict, dropwx(name));
- wxCHECK_RET(obj != NULL, wxT("Unable to find stock object"));
+ 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, dropwx(classname));
- wxCHECK_RET(classobj != NULL, wxT("Unable to find stock class object"));
+ 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);
+ PyObject_SetAttrString(obj, "this", ptrobj);
Py_DECREF(ptrobj);
}
void wxPy_ReinitStockObjects(int pass)
{
- PyObject* obj;
- PyObject* ptrobj;
#define REINITOBJ(name, classname) \
if (pass == 1) { name = (classname*)0xC0C0C0C0; } \
void wxPyClientData_dtor(wxPyClientData* self) {
if (! wxPyDoingCleanup) { // Don't do it during cleanup as Python
// may have already garbage collected the object...
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
Py_DECREF(self->m_obj);
self->m_obj = NULL;
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
}
}
void wxPyUserData_dtor(wxPyUserData* self) {
if (! wxPyDoingCleanup) {
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
Py_DECREF(self->m_obj);
self->m_obj = NULL;
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
}
}
static PyObject* deadObjectClass = NULL;
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
if (deadObjectClass == NULL) {
deadObjectClass = PyDict_GetItemString(wxPython_dict, "_wxPyDeadObject");
// TODO: Can not wxASSERT here because inside a wxPyBeginBlock Threads,
if (PyErr_Occurred())
PyErr_Clear(); // just ignore it for now
-
+
PyObject* dict = PyObject_GetAttrString(self->m_obj, "__dict__");
if (dict) {
- // Clear the instance's dictionary
+ // Clear the instance's dictionary
PyDict_Clear(dict);
// put the name of the old class into the instance, and then reset the
}
// m_obj is DECREF'd in the base class dtor...
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
}
return wxThread::GetCurrentId();
}
-static PyThreadState* gs_shutdownTState;
+static wxPyThreadState gs_shutdownTState;
static
-PyThreadState* wxPyGetThreadState() {
+wxPyThreadState* wxPyGetThreadState() {
if (wxPyTMutex == NULL) // Python is shutting down...
- return gs_shutdownTState;
+ return &gs_shutdownTState;
unsigned long ctid = wxPyGetCurrentThreadId();
- PyThreadState* tstate = NULL;
+ wxPyThreadState* tstate = NULL;
wxPyTMutex->Lock();
for(size_t i=0; i < wxPyTStates->GetCount(); i++) {
wxPyThreadState& info = wxPyTStates->Item(i);
if (info.tid == ctid) {
- tstate = info.tstate;
+ tstate = &info;
break;
}
}
return tstate;
}
+
static
void wxPySaveThreadState(PyThreadState* tstate) {
if (wxPyTMutex == NULL) { // Python is shutting down, assume a single thread...
- gs_shutdownTState = tstate;
+ gs_shutdownTState.tstate = tstate;
return;
}
unsigned long ctid = wxPyGetCurrentThreadId();
#endif
+
// Calls from Python to wxWindows code are wrapped in calls to these
// functions:
// Calls from wxWindows back to Python code, or even any PyObject
// manipulations, PyDECREF's and etc. are wrapped in calls to these functions:
-void wxPyBeginBlockThreads() {
+bool wxPyBeginBlockThreads() {
#ifdef WXP_WITH_THREAD
- PyThreadState* tstate = wxPyGetThreadState();
- PyEval_RestoreThread(tstate);
+ // This works in for 2.3, maybe a good alternative to find the needed tstate?
+ // PyThreadState *check = PyGILState_GetThisThreadState();
+
+ // get the currect tstate by swapping in NULL and then putting it back.
+ PyThreadState *current = PyThreadState_Swap(NULL);
+ PyThreadState_Swap(current);
+
+ // Only block if there wasn't alrady a tstate. This cen happen with
+ // nested calls to wxPyBeginBlockThreads
+ bool blocked = false;
+ if (current == NULL) {
+ wxPyThreadState* tstate = wxPyGetThreadState();
+ PyEval_RestoreThread(tstate->tstate);
+ blocked = true;
+ }
+ return blocked;
#endif
}
-void wxPyEndBlockThreads() {
+void wxPyEndBlockThreads(bool blocked) {
#ifdef WXP_WITH_THREAD
- // Is there any need to save it again?
- // PyThreadState* tstate =
- PyEval_SaveThread();
+ // Only unblock if we blocked in the last call to wxPyBeginBlockThreads.
+ // The value of blocked passed in needs to be the same as that returned
+ // from wxPyBeginBlockThreads at the same nesting level.
+ if ( blocked ) {
+ PyEval_SaveThread();
+ }
#endif
}
// check if we have a real wxInputStream to work with
if (!m_wxis) {
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
PyErr_SetString(PyExc_IOError, "no valid C-wxInputStream");
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
return NULL;
}
}
// error check
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
wxStreamError err = m_wxis->GetLastError();
if (err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF) {
PyErr_SetString(PyExc_IOError,"IOError in wxInputStream");
// We use only strings for the streams, not unicode
obj = PyString_FromStringAndSize(buf, buf.GetDataLen());
}
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
return obj;
}
// check if we have a real wxInputStream to work with
if (!m_wxis) {
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
PyErr_SetString(PyExc_IOError,"no valid C-wxInputStream");
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
return NULL;
}
}
// errorcheck
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
wxStreamError err = m_wxis->GetLastError();
if (err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF) {
PyErr_SetString(PyExc_IOError,"IOError in wxInputStream");
// We use only strings for the streams, not unicode
obj = PyString_FromStringAndSize((char*)buf.GetData(), buf.GetDataLen());
}
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
return obj;
}
// check if we have a real wxInputStream to work with
if (!m_wxis) {
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
PyErr_SetString(PyExc_IOError,"no valid C-wxInputStream");
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
return NULL;
}
// init list
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
pylist = PyList_New(0);
+ wxPyEndBlockThreads(blocked);
+
if (!pylist) {
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
PyErr_NoMemory();
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
return NULL;
}
for (i=0; (m_wxis->CanRead()) && ((sizehint < 0) || (i < sizehint));) {
PyObject* s = this->readline();
if (s == NULL) {
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
Py_DECREF(pylist);
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
return NULL;
}
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
PyList_Append(pylist, s);
i += PyString_Size(s);
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
}
// error check
wxStreamError err = m_wxis->GetLastError();
if (err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF) {
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
Py_DECREF(pylist);
PyErr_SetString(PyExc_IOError,"IOError in wxInputStream");
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
return NULL;
}
wxPyCBInputStream::~wxPyCBInputStream() {
- if (m_block) wxPyBeginBlockThreads();
+ bool blocked;
+ if (m_block) blocked = wxPyBeginBlockThreads();
Py_XDECREF(m_read);
Py_XDECREF(m_seek);
Py_XDECREF(m_tell);
- if (m_block) wxPyEndBlockThreads();
+ if (m_block) wxPyEndBlockThreads(blocked);
}
wxPyCBInputStream* wxPyCBInputStream::create(PyObject *py, bool block) {
- if (block) wxPyBeginBlockThreads();
+ bool blocked;
+ if (block) blocked = wxPyBeginBlockThreads();
PyObject* read = getMethod(py, "read");
PyObject* seek = getMethod(py, "seek");
Py_XDECREF(read);
Py_XDECREF(seek);
Py_XDECREF(tell);
- if (block) wxPyEndBlockThreads();
+ if (block) wxPyEndBlockThreads(blocked);
return NULL;
}
- if (block) wxPyEndBlockThreads();
+ if (block) wxPyEndBlockThreads(blocked);
return new wxPyCBInputStream(read, seek, tell, block);
}
if (bufsize == 0)
return 0;
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
PyObject* arglist = Py_BuildValue("(i)", bufsize);
PyObject* result = PyEval_CallObject(m_read, arglist);
Py_DECREF(arglist);
}
else
m_lasterror = wxSTREAM_READ_ERROR;
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
return o;
}
}
off_t wxPyCBInputStream::OnSysSeek(off_t off, wxSeekMode mode) {
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
#ifdef _LARGE_FILES
// off_t is a 64-bit value...
PyObject* arglist = Py_BuildValue("(Li)", off, mode);
PyObject* result = PyEval_CallObject(m_seek, arglist);
Py_DECREF(arglist);
Py_XDECREF(result);
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
return OnSysTell();
}
off_t wxPyCBInputStream::OnSysTell() const {
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
PyObject* arglist = Py_BuildValue("()");
PyObject* result = PyEval_CallObject(m_tell, arglist);
Py_DECREF(arglist);
if (PyLong_Check(result))
o = PyLong_AsLongLong(result);
else
-#else
- o = PyInt_AsLong(result);
#endif
+ o = PyInt_AsLong(result);
Py_DECREF(result);
};
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
return o;
}
}
wxPyCallback::~wxPyCallback() {
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
Py_DECREF(m_func);
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
}
+#define wxPy_PRECALLINIT "_preCallInit"
+#define wxPy_POSTCALLCLEANUP "_postCallCleanup"
// This function is used for all events destined for Python event handlers.
void wxPyCallback::EventThunker(wxEvent& event) {
PyObject* tuple;
bool checkSkip = False;
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
wxString className = event.GetClassInfo()->GetClassName();
// If the event is one of these types then pass the original
arg = wxPyConstructObject((void*)&event, className);
}
- // Call the event handler, passing the event object
- tuple = PyTuple_New(1);
- PyTuple_SET_ITEM(tuple, 0, arg); // steals ref to arg
- result = PyEval_CallObject(func, tuple);
- if ( result ) {
- Py_DECREF(result); // result is ignored, but we still need to decref it
- PyErr_Clear(); // Just in case...
- } else {
+ if (!arg) {
PyErr_Print();
- }
-
- if ( checkSkip ) {
- // if the event object was one of our special types and
- // it had been cloned, then we need to extract the Skipped
- // value from the original and set it in the clone.
- result = PyObject_CallMethod(arg, "GetSkipped", "");
+ } else {
+ // "intern" the pre/post method names to speed up the HasAttr
+ static PyObject* s_preName = NULL;
+ static PyObject* s_postName = NULL;
+ if (s_preName == NULL) {
+ s_preName = PyString_FromString(wxPy_PRECALLINIT);
+ s_postName = PyString_FromString(wxPy_POSTCALLCLEANUP);
+ }
+
+ // Check if the event object needs some preinitialization
+ if (PyObject_HasAttr(arg, s_preName)) {
+ result = PyObject_CallMethodObjArgs(arg, s_preName, arg, NULL);
+ if ( result ) {
+ Py_DECREF(result); // result is ignored, but we still need to decref it
+ PyErr_Clear(); // Just in case...
+ } else {
+ PyErr_Print();
+ }
+ }
+
+ // Call the event handler, passing the event object
+ tuple = PyTuple_New(1);
+ PyTuple_SET_ITEM(tuple, 0, arg); // steals ref to arg
+ result = PyEval_CallObject(func, tuple);
if ( result ) {
- event.Skip(PyInt_AsLong(result));
- Py_DECREF(result);
+ Py_DECREF(result); // result is ignored, but we still need to decref it
+ PyErr_Clear(); // Just in case...
} else {
PyErr_Print();
}
- }
- Py_DECREF(tuple);
- wxPyEndBlockThreads();
+ // Check if the event object needs some post cleanup
+ if (PyObject_HasAttr(arg, s_postName)) {
+ result = PyObject_CallMethodObjArgs(arg, s_postName, arg, NULL);
+ if ( result ) {
+ Py_DECREF(result); // result is ignored, but we still need to decref it
+ PyErr_Clear(); // Just in case...
+ } else {
+ PyErr_Print();
+ }
+ }
+
+ if ( checkSkip ) {
+ // if the event object was one of our special types and
+ // it had been cloned, then we need to extract the Skipped
+ // value from the original and set it in the clone.
+ result = PyObject_CallMethod(arg, "GetSkipped", "");
+ if ( result ) {
+ event.Skip(PyInt_AsLong(result));
+ Py_DECREF(result);
+ } else {
+ PyErr_Print();
+ }
+ }
+ Py_DECREF(tuple);
+ }
+ wxPyEndBlockThreads(blocked);
}
void wxPyCBH_delete(wxPyCallbackHelper* cbh) {
if (cbh->m_incRef) {
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
Py_XDECREF(cbh->m_self);
Py_XDECREF(cbh->m_class);
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
}
}
}
wxPyEvtSelfRef::~wxPyEvtSelfRef() {
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
if (m_cloned)
Py_DECREF(m_self);
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
}
void wxPyEvtSelfRef::SetSelf(PyObject* self, bool clone) {
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
if (m_cloned)
Py_DECREF(m_self);
m_self = self;
Py_INCREF(m_self);
m_cloned = True;
}
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
}
PyObject* wxPyEvtSelfRef::GetSelf() const {
wxObject* wxObj;
wxNode* node = list->GetFirst();
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
pyList = PyList_New(0);
while (node) {
wxObj = node->GetData();
- pyObj = wxPyMake_wxObject(wxObj);
+ pyObj = wxPyMake_wxObject(wxObj);
PyList_Append(pyList, pyObj);
node = node->GetNext();
}
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
return pyList;
}
//----------------------------------------------------------------------
long wxPyGetWinHandle(wxWindow* win) {
+
#ifdef __WXMSW__
return (long)win->GetHandle();
#endif
#endif
}
#endif
+
+#ifdef __WXMAC__
+ return (long)MAC_WXHWND(win->MacGetRootWindow());
+#endif
+
return 0;
}
bool wxPySimple_typecheck(PyObject* source, const wxChar* classname, int seqLen)
{
void* ptr;
-
+
if (wxPySwigInstance_Check(source) &&
wxPyConvertSwigPtr(source, (void **)&ptr, classname))
return True;
PyErr_Clear();
if (PySequence_Check(source) && PySequence_Length(source) == seqLen)
return True;
-
+
return False;
-}
+}
bool wxSize_helper(PyObject* source, wxSize** obj)
{
+ if (source == Py_None) {
+ **obj = wxSize(-1,-1);
+ return True;
+ }
return wxPyTwoIntItem_helper(source, obj, wxT("wxSize"));
}
bool wxPoint_helper(PyObject* source, wxPoint** obj)
{
+ if (source == Py_None) {
+ **obj = wxPoint(-1,-1);
+ return True;
+ }
return wxPyTwoIntItem_helper(source, obj, wxT("wxPoint"));
}
bool wxRealPoint_helper(PyObject* source, wxRealPoint** obj) {
+ if (source == Py_None) {
+ **obj = wxRealPoint(-1,-1);
+ return True;
+ }
+
// If source is an object instance then it may already be the right type
if (wxPySwigInstance_Check(source)) {
wxRealPoint* ptr;
bool wxRect_helper(PyObject* source, wxRect** obj) {
+ if (source == Py_None) {
+ **obj = wxRect(-1,-1,-1,-1);
+ return True;
+ }
+
// If source is an object instance then it may already be the right type
if (wxPySwigInstance_Check(source)) {
wxRect* ptr;
bool wxColour_helper(PyObject* source, wxColour** obj) {
+ if (source == Py_None) {
+ **obj = wxNullColour;
+ return True;
+ }
+
// If source is an object instance then it may already be the right type
if (wxPySwigInstance_Check(source)) {
wxColour* ptr;
if (PyString_Check(source) || PyUnicode_Check(source))
return True;
-
- return False;
+
+ return False;
}
bool wxPoint2D_helper(PyObject* source, wxPoint2D** obj) {
+
+ if (source == Py_None) {
+ **obj = wxPoint2D(-1,-1);
+ return True;
+ }
+
// If source is an object instance then it may already be the right type
if (wxPySwigInstance_Check(source)) {
wxPoint2D* ptr;
projects / wxWidgets.git / blobdiff