X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0122b7e3fcfd78f879470053c91a60e3c66537a3..c88040761c79ddfa36bcbb0242165eca06201ffb:/wxPython/src/helpers.h diff --git a/wxPython/src/helpers.h b/wxPython/src/helpers.h index b9c07e3a84..62230c6400 100644 --- a/wxPython/src/helpers.h +++ b/wxPython/src/helpers.h @@ -134,6 +134,7 @@ wxPoint* wxPoint_LIST_helper(PyObject* source, int* npoints); wxBitmap** wxBitmap_LIST_helper(PyObject* source); wxString* wxString_LIST_helper(PyObject* source); wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); +wxPen** wxPen_LIST_helper(PyObject* source); bool wxSize_helper(PyObject* source, wxSize** obj); bool wxPoint_helper(PyObject* source, wxPoint** obj); @@ -141,6 +142,20 @@ bool wxRealPoint_helper(PyObject* source, wxRealPoint** obj); bool wxRect_helper(PyObject* source, wxRect** obj); bool wxColour_helper(PyObject* source, wxColour** obj); +#if PYTHON_API_VERSION < 1009 +#define PySequence_Fast_GET_ITEM(o, i) \ + (PyList_Check(o) ? PyList_GET_ITEM(o, i) : PyTuple_GET_ITEM(o, i)) +#endif + +bool _2int_seq_helper(PyObject* source, int* i1, int* i2); +bool _4int_seq_helper(PyObject* source, int* i1, int* i2, int* i3, int* i4); + + +PyObject* wxArrayString2PyList_helper(const wxArrayString& app); + + +#define RETURN_NONE() { Py_INCREF(Py_None); return Py_None; } + //---------------------------------------------------------------------- #ifndef SWIGCODE @@ -1505,6 +1520,7 @@ public: wxPyEndBlockThreads(state); \ if (! found) \ return PCLASS::CBNAME(e); \ + return rval; \ } \ bool CLASS::base_##CBNAME(wxMouseEvent& e) { \ return PCLASS::CBNAME(e); \