//
// Author: Robin Dunn
//
-// Created: 7/1/97
+// Created: 1-July-1997
// RCS-ID: $Id$
// Copyright: (c) 1998 by Total Control Software
// Licence: wxWindows license
#undef DEBUG
#include <Python.h>
-#include "helpers.h"
-#include "pyistream.h"
+#include "wx/wxPython/wxPython_int.h"
+#include "wx/wxPython/pyistream.h"
#ifdef __WXMSW__
#include <wx/msw/private.h>
#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) (wxwin)->m_wxwindow ? \
+ GDK_WINDOW_XWINDOW(GTK_PIZZA((wxwin)->m_wxwindow)->bin_window) : \
+ 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__
+#include <wx/mac/private.h>
#endif
#include <wx/clipbrd.h>
#include <wx/mimetype.h>
+#include <wx/image.h>
//----------------------------------------------------------------------
-#if PYTHON_API_VERSION <= 1007 && wxUSE_UNICODE
+#if PYTHON_API_VERSION < 1009 && wxUSE_UNICODE
#error Python must support Unicode to use wxWindows Unicode
#endif
//----------------------------------------------------------------------
wxPyApp* wxPythonApp = NULL; // Global instance of application object
-bool wxPyDoCleanup = FALSE;
-bool wxPyDoingCleanup = FALSE;
+bool wxPyDoCleanup = false;
+bool wxPyDoingCleanup = false;
#ifdef WXP_WITH_THREAD
wxMutex* wxPyTMutex = NULL;
#endif
+#define DEFAULTENCODING_SIZE 64
+static char wxPyDefaultEncoding[DEFAULTENCODING_SIZE] = "ascii";
static PyObject* wxPython_dict = NULL;
-static PyObject* wxPyPtrTypeMap = NULL;
static PyObject* wxPyAssertionError = NULL;
+static PyObject* wxPyNoAppError = NULL;
+
+PyObject* wxPyPtrTypeMap = NULL;
#ifdef __WXMSW__ // If building for win32...
// the inatance has already been set.
if (! wxGetInstance())
wxSetInstance(hinstDLL);
- return TRUE;
+ return true;
}
#endif
wxPyApp::wxPyApp() {
m_assertMode = wxPYAPP_ASSERT_EXCEPTION;
+ m_startupComplete = false;
}
}
-// This one isn't acutally called... We fake it with __wxStart()
+// This one isn't acutally called... We fake it with _BootstrapApp
bool wxPyApp::OnInit() {
- return FALSE;
+ return false;
}
DeletePendingObjects();
bool initialized = wxTopLevelWindows.GetCount() != 0;
-#ifdef __WXGTK__
- m_initialized = initialized;
-#endif
-
if (initialized) {
if ( m_exitOnFrameDelete == Later ) {
m_exitOnFrameDelete = Yes;
bool wxPyApp::OnInitGui() {
- bool rval=TRUE;
+ bool rval=true;
wxApp::OnInitGui(); // in this case always call the base class version
- // wxPyBeginBlockThreads(); *** only called from within __wxStart so we already have the GIL
+ 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;
}
const wxChar *cond,
const wxChar *msg) {
+ // if we're not fully initialized then just log the error
+ if (! m_startupComplete) {
+ wxString buf;
+ buf.Alloc(4096);
+ buf.Printf(wxT("%s(%d): assert \"%s\" failed"),
+ file, line, cond);
+ if (msg != NULL) {
+ buf += wxT(": ");
+ buf += msg;
+ }
+ 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);
+}
-/*static*/
-bool wxPyApp::GetMacDefaultEncodingIsPC() {
-#ifdef __WXMAC__
- return s_macDefaultEncodingIsPC;
-#else
- return 0;
-#endif
+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 wxPyApp::GetMacSupportPCMenuShortcuts() {
#ifdef __WXMAC__
#endif
}
-/*static*/
-void wxPyApp::SetMacDefaultEncodingIsPC(bool val) {
-#ifdef __WXMAC__
- s_macDefaultEncodingIsPC = val;
-#endif
-}
-
/*static*/
void wxPyApp::SetMacSupportPCMenuShortcuts(bool val) {
#ifdef __WXMAC__
}
+// This finishes the initialization of wxWindows and then calls the OnInit
+// that should be present in the derived (Python) class.
+void wxPyApp::_BootstrapApp()
+{
+ static bool haveInitialized = false;
+ bool result, blocked;
+ PyObject* retval = NULL;
+ PyObject* pyint = NULL;
+
+
+ // Only initialize wxWidgets once
+ if (! haveInitialized) {
+
+ // Get any command-line args passed to this program from the sys module
+ int argc = 0;
+ char** argv = NULL;
+ blocked = wxPyBeginBlockThreads();
+ PyObject* sysargv = PySys_GetObject("argv");
+ if (sysargv != NULL) {
+ argc = PyList_Size(sysargv);
+ argv = new char*[argc+1];
+ int x;
+ for(x=0; x<argc; x++) {
+ PyObject *pyArg = PyList_GetItem(sysargv, x);
+ argv[x] = PyString_AsString(pyArg);
+ }
+ argv[argc] = NULL;
+ }
+ wxPyEndBlockThreads(blocked);
+
+ // Initialize wxWidgets
+ result = wxEntryStart(argc, argv);
+ delete [] argv;
+
+ blocked = wxPyBeginBlockThreads();
+ if (! result) {
+ 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 before 2.4 needs to have LC_NUMERIC set to "C" in order
+ // for the floating point conversions and such to work right.
+#if defined(__WXGTK__) && PY_VERSION_HEX < 0x02040000
+ 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);
+
+ wxPyEndBlockThreads(blocked);
+ haveInitialized = true;
+ }
+
+ // It's now ok to generate exceptions for assertion errors.
+ wxPythonApp->SetStartupComplete(true);
+
+ // Call the Python wxApp's OnInit function
+ blocked = wxPyBeginBlockThreads();
+ if (wxPyCBH_findCallback(m_myInst, "OnInit")) {
+
+ PyObject* method = m_myInst.GetLastFound();
+ PyObject* argTuple = PyTuple_New(0);
+ retval = PyEval_CallObject(method, argTuple);
+ Py_DECREF(argTuple);
+ Py_DECREF(method);
+ if (retval == NULL)
+ goto error;
+
+ pyint = PyNumber_Int(retval);
+ if (! pyint) {
+ PyErr_SetString(PyExc_TypeError, "OnInit should return a boolean value");
+ goto error;
+ }
+ result = PyInt_AS_LONG(pyint);
+ }
+ else {
+ // 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(blocked);
+};
//---------------------------------------------------------------------
//----------------------------------------------------------------------
#endif
+inline const char* dropwx(const char* name) {
+ if (name[0] == 'w' && name[1] == 'x')
+ return name+2;
+ else
+ return name;
+}
+
//----------------------------------------------------------------------
-// This function is called when the wxc module is imported to do some initial
-// setup. (Before there is a wxApp object.)
-void __wxPreStart(PyObject* moduleDict)
+// 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)
{
#ifdef __WXMSW__
-// wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF);
+// wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF
+// | _CRTDBG_CHECK_ALWAYS_DF
+// | _CRTDBG_DELAY_FREE_MEM_DF
+// );
#endif
#ifdef WXP_WITH_THREAD
PyEval_InitThreads();
wxPyTStates = new wxPyThreadStateArray;
wxPyTMutex = new wxMutex;
+
+ // Save the current (main) thread state in our array
+ PyThreadState* tstate = wxPyBeginAllowThreads();
+ wxPyEndAllowThreads(tstate);
#endif
// Ensure that the build options in the DLL (or whatever) match this build
- wxApp::CheckBuildOptions(wxBuildOptions());
+ wxApp::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE, "wxPython");
- // Create an exception object to use for wxASSERTions
- wxPyAssertionError = PyErr_NewException("wxPython.wxc.wxPyAssertionError",
- PyExc_AssertionError, NULL);
- PyDict_SetItemString(moduleDict, "wxPyAssertionError", wxPyAssertionError);
-}
-
-
-
-// Initialize wxWindows and bootstrap the user application by calling the
-// wxApp's OnInit, which is a parameter to this funciton. See wxApp.__init__
-// in _extras.py to learn how the bootstrap is started.
-PyObject* __wxStart(PyObject* /* self */, PyObject* args)
-{
- PyObject* onInitFunc = NULL;
- PyObject* arglist= NULL;
- PyObject* result = NULL;
- PyObject* pyint = NULL;
- long bResult;
+ // Init the stock objects to a non-NULL value so SWIG doesn't create them as None
+ wxPy_ReinitStockObjects(1);
- if (!PyArg_ParseTuple(args, "O", &onInitFunc))
- return NULL;
-
- // Get any command-line args passed to this program from the sys module
- int argc = 0;
- char** argv = NULL;
- PyObject* sysargv = PySys_GetObject("argv");
- if (sysargv != NULL) {
- argc = PyList_Size(sysargv);
- argv = new char*[argc+1];
- int x;
- for(x=0; x<argc; x++) {
- PyObject *pyArg = PyList_GetItem(sysargv, x);
- argv[x] = PyString_AsString(pyArg);
- }
- argv[argc] = NULL;
- }
-
- if (! wxEntryStart(argc, argv) ) {
- PyErr_SetString(PyExc_SystemError, // is this the right one?
- "wxEntryStart failed!");
- goto error;
- }
- delete [] argv;
-
-
- // The stock objects were all NULL when they were loaded into
- // SWIG generated proxies, so re-init those now...
- wxPy_ReinitStockObjects();
-
-
- // Call the Python wxApp's OnInit function
- arglist = PyTuple_New(0);
- result = PyEval_CallObject(onInitFunc, arglist);
- Py_DECREF(arglist);
- if (!result) { // an exception was raised.
- return NULL;
- }
-
- pyint = PyNumber_Int(result);
- if (! pyint) {
- PyErr_SetString(PyExc_TypeError, "OnInit should return a boolean value");
- goto error;
- }
- bResult = PyInt_AS_LONG(pyint);
- if (! bResult) {
- PyErr_SetString(PyExc_SystemExit, "OnInit returned FALSE, exiting...");
- goto error;
- }
-
-#ifdef __WXGTK__
- wxTheApp->m_initialized = (wxTopLevelWindows.GetCount() > 0);
-#endif
-
- Py_DECREF(result);
- Py_DECREF(pyint);
- Py_INCREF(Py_None);
- return Py_None;
-
- error:
- Py_XDECREF(result);
- Py_XDECREF(pyint);
- return NULL;
+ wxInitAllImageHandlers();
}
-void __wxCleanup() {
- wxPyDoingCleanup = TRUE;
- if (wxPyDoCleanup)
+void __wxPyCleanup() {
+ wxPyDoingCleanup = true;
+ if (wxPyDoCleanup) {
+ wxPyDoCleanup = false;
wxEntryCleanup();
+ }
#ifdef WXP_WITH_THREAD
delete wxPyTMutex;
wxPyTMutex = NULL;
}
-
-
-PyObject* __wxSetDictionary(PyObject* /* self */, PyObject* args)
+// 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)
{
if (!PyArg_ParseTuple(args, "O", &wxPython_dict))
return NULL;
if (!PyDict_Check(wxPython_dict)) {
- PyErr_SetString(PyExc_TypeError, "_wxSetDictionary must have dictionary object!");
+ PyErr_SetString(PyExc_TypeError,
+ "_wxPySetDictionary must have dictionary object!");
return NULL;
}
wxPyPtrTypeMap = PyDict_New();
PyDict_SetItemString(wxPython_dict, "__wxPyPtrTypeMap", wxPyPtrTypeMap);
+ // Create an exception object to use for wxASSERTions
+ 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
- PyDict_SetItemString(wxPython_dict, "wxPlatform", PyString_FromString(wxPlatform));
- PyDict_SetItemString(wxPython_dict, "wxUSE_UNICODE", PyInt_FromLong(wxUSE_UNICODE));
+ // 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));
- Py_INCREF(Py_None);
- return Py_None;
+ // Make a tuple of strings that gives more info about the platform.
+ 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("ansi");
+#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. This function will be called before
-// OnInit is called so we can hack the new pointer values into the obj.this attributes.
+// Python's PyInstance_Check does not return True for instances of new-style
+// classes. This should get close enough for both new and old classes but I
+// should re-evaluate the need for doing instance checks...
+bool wxPyInstance_Check(PyObject* obj) {
+ return PyObject_HasAttrString(obj, "__class__") != 0;
+}
+
-void wxPy_ReinitStockObjects()
+// This one checks if the object is an instance of a SWIG proxy class (it has
+// a .this attribute)
+bool wxPySwigInstance_Check(PyObject* obj) {
+ return PyObject_HasAttrString(obj, "this") != 0;
+}
+
+//---------------------------------------------------------------------------
+
+// The stock objects are no longer created when the wx._core_ module is
+// imported, but only after the app object has been created. The
+// wxPy_ReinitStockObjects function will be called 3 times to pass the stock
+// objects though various stages of evolution:
+//
+// pass 1: Set all the pointers to a non-NULL value so the Python proxy
+// object will be created (otherwise SWIG will just use None.)
+//
+// pass 2: After the module has been imported and the python proxys have
+// been created, then set the __class__ to be _wxPyUnbornObject so
+// it will catch any access to the object and will raise an exception.
+//
+// pass 3: Finally, from BootstrapApp patch things up so the stock objects
+// can be used.
+
+
+PyObject* __wxPyFixStockObjects(PyObject* /* self */, PyObject* args)
+{
+ wxPy_ReinitStockObjects(2);
+ RETURN_NONE();
+}
+
+
+static void rsoPass2(const char* name)
{
- char ptrbuf[128];
+ static PyObject* unbornObjectClass = NULL;
PyObject* obj;
+
+ if (unbornObjectClass == NULL) {
+ unbornObjectClass = PyDict_GetItemString(wxPython_dict, "_wxPyUnbornObject");
+ Py_INCREF(unbornObjectClass);
+ }
+
+ // Find the object instance
+ obj = PyDict_GetItemString(wxPython_dict, (char*)dropwx(name));
+ wxCHECK_RET(obj != NULL, wxT("Unable to find stock object"));
+ wxCHECK_RET(wxPySwigInstance_Check(obj), wxT("Not a swig instance"));
+
+ // Change its class
+ PyObject_SetAttrString(obj, "__class__", unbornObjectClass);
+
+}
+
+static void rsoPass3(const char* name, const char* classname, void* ptr)
+{
+ PyObject* obj;
+ PyObject* classobj;
PyObject* ptrobj;
+ // Find the object instance
+ obj = PyDict_GetItemString(wxPython_dict, (char*)dropwx(name));
+ wxCHECK_RET(obj != NULL, wxT("Unable to find stock object"));
+ wxCHECK_RET(wxPySwigInstance_Check(obj), wxT("Not a swig instance"));
+ // Find the class object and put it back in the instance
+ classobj = PyDict_GetItemString(wxPython_dict, (char*)dropwx(classname));
+ wxCHECK_RET(classobj != NULL, wxT("Unable to find stock class object"));
+ PyObject_SetAttrString(obj, "__class__", classobj);
+
+ // Rebuild the .this swigified pointer with the new value of the C++ pointer
+ ptrobj = wxPyMakeSwigPtr(ptr, wxString(classname, *wxConvCurrent));
+ PyObject_SetAttrString(obj, "this", ptrobj);
+ Py_DECREF(ptrobj);
+}
-#define REINITOBJ(name, type) \
- obj = PyDict_GetItemString(wxPython_dict, #name); \
- wxASSERT_MSG(obj != NULL, wxT("Unable to find stock object for " #name)); \
- SWIG_MakePtr(ptrbuf, (char *) name, "_" #type "_p"); \
- ptrobj = PyString_FromString(ptrbuf); \
- PyObject_SetAttrString(obj, "this", ptrobj); \
- Py_DECREF(ptrobj)
-#define REINITOBJ2(name, type) \
- obj = PyDict_GetItemString(wxPython_dict, #name); \
- wxASSERT_MSG(obj != NULL, wxT("Unable to find stock object for " #name)); \
- SWIG_MakePtr(ptrbuf, (char *) &name, "_" #type "_p"); \
- ptrobj = PyString_FromString(ptrbuf); \
- PyObject_SetAttrString(obj, "this", ptrobj); \
- Py_DECREF(ptrobj)
+void wxPy_ReinitStockObjects(int pass)
+{
+
+ // If there is already an App object then wxPython is probably embedded in
+ // a wx C++ application, so there is no need to do all this.
+ static bool embedded = false;
+ if ((pass == 1 || pass == 2) && wxTheApp) {
+ embedded = true;
+ return;
+ }
+ if (pass == 3 && embedded)
+ return;
+
+
+#define REINITOBJ(name, classname) \
+ if (pass == 1) { name = (classname*)0xC0C0C0C0; } \
+ else if (pass == 2) { rsoPass2(#name); } \
+ else if (pass == 3) { rsoPass3(#name, #classname, (void*)name); }
+
+
+#define REINITOBJ2(name, classname) \
+ if (pass == 1) { } \
+ else if (pass == 2) { rsoPass2(#name); } \
+ else if (pass == 3) { rsoPass3(#name, #classname, (void*)&name); }
+
REINITOBJ(wxNORMAL_FONT, wxFont);
REINITOBJ(wxSMALL_FONT, wxFont);
REINITOBJ(wxTheColourDatabase, wxColourDatabase);
- REINITOBJ(wxTheClipboard, wxClipboard);
- REINITOBJ(wxTheMimeTypesManager, wxMimeTypesManager);
REINITOBJ2(wxDefaultValidator, wxValidator);
REINITOBJ2(wxNullImage, wxImage);
REINITOBJ2(wxNullAcceleratorTable, wxAcceleratorTable);
//---------------------------------------------------------------------------
-void wxPyClientData_dtor(wxPyClientData* self) {
- if (! wxPyDoingCleanup) { // Don't do it during cleanup as Python
- // may have already garbage collected the object...
- wxPyBeginBlockThreads();
- Py_DECREF(self->m_obj);
- wxPyEndBlockThreads();
+// 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 wxPyUserData_dtor(wxPyUserData* self) {
if (! wxPyDoingCleanup) {
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
Py_DECREF(self->m_obj);
- wxPyEndBlockThreads();
+ self->m_obj = NULL;
+ wxPyEndBlockThreads(blocked);
+ }
+}
+
+
+void wxPyClientData_dtor(wxPyClientData* self) {
+ if (! wxPyDoingCleanup) { // Don't do it during cleanup as Python
+ // may have already garbage collected the object...
+ if (self->m_incRef) {
+ bool blocked = wxPyBeginBlockThreads();
+ Py_DECREF(self->m_obj);
+ wxPyEndBlockThreads(blocked);
+ }
+ self->m_obj = NULL;
}
}
+
// This is called when an OOR controled object is being destroyed. Although
// the C++ object is going away there is no way to force the Python object
// (and all references to it) to die too. This causes problems (crashes) in
// the now bogus pointer... So to try and prevent this we'll do a little black
// magic and change the class of the python instance to a class that will
// raise an exception for any attempt to call methods with it. See
-// _wxPyDeadObject in _extras.py for the implementation of this class.
+// _wxPyDeadObject in _core_ex.py for the implementation of this class.
void wxPyOORClientData_dtor(wxPyOORClientData* self) {
static PyObject* deadObjectClass = NULL;
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
if (deadObjectClass == NULL) {
deadObjectClass = PyDict_GetItemString(wxPython_dict, "_wxPyDeadObject");
- wxASSERT_MSG(deadObjectClass != NULL, wxT("Can't get _wxPyDeadObject class!"));
+ // TODO: Can not wxASSERT here because inside a wxPyBeginBlock Threads,
+ // will lead to a deadlock when it tries to aquire the GIL again.
+ //wxASSERT_MSG(deadObjectClass != NULL, wxT("Can't get _wxPyDeadObject class!"));
Py_INCREF(deadObjectClass);
}
- // Only if there is more than one reference to the object
- if ( !wxPyDoingCleanup && self->m_obj->ob_refcnt > 1 ) {
- wxASSERT_MSG(PyInstance_Check(self->m_obj), wxT("m_obj not an instance!?!?!"));
+ // Only if there is more than one reference to the object and we are
+ // holding the OOR reference:
+ if ( !wxPyDoingCleanup && self->m_obj->ob_refcnt > 1 && self->m_incRef) {
+ // bool isInstance = wxPyInstance_Check(self->m_obj);
+ // TODO same here
+ //wxASSERT_MSG(isInstance, wxT("m_obj not an instance!?!?!"));
// Call __del__, if there is one.
PyObject* func = PyObject_GetAttrString(self->m_obj, "__del__");
if (PyErr_Occurred())
PyErr_Clear(); // just ignore it for now
- // Clear the instance's dictionary
- PyInstanceObject* inst = (PyInstanceObject*)self->m_obj;
- PyDict_Clear(inst->in_dict);
- // put the name of the old class into the instance, and then reset the
- // class to be the dead class.
- PyDict_SetItemString(inst->in_dict, "_name", inst->in_class->cl_name);
- inst->in_class = (PyClassObject*)deadObjectClass;
- Py_INCREF(deadObjectClass);
+ PyObject* dict = PyObject_GetAttrString(self->m_obj, "__dict__");
+ if (dict) {
+ // Clear the instance's dictionary
+ PyDict_Clear(dict);
+
+ // put the name of the old class into the instance, and then reset the
+ // class to be the dead class.
+ PyObject* klass = PyObject_GetAttrString(self->m_obj, "__class__");
+ PyObject* name = PyObject_GetAttrString(klass, "__name__");
+ PyDict_SetItemString(dict, "_name", name);
+ PyObject_SetAttrString(self->m_obj, "__class__", deadObjectClass);
+ //Py_INCREF(deadObjectClass);
+ Py_DECREF(klass);
+ Py_DECREF(name);
+ }
}
- // m_obj is DECREF's in the base class dtor...
- wxPyEndBlockThreads();
+ // m_obj is DECREF'd in the base class dtor...
+ wxPyEndBlockThreads(blocked);
}
-PyObject* wxPyClassExists(const wxString& className) {
-
- PyObject* item;
- wxString name(className);
- char buff[64]; // should always be big enough...
-
- if (!className)
- return NULL;
-
- // Try the name as-is first
- sprintf(buff, "%sPtr", (const char*)name.mbc_str());
- PyObject* classobj = PyDict_GetItemString(wxPython_dict, buff);
-
- // if not found see if there is a mapped name for it
- if ( ! classobj) {
- if ((item = PyDict_GetItemString(wxPyPtrTypeMap, (char*)(const char*)name.mbc_str())) != NULL) {
- name = wxString(PyString_AsString(item), *wxConvCurrent);
- sprintf(buff, "%sPtr", (const char*)name.mbc_str());
- classobj = PyDict_GetItemString(wxPython_dict, buff);
- }
- }
-
- return classobj; // returns NULL if not found
-}
-
-PyObject* wxPyMake_wxObject(wxObject* source, bool checkEvtHandler) {
+PyObject* wxPyMake_wxObject(wxObject* source, bool setThisOwn, bool checkEvtHandler) {
PyObject* target = NULL;
- bool isEvtHandler = FALSE;
+ bool isEvtHandler = false;
if (source) {
// If it's derived from wxEvtHandler then there may
// already be a pointer to a Python object that we can use
// in the OOR data.
if (checkEvtHandler && wxIsKindOf(source, wxEvtHandler)) {
- isEvtHandler = TRUE;
+ isEvtHandler = true;
wxEvtHandler* eh = (wxEvtHandler*)source;
wxPyOORClientData* data = (wxPyOORClientData*)eh->GetClientObject();
if (data) {
target = data->m_obj;
- Py_INCREF(target);
+ if (target)
+ Py_INCREF(target);
}
}
if (! target) {
- // Otherwise make it the old fashioned way by making a
- // new shadow object and putting this pointer in it.
- wxClassInfo* info = source->GetClassInfo();
- wxString name = info->GetClassName();
- PyObject* klass = wxPyClassExists(name);
- while (info && !klass) {
- name = (wxChar*)info->GetBaseClassName1();
- info = wxClassInfo::FindClass(name);
- klass = wxPyClassExists(name);
+ // Otherwise make it the old fashioned way by making a new shadow
+ // object and putting this pointer in it. Look up the class
+ // heirarchy until we find a class name that is located in the
+ // python module.
+ const wxClassInfo* info = source->GetClassInfo();
+ wxString name = info->GetClassName();
+ bool exists = wxPyCheckSwigType(name);
+ while (info && !exists) {
+ info = info->GetBaseClass1();
+ name = info->GetClassName();
+ exists = wxPyCheckSwigType(name);
}
if (info) {
- target = wxPyConstructObject(source, name, klass, FALSE);
+ target = wxPyConstructObject((void*)source, name, setThisOwn);
if (target && isEvtHandler)
((wxEvtHandler*)source)->SetClientObject(new wxPyOORClientData(target));
} else {
}
-PyObject* wxPyMake_wxSizer(wxSizer* source) {
+PyObject* wxPyMake_wxSizer(wxSizer* source, bool setThisOwn) {
PyObject* target = NULL;
if (source && wxIsKindOf(source, wxSizer)) {
- // If it's derived from wxSizer then there may
- // already be a pointer to a Python object that we can use
- // in the OOR data.
+ // If it's derived from wxSizer then there may already be a pointer to
+ // a Python object that we can use in the OOR data.
wxSizer* sz = (wxSizer*)source;
wxPyOORClientData* data = (wxPyOORClientData*)sz->GetClientObject();
if (data) {
target = data->m_obj;
- Py_INCREF(target);
+ if (target)
+ Py_INCREF(target);
}
}
if (! target) {
- target = wxPyMake_wxObject(source, FALSE);
+ target = wxPyMake_wxObject(source, setThisOwn, false);
if (target != Py_None)
((wxSizer*)source)->SetClientObject(new wxPyOORClientData(target));
}
}
-
-//---------------------------------------------------------------------------
-
-PyObject* wxPyConstructObject(void* ptr,
- const wxString& className,
- PyObject* klass,
- int setThisOwn) {
-
- PyObject* obj;
- PyObject* arg;
- PyObject* item;
- wxString name(className);
- char swigptr[64]; // should always be big enough...
- char buff[64];
-
- if ((item = PyDict_GetItemString(wxPyPtrTypeMap, (char*)(const char*)name.mbc_str())) != NULL) {
- name = wxString(PyString_AsString(item), *wxConvCurrent);
- }
- sprintf(buff, "_%s_p", (const char*)name.mbc_str());
- SWIG_MakePtr(swigptr, ptr, buff);
-
- arg = Py_BuildValue("(s)", swigptr);
- obj = PyInstance_New(klass, arg, NULL);
- Py_DECREF(arg);
-
- if (setThisOwn) {
- PyObject* one = PyInt_FromLong(1);
- PyObject_SetAttrString(obj, "thisown", one);
- Py_DECREF(one);
- }
-
- return obj;
-}
-
-
-PyObject* wxPyConstructObject(void* ptr,
- const wxString& className,
- int setThisOwn) {
- if (!ptr) {
- Py_INCREF(Py_None);
- return Py_None;
- }
-
- char buff[64]; // should always be big enough...
- sprintf(buff, "%sPtr", (const char*)className.mbc_str());
-
- wxASSERT_MSG(wxPython_dict, wxT("wxPython_dict is not set yet!!"));
-
- PyObject* classobj = PyDict_GetItemString(wxPython_dict, buff);
- if (! classobj) {
- wxString msg(wxT("wxPython class not found for "));
- msg += className;
- PyErr_SetString(PyExc_NameError, msg.mbc_str());
- return NULL;
- }
-
- return wxPyConstructObject(ptr, className, classobj, setThisOwn);
-}
-
-
//---------------------------------------------------------------------------
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();
if (info.tstate != tstate)
wxLogMessage("*** tstate mismatch!???");
#endif
- // info.tstate = tstate; *** DO NOT update existing ones???
+ info.tstate = tstate; // allow for transient tstates
// Normally it will never change, but apparently COM callbacks
// (i.e. ActiveX controls) will (incorrectly IMHO) use a transient
// tstate which will then be garbage the next time we try to use
// it...
+
wxPyTMutex->Unlock();
return;
}
#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();
+
+ 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 (current != tstate->tstate) {
+ 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
}
if (m_wxis)
return m_wxis->Eof();
else
- return TRUE;
+ return true;
}
wxPyInputStream::~wxPyInputStream() {
- /* do nothing */
+ if (m_wxis)
+ delete m_wxis;
}
// 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=false;
+ 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=false;
+ 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);
}
}
-size_t wxPyCBInputStream::GetSize() const {
+wxFileOffset wxPyCBInputStream::GetLength() const {
wxPyCBInputStream* self = (wxPyCBInputStream*)this; // cast off const
if (m_seek && m_tell) {
- off_t temp = self->OnSysTell();
- off_t ret = self->OnSysSeek(0, wxFromEnd);
+ wxFileOffset temp = self->OnSysTell();
+ wxFileOffset ret = self->OnSysSeek(0, wxFromEnd);
self->OnSysSeek(temp, wxFromStart);
return ret;
}
else
- return 0;
+ return wxInvalidOffset;
}
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;
}
return 0;
}
-off_t wxPyCBInputStream::OnSysSeek(off_t off, wxSeekMode mode) {
- wxPyBeginBlockThreads();
-#ifdef _LARGE_FILES
- // off_t is a 64-bit value...
- PyObject* arglist = Py_BuildValue("(Li)", off, mode);
-#else
- PyObject* arglist = Py_BuildValue("(ii)", off, mode);
-#endif
+
+wxFileOffset wxPyCBInputStream::OnSysSeek(wxFileOffset off, wxSeekMode mode) {
+ bool blocked = wxPyBeginBlockThreads();
+ PyObject* arglist = PyTuple_New(2);
+
+ if (sizeof(wxFileOffset) > sizeof(long))
+ // wxFileOffset is a 64-bit value...
+ PyTuple_SET_ITEM(arglist, 0, PyLong_FromLongLong(off));
+ else
+ PyTuple_SET_ITEM(arglist, 0, PyInt_FromLong(off));
+
+ PyTuple_SET_ITEM(arglist, 1, PyInt_FromLong(mode));
+
+
PyObject* result = PyEval_CallObject(m_seek, arglist);
Py_DECREF(arglist);
Py_XDECREF(result);
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
return OnSysTell();
}
-off_t wxPyCBInputStream::OnSysTell() const {
- wxPyBeginBlockThreads();
+wxFileOffset wxPyCBInputStream::OnSysTell() const {
+ bool blocked = wxPyBeginBlockThreads();
PyObject* arglist = Py_BuildValue("()");
PyObject* result = PyEval_CallObject(m_tell, arglist);
Py_DECREF(arglist);
- off_t o = 0;
+ wxFileOffset o = 0;
if (result != NULL) {
-#ifdef _LARGE_FILES
if (PyLong_Check(result))
o = PyLong_AsLongLong(result);
else
-#else
- o = PyInt_AsLong(result);
-#endif
+ o = PyInt_AsLong(result);
Py_DECREF(result);
};
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
return o;
}
//----------------------------------------------------------------------
-IMPLEMENT_ABSTRACT_CLASS(wxPyCallback, wxObject);
+IMPLEMENT_ABSTRACT_CLASS(wxPyCallback, wxEvtHandler);
wxPyCallback::wxPyCallback(PyObject* func) {
m_func = func;
}
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* result;
PyObject* arg;
PyObject* tuple;
+ bool checkSkip = false;
-
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
wxString className = event.GetClassInfo()->GetClassName();
- if (className == wxT("wxPyEvent"))
- arg = ((wxPyEvent*)&event)->GetSelf();
- else if (className == wxT("wxPyCommandEvent"))
- arg = ((wxPyCommandEvent*)&event)->GetSelf();
+ // If the event is one of these types then pass the original
+ // event object instead of the one passed to us.
+ if ( className == wxT("wxPyEvent") ) {
+ arg = ((wxPyEvent*)&event)->GetSelf();
+ checkSkip = ((wxPyEvent*)&event)->GetCloned();
+ }
+ else if ( className == wxT("wxPyCommandEvent") ) {
+ arg = ((wxPyCommandEvent*)&event)->GetSelf();
+ checkSkip = ((wxPyCommandEvent*)&event)->GetCloned();
+ }
else {
arg = wxPyConstructObject((void*)&event, className);
}
- tuple = PyTuple_New(1);
- PyTuple_SET_ITEM(tuple, 0, arg);
- result = PyEval_CallObject(func, tuple);
- Py_DECREF(tuple);
- if (result) {
- Py_DECREF(result);
- PyErr_Clear(); // Just in case...
- } else {
+ 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
+ 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 {
+ 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
+ // 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();
+ wxPyEndBlockThreads(blocked);
}
if (PyType_Check(klass)) { // new style classes
// This code is borrowed/adapted from _PyType_Lookup in typeobject.c
- // (TODO: This part is not tested yet, so I'm not sure it is correct...)
PyTypeObject* type = (PyTypeObject*)klass;
PyObject *mro, *res, *base, *dict;
/* Look in tp_dict of types in MRO */
// not from a base class...
if (PyMethod_Check(method) &&
(klass = PyMethod_GetDefiningClass(method, (char*)name)) != NULL &&
- ((klass == m_class) || PyClass_IsSubclass(klass, m_class))) {
+ ((klass == m_class) || PyObject_IsSubclass(klass, m_class))) {
// ...then we'll save a pointer to the method so callCallback can call it.
self->m_lastFound = method;
int wxPyCallbackHelper::callCallback(PyObject* argTuple) const {
PyObject* result;
- int retval = FALSE;
+ int retval = false;
result = callCallbackObj(argTuple);
if (result) { // Assumes an integer return type...
}
// Invoke the Python callable object, returning the raw PyObject return
-// value. Caller should DECREF the return value and also call PyEval_SaveThread.
+// value. Caller should DECREF the return value and also manage the GIL.
PyObject* wxPyCallbackHelper::callCallbackObj(PyObject* argTuple) const {
PyObject* result;
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() {
//m_self = Py_None; // **** We don't do normal ref counting to prevent
//Py_INCREF(m_self); // circular loops...
- m_cloned = FALSE;
+ m_cloned = false;
}
wxPyEvtSelfRef::~wxPyEvtSelfRef() {
- 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;
if (clone) {
Py_INCREF(m_self);
- m_cloned = TRUE;
+ m_cloned = true;
}
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
}
PyObject* wxPyEvtSelfRef::GetSelf() const {
IMPLEMENT_ABSTRACT_CLASS(wxPyCommandEvent, wxCommandEvent);
-wxPyEvent::wxPyEvent(int id)
- : wxEvent(id) {
+wxPyEvent::wxPyEvent(int winid, wxEventType commandType)
+ : wxEvent(winid, commandType) {
}
wxPyEvent::wxPyEvent(const wxPyEvent& evt)
: wxEvent(evt)
{
- SetSelf(evt.m_self, TRUE);
+ SetSelf(evt.m_self, true);
}
wxPyCommandEvent::wxPyCommandEvent(const wxPyCommandEvent& evt)
: wxCommandEvent(evt)
{
- SetSelf(evt.m_self, TRUE);
+ SetSelf(evt.m_self, true);
}
-//---------------------------------------------------------------------------
-//---------------------------------------------------------------------------
-
-
-wxPyTimer::wxPyTimer(PyObject* callback) {
- func = callback;
- Py_INCREF(func);
-}
-
-wxPyTimer::~wxPyTimer() {
- wxPyBeginBlockThreads();
- Py_DECREF(func);
- wxPyEndBlockThreads();
-}
-
-void wxPyTimer::Notify() {
- if (!func || func == Py_None) {
- wxTimer::Notify();
- }
- else {
- wxPyBeginBlockThreads();
-
- PyObject* result;
- PyObject* args = Py_BuildValue("()");
-
- result = PyEval_CallObject(func, args);
- Py_DECREF(args);
- if (result) {
- Py_DECREF(result);
- PyErr_Clear();
- } else {
- PyErr_Print();
- }
-
- wxPyEndBlockThreads();
- }
-}
-
-
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
-// Convert a wxList to a Python List
+// Convert a wxList to a Python List, only works for lists of wxObjects
-PyObject* wxPy_ConvertList(wxListBase* listbase, const char* className) {
+PyObject* wxPy_ConvertList(wxListBase* listbase) {
wxList* list = (wxList*)listbase; // this is probably bad...
PyObject* pyList;
PyObject* pyObj;
wxObject* wxObj;
wxNode* node = list->GetFirst();
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
pyList = PyList_New(0);
while (node) {
wxObj = node->GetData();
- pyObj = wxPyMake_wxObject(wxObj); //wxPyConstructObject(wxObj, className);
+ pyObj = wxPyMake_wxObject(wxObj,false);
PyList_Append(pyList, pyObj);
node = node->GetNext();
}
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
return pyList;
}
//----------------------------------------------------------------------
long wxPyGetWinHandle(wxWindow* win) {
+
#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;
- }
+#if defined(__WXGTK__) || defined(__WXX11)
+ return (long)GetXWindow(win);
#endif
- }
+
+#ifdef __WXMAC__
+ //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_FromEncodedObject(source, wxPyDefaultEncoding, "strict");
+ if (PyErr_Occurred()) return NULL;
+ }
+ target = new wxString();
+ size_t len = PyUnicode_GET_SIZE(uni);
+ if (len) {
+ PyUnicode_AsWideChar((PyUnicodeObject*)uni, target->GetWriteBuf(len), len);
+ target->UngetWriteBuf(len);
}
+
+ if (PyString_Check(source))
+ Py_DECREF(uni);
#else
- char* tmpPtr; int tmpSize;
- if (PyString_AsStringAndSize(source, &tmpPtr, &tmpSize) == -1) {
- PyErr_SetString(PyExc_TypeError, "Unable to convert string");
- return NULL;
+ // Convert to a string object if it isn't already, then to wxString
+ PyObject* str = source;
+ if (PyUnicode_Check(source)) {
+ str = PyUnicode_AsEncodedString(source, wxPyDefaultEncoding, "strict");
+ if (PyErr_Occurred()) return NULL;
+ }
+ else if (!PyString_Check(source)) {
+ str = PyObject_Str(source);
+ if (PyErr_Occurred()) return NULL;
}
+ char* tmpPtr; int tmpSize;
+ PyString_AsStringAndSize(str, &tmpPtr, &tmpSize);
target = new 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)) {
- 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
+ // Convert to a unicode object, if not already, then to a wxString
+ PyObject* uni = source;
+ if (!PyUnicode_Check(source)) {
+ uni = PyUnicode_FromEncodedObject(source, wxPyDefaultEncoding, "strict");
+ if (PyErr_Occurred()) return wxEmptyString; // TODO: should we PyErr_Clear?
+ }
+ size_t len = PyUnicode_GET_SIZE(uni);
+ if (len) {
+ PyUnicode_AsWideChar((PyUnicodeObject*)uni, target.GetWriteBuf(len), len);
+ target.UngetWriteBuf();
+ }
+
+ if (!PyUnicode_Check(source))
+ Py_DECREF(uni);
+#else
+ // Convert to a string object if it isn't already, then to wxString
+ PyObject* str = source;
if (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);
+ str = PyUnicode_AsEncodedString(source, wxPyDefaultEncoding, "strict");
+ if (PyErr_Occurred()) return wxEmptyString; // TODO: should we PyErr_Clear?
+ }
+ else if (!PyString_Check(source)) {
+ str = PyObject_Str(source);
+ if (PyErr_Occurred()) return wxEmptyString; // TODO: should we PyErr_Clear?
}
-#else
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;
}
}
+
+void wxSetDefaultPyEncoding(const char* encoding)
+{
+ strncpy(wxPyDefaultEncoding, encoding, DEFAULTENCODING_SIZE);
+}
+
+const char* wxGetDefaultPyEncoding()
+{
+ return wxPyDefaultEncoding;
+}
+
//----------------------------------------------------------------------
point->y = (int)PyFloat_AS_DOUBLE(o2);
return true;
}
- if (PyInstance_Check(o1) || PyInstance_Check(o2)) {
+ if (wxPySwigInstance_Check(o1) || wxPySwigInstance_Check(o2)) { // TODO: Why???
// Disallow instances because they can cause havok
return false;
}
goto error2;
}
}
- else if (PyInstance_Check(o)) {
+ else if (wxPySwigInstance_Check(o)) {
wxPoint* pt;
- if (SWIG_GetPtrObj(o, (void **)&pt, "_wxPoint_p")) {
+ if (! wxPyConvertSwigPtr(o, (void **)&pt, wxT("wxPoint"))) {
goto error2;
}
temp[x] = *pt;
}
for (int x=0; x<count; x++) {
PyObject* o = PyList_GetItem(source, x);
- if (PyInstance_Check(o)) {
+ if (wxPySwigInstance_Check(o)) {
wxBitmap* pt;
- if (SWIG_GetPtrObj(o, (void **) &pt,"_wxBitmap_p")) {
- PyErr_SetString(PyExc_TypeError,"Expected _wxBitmap_p.");
+ if (! wxPyConvertSwigPtr(o, (void **) &pt, wxT("wxBitmap"))) {
+ PyErr_SetString(PyExc_TypeError,"Expected wxBitmap.");
return NULL;
}
temp[x] = pt;
}
for (int x=0; x<count; x++) {
PyObject* o = PyList_GetItem(source, x);
- if (PyInstance_Check(o)) {
+ if (wxPySwigInstance_Check(o)) {
wxAcceleratorEntry* ae;
- if (SWIG_GetPtrObj(o, (void **) &ae,"_wxAcceleratorEntry_p")) {
- PyErr_SetString(PyExc_TypeError,"Expected _wxAcceleratorEntry_p.");
+ if (! wxPyConvertSwigPtr(o, (void **) &ae, wxT("wxAcceleratorEntry"))) {
+ PyErr_SetString(PyExc_TypeError,"Expected wxAcceleratorEntry.");
return NULL;
}
temp[x] = *ae;
}
for (int x=0; x<count; x++) {
PyObject* o = PyList_GetItem(source, x);
- if (PyInstance_Check(o)) {
+ if (wxPySwigInstance_Check(o)) {
wxPen* pt;
- if (SWIG_GetPtrObj(o, (void **) &pt,"_wxPen_p")) {
+ if (! wxPyConvertSwigPtr(o, (void **)&pt, wxT("wxPen"))) {
delete temp;
- PyErr_SetString(PyExc_TypeError,"Expected _wxPen_p.");
+ PyErr_SetString(PyExc_TypeError,"Expected wxPen.");
return NULL;
}
temp[x] = pt;
PyObject *o1, *o2;
if (!PySequence_Check(source) || PySequence_Length(source) != 2)
- return FALSE;
+ return false;
if (isFast) {
o1 = PySequence_Fast_GET_ITEM(source, 0);
Py_DECREF(o1);
Py_DECREF(o2);
}
- return TRUE;
+ return true;
}
PyObject *o1, *o2, *o3, *o4;
if (!PySequence_Check(source) || PySequence_Length(source) != 4)
- return FALSE;
+ return false;
if (isFast) {
o1 = PySequence_Fast_GET_ITEM(source, 0);
Py_DECREF(o3);
Py_DECREF(o4);
}
- return TRUE;
+ return true;
}
//----------------------------------------------------------------------
-bool wxSize_helper(PyObject* source, wxSize** obj) {
+bool wxPySimple_typecheck(PyObject* source, const wxChar* classname, int seqLen)
+{
+ void* ptr;
- // If source is an object instance then it may already be the right type
- if (PyInstance_Check(source)) {
- wxSize* ptr;
- if (SWIG_GetPtrObj(source, (void **)&ptr, "_wxSize_p"))
- goto error;
- *obj = ptr;
- return TRUE;
- }
- // otherwise a 2-tuple of integers is expected
- else if (PySequence_Check(source) && PyObject_Length(source) == 2) {
- PyObject* o1 = PySequence_GetItem(source, 0);
- PyObject* o2 = PySequence_GetItem(source, 1);
- if (!PyNumber_Check(o1) || !PyNumber_Check(o2)) {
- Py_DECREF(o1);
- Py_DECREF(o2);
- goto error;
- }
- **obj = wxSize(PyInt_AsLong(o1), PyInt_AsLong(o2));
- Py_DECREF(o1);
- Py_DECREF(o2);
- return TRUE;
- }
+ if (wxPySwigInstance_Check(source) &&
+ wxPyConvertSwigPtr(source, (void **)&ptr, classname))
+ return true;
- error:
- PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of integers or a wxSize object.");
- return FALSE;
+ 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 is an object instance then it may already be the right type
- if (PyInstance_Check(source)) {
- wxPoint* ptr;
- if (SWIG_GetPtrObj(source, (void **)&ptr, "_wxPoint_p"))
- goto error;
- *obj = ptr;
- return TRUE;
- }
- // otherwise a length-2 sequence of integers is expected
- if (PySequence_Check(source) && PySequence_Length(source) == 2) {
- PyObject* o1 = PySequence_GetItem(source, 0);
- PyObject* o2 = PySequence_GetItem(source, 1);
- // This should really check for integers, not numbers -- but that would break code.
- if (!PyNumber_Check(o1) || !PyNumber_Check(o2)) {
- Py_DECREF(o1);
- Py_DECREF(o2);
- goto error;
- }
- **obj = wxPoint(PyInt_AsLong(o1), PyInt_AsLong(o2));
- Py_DECREF(o1);
- Py_DECREF(o2);
- return TRUE;
+bool wxPoint_helper(PyObject* source, wxPoint** obj)
+{
+ if (source == Py_None) {
+ **obj = wxPoint(-1,-1);
+ return true;
}
- error:
- PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of integers or a wxPoint object.");
- return FALSE;
+ 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 (PyInstance_Check(source)) {
+ if (wxPySwigInstance_Check(source)) {
wxRealPoint* ptr;
- if (SWIG_GetPtrObj(source, (void **)&ptr, "_wxRealPoint_p"))
+ if (! wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxRealPoint")))
goto error;
*obj = ptr;
- return TRUE;
+ return true;
}
// otherwise a 2-tuple of floats is expected
else if (PySequence_Check(source) && PyObject_Length(source) == 2) {
**obj = wxRealPoint(PyFloat_AsDouble(o1), PyFloat_AsDouble(o2));
Py_DECREF(o1);
Py_DECREF(o2);
- return TRUE;
+ return true;
}
error:
PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of floats or a wxRealPoint object.");
- return FALSE;
+ return false;
}
-
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 (PyInstance_Check(source)) {
+ if (wxPySwigInstance_Check(source)) {
wxRect* ptr;
- if (SWIG_GetPtrObj(source, (void **)&ptr, "_wxRect_p"))
+ if (! wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxRect")))
goto error;
*obj = ptr;
- return TRUE;
+ return true;
}
// otherwise a 4-tuple of integers is expected
else if (PySequence_Check(source) && PyObject_Length(source) == 4) {
Py_DECREF(o2);
Py_DECREF(o3);
Py_DECREF(o4);
- return TRUE;
+ return true;
}
error:
PyErr_SetString(PyExc_TypeError, "Expected a 4-tuple of integers or a wxRect object.");
- return FALSE;
+ return false;
}
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 (PyInstance_Check(source)) {
+ if (wxPySwigInstance_Check(source)) {
wxColour* ptr;
- if (SWIG_GetPtrObj(source, (void **)&ptr, "_wxColour_p"))
+ if (! wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxColour")))
goto error;
*obj = ptr;
- return TRUE;
+ return true;
}
// otherwise check for a string
else if (PyString_Check(source) || PyUnicode_Check(source)) {
spec.Mid(5,2).ToLong(&blue, 16);
**obj = wxColour(red, green, blue);
- return TRUE;
+ return true;
}
else { // it's a colour name
**obj = wxColour(spec);
- return TRUE;
+ return true;
}
}
// last chance: 3-tuple of integers is expected
Py_DECREF(o1);
Py_DECREF(o2);
Py_DECREF(o3);
- return TRUE;
+ return true;
}
error:
PyErr_SetString(PyExc_TypeError,
"Expected a wxColour object or a string containing a colour name or '#RRGGBB'.");
- return FALSE;
+ return false;
}
+bool wxColour_typecheck(PyObject* source) {
+
+ if (wxPySimple_typecheck(source, wxT("wxColour"), 3))
+ return true;
+
+ if (PyString_Check(source) || PyUnicode_Check(source))
+ return true;
+
+ return false;
+}
+
+
+
+bool wxPoint2D_helper(PyObject* source, wxPoint2D** obj) {
+
+ if (source == Py_None) {
+ **obj = wxPoint2D(-1,-1);
+ return true;
+ }
-bool wxPoint2DDouble_helper(PyObject* source, wxPoint2DDouble** obj) {
// If source is an object instance then it may already be the right type
- if (PyInstance_Check(source)) {
- wxPoint2DDouble* ptr;
- if (SWIG_GetPtrObj(source, (void **)&ptr, "_wxPoint2DDouble_p"))
+ if (wxPySwigInstance_Check(source)) {
+ wxPoint2D* ptr;
+ if (! wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxPoint2D")))
goto error;
*obj = ptr;
- return TRUE;
+ return true;
}
// otherwise a length-2 sequence of floats is expected
if (PySequence_Check(source) && PySequence_Length(source) == 2) {
PyObject* o1 = PySequence_GetItem(source, 0);
PyObject* o2 = PySequence_GetItem(source, 1);
- // This should really check for integers, not numbers -- but that would break code.
+ // This should really check for floats, not numbers -- but that would break code.
if (!PyNumber_Check(o1) || !PyNumber_Check(o2)) {
Py_DECREF(o1);
Py_DECREF(o2);
goto error;
}
- **obj = wxPoint2DDouble(PyFloat_AsDouble(o1), PyFloat_AsDouble(o2));
+ **obj = wxPoint2D(PyFloat_AsDouble(o1), PyFloat_AsDouble(o2));
Py_DECREF(o1);
Py_DECREF(o2);
- return TRUE;
+ return true;
}
error:
- PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of floats or a wxPoint2DDouble object.");
- return FALSE;
+ PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of floats or a wxPoint2D object.");
+ return false;
}
-
//----------------------------------------------------------------------
PyObject* wxArrayString2PyList_helper(const wxArrayString& arr) {
projects / wxWidgets.git / blobdiff