#endif
#ifdef __WXGTK__
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
#include <gtk/gtk.h>
#include <gdk/gdkprivate.h>
#include <wx/gtk/win_gtk.h>
+#define GetXWindow(wxwin) GDK_WINDOW_XWINDOW((wxwin)->m_widget->window)
+#include <locale.h>
+#endif
+
+#ifdef __WXX11__
+#include "wx/x11/privx.h"
+#define GetXWindow(wxwin) ((Window)(wxwin)->GetHandle())
#endif
#ifdef __WXMAC__
struct wxPyThreadState {
unsigned long tid;
PyThreadState* tstate;
- int blocked;
wxPyThreadState(unsigned long _tid=0, PyThreadState* _tstate=NULL)
- : tid(_tid), tstate(_tstate), blocked(1) {}
+ : tid(_tid), tstate(_tstate) {}
};
#include <wx/dynarray.h>
static PyObject* wxPython_dict = NULL;
static PyObject* wxPyAssertionError = NULL;
+static PyObject* wxPyNoAppError = NULL;
PyObject* wxPyPtrTypeMap = NULL;
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);
+ // Initialize wxWidgets
result = wxEntryStart(argc, argv);
delete [] argv;
-
- wxPyBeginBlockThreads();
+
+ blocked = wxPyBeginBlockThreads();
if (! result) {
- PyErr_SetString(PyExc_SystemError, "wxEntryStart failed!");
+ PyErr_SetString(PyExc_SystemError,
+ "wxEntryStart failed, unable to initialize wxWidgets!"
+#ifdef __WXGTK__
+ " (Is DISPLAY set properly?)"
+#endif
+ );
goto error;
}
+ // On wxGTK the locale will be changed to match the system settings, but
+ // Python needs to have LC_NUMERIC set to "C" in order for the floating
+ // point conversions and such to work right.
+#ifdef __WXGTK__
+ setlocale(LC_NUMERIC, "C");
+#endif
+
// The stock objects were all NULL when they were loaded into
// SWIG generated proxies, so re-init those now...
wxPy_ReinitStockObjects(3);
// 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);
};
//---------------------------------------------------------------------
//----------------------------------------------------------------------
-// This function is called when the wxc module is imported to do some initial
-// setup. (Before there is a wxApp object.) The rest happens in
+// This function is called when the wx._core_ module is imported to do some
+// initial setup. (Before there is a wxApp object.) The rest happens in
// wxPyApp::_BootstrapApp
void __wxPyPreStart(PyObject* moduleDict)
{
// Init the stock objects to a non-NULL value so SWIG doesn't create them as None
wxPy_ReinitStockObjects(1);
+
+ wxInitAllImageHandlers();
}
}
-// Save a reference to the dictionary of the wx.core module, and inject
+// Save a reference to the dictionary of the wx._core module, and inject
// a few more things into it.
PyObject* __wxPySetDictionary(PyObject* /* self */, PyObject* args)
{
return NULL;
if (!PyDict_Check(wxPython_dict)) {
- PyErr_SetString(PyExc_TypeError, "_wxPySetDictionary must have dictionary object!");
+ PyErr_SetString(PyExc_TypeError,
+ "_wxPySetDictionary must have dictionary object!");
return NULL;
}
PyDict_SetItemString(wxPython_dict, "__wxPyPtrTypeMap", wxPyPtrTypeMap);
// Create an exception object to use for wxASSERTions
- wxPyAssertionError = PyErr_NewException("wx.core.PyAssertionError",
+ wxPyAssertionError = PyErr_NewException("wx._core.PyAssertionError",
PyExc_AssertionError, NULL);
PyDict_SetItemString(wxPython_dict, "PyAssertionError", wxPyAssertionError);
+ // Create an exception object to use when the app object hasn't been created yet
+ wxPyNoAppError = PyErr_NewException("wx._core.PyNoAppError",
+ PyExc_RuntimeError, NULL);
+ PyDict_SetItemString(wxPython_dict, "PyNoAppError", wxPyNoAppError);
+
+
#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
+#ifdef __WXDEBUG__
+ _AddInfoString("wx-assertions-on");
+#else
+ _AddInfoString("wx-assertions-off");
+#endif
+
+#undef _AddInfoString
+
+ PyObject* PlatInfoTuple = PyList_AsTuple(PlatInfo);
+ Py_DECREF(PlatInfo);
+ PyDict_SetItemString(wxPython_dict, "PlatformInfo", PlatInfoTuple);
+
RETURN_NONE();
}
//---------------------------------------------------------------------------
-// The stock objects are no longer created when the wxc module is imported,
-// but only after the app object has been created. The
+// 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 it will just use None.)
+// 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 OnInit patch things up so the stock objects can
-// be used.
+// pass 3: Finally, from BootstrapApp patch things up so the stock objects
+// can be used.
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);
// Change its class
PyObject_SetAttrString(obj, "__class__", unbornObjectClass);
-
+
}
static void rsoPass3(const char* name, const char* classname, void* ptr)
// Find the object instance
obj = PyDict_GetItemString(wxPython_dict, (char*)dropwx(name));
- wxCHECK_RET(obj != NULL, wxT("Unable to find stock object"));
+ 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"));
+ 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)
{
+ // 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); } \
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);
//---------------------------------------------------------------------------
+// Check for existence of a wxApp, setting an exception if there isn't one.
+// This doesn't need to aquire the GIL because it should only be called from
+// an %exception before the lock is released.
+
+bool wxPyCheckForApp() {
+ if (wxTheApp != NULL)
+ return true;
+ else {
+ PyErr_SetString(wxPyNoAppError, "The wx.App object must be created first!");
+ return false;
+ }
+}
+
+//---------------------------------------------------------------------------
+
+
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);
}
#ifdef WXP_WITH_THREAD
PyThreadState* saved = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS;
wxPySaveThreadState(saved);
- wxPyGetThreadState()->blocked -= 1;
return saved;
#else
return NULL;
void wxPyEndAllowThreads(PyThreadState* saved) {
#ifdef WXP_WITH_THREAD
- wxPyGetThreadState()->blocked += 1;
PyEval_RestoreThread(saved); // Py_END_ALLOW_THREADS;
#endif
}
// 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
+ // This works in for 2.3, maybe a good alternative to find the needed tstate?
+ // PyThreadState *check = PyGILState_GetThisThreadState();
+
+ PyThreadState *current = _PyThreadState_Current;
+
+ // Only block if there wasn't already a tstate, or if the current one is
+ // not the one we are wanting to change to. This should prevent deadlock
+ // if there are nested calls to wxPyBeginBlockThreads
+ bool blocked = false;
wxPyThreadState* tstate = wxPyGetThreadState();
- if (tstate->blocked++ == 0) { // if nested calls then do nothing
+ if (current != tstate->tstate) {
PyEval_RestoreThread(tstate->tstate);
+ blocked = true;
}
+ return blocked;
#endif
}
-void wxPyEndBlockThreads() {
+void wxPyEndBlockThreads(bool blocked) {
#ifdef WXP_WITH_THREAD
- wxPyThreadState* tstate = wxPyGetThreadState();
- tstate->blocked -= 1;
- if ( tstate->blocked == 0) { // if nested calls then do nothing
+ // 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);
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
if (!arg) {
PyErr_Print();
} 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
PyErr_Print();
}
+ // 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
}
Py_DECREF(tuple);
}
- wxPyEndBlockThreads();
+ 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;
}
#ifdef __WXMSW__
return (long)win->GetHandle();
#endif
-
- // Find and return the actual X-Window.
-#ifdef __WXGTK__
- if (win->m_wxwindow) {
-#ifdef __WXGTK20__
- return (long) GDK_WINDOW_XWINDOW(GTK_PIZZA(win->m_wxwindow)->bin_window);
-#else
- GdkWindowPrivate* bwin = (GdkWindowPrivate*)GTK_PIZZA(win->m_wxwindow)->bin_window;
- if (bwin) {
- return (long)bwin->xwindow;
- }
-#endif
- }
+
+#if defined(__WXGTK__) || defined(__WXX11)
+ return (long)GetXWindow(win);
#endif
#ifdef __WXMAC__
- return (long)MAC_WXHWND(win->MacGetRootWindow());
+ //return (long)MAC_WXHWND(win->MacGetTopLevelWindowRef());
+ return (long)win->GetHandle();
#endif
-
+
return 0;
}
// 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) {
}
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;
}
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;
}
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)
{
**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;
if (PyString_Check(source) || PyUnicode_Check(source))
return True;
-
- return False;
+
+ return False;
}
**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