X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9f8a9f548973be3033383aa235edadcf858336e8..b5bc23fbcf4cf14be634c513c6601665d155801d:/wxPython/src/my_typemaps.i diff --git a/wxPython/src/my_typemaps.i b/wxPython/src/my_typemaps.i index da6de8d8eb..958ac1eac5 100644 --- a/wxPython/src/my_typemaps.i +++ b/wxPython/src/my_typemaps.i @@ -47,10 +47,10 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field) // wxString typemaps -%typemap(in) wxString& (bool temp=False) { +%typemap(in) wxString& (bool temp=false) { $1 = wxString_in_helper($input); if ($1 == NULL) SWIG_fail; - temp = True; + temp = true; } %typemap(freearg) wxString& { if (temp$argnum) @@ -101,7 +101,7 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field) //--------------------------------------------------------------------------- // wxMemoryBuffer (needed for wxSTC) -%typemap(in) wxMemoryBuffer& (bool temp=False) { +%typemap(in) wxMemoryBuffer& (bool temp=false) { if (!PyString_Check($input)) { PyErr_SetString(PyExc_TypeError, "String buffer expected"); SWIG_fail; @@ -109,7 +109,7 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field) char* str = PyString_AS_STRING($input); int len = PyString_GET_SIZE($input); $1 = new wxMemoryBuffer(len); - temp = True; + temp = true; memcpy($1->GetData(), str, len); $1->SetDataLen(len); } @@ -124,6 +124,14 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field) +%typemap(out) wxCharBuffer { + if ($1.data()) + $result = PyString_FromString((char*)$1.data()); + else + $result = PyString_FromString(""); +} + + //--------------------------------------------------------------------------- // Typemaps to convert Python sequence objects (tuples, etc.) to // wxSize, wxPoint, wxRealPoint, and wxRect. @@ -174,6 +182,15 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field) } +%typemap(in) wxRect2D& (wxRect2D temp) { + $1 = &temp; + if ( ! wxRect2D_helper($input, &$1)) SWIG_fail; +} +%typemap(typecheck, precedence=SWIG_TYPECHECK_POINTER) wxRect2D& { + $1 = wxPySimple_typecheck($input, wxT("wxRect2D"), 4); +} + + //--------------------------------------------------------------------------- // Typemap to convert strings to wxColour. Two string formats are accepted, // either a colour name, or a hex colour spec like "#RRGGBB" @@ -186,30 +203,24 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field) $1 = wxColour_typecheck($input); } - - //--------------------------------------------------------------------------- // Typemap for wxArrayString from Python sequence objects -%typemap(in) wxArrayString& (bool temp=False) { +%typemap(in) wxArrayString& (bool temp=false) { if (! PySequence_Check($input)) { PyErr_SetString(PyExc_TypeError, "Sequence of strings expected."); SWIG_fail; } $1 = new wxArrayString; - temp = True; + temp = true; int i, len=PySequence_Length($input); for (i=0; iAdd(Py2wxString(str)); + $1->Add(*s); + delete s; Py_DECREF(item); - Py_DECREF(str); } } @@ -220,17 +231,21 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field) //--------------------------------------------------------------------------- // Typemap for wxArrayInt from Python sequence objects -%typemap(in) wxArrayInt& (bool temp=False) { +%typemap(in) wxArrayInt& (bool temp=false) { if (! PySequence_Check($input)) { PyErr_SetString(PyExc_TypeError, "Sequence of integers expected."); SWIG_fail; } $1 = new wxArrayInt; - temp = True; + temp = true; int i, len=PySequence_Length($input); for (i=0; iAdd(PyInt_AS_LONG(number)); Py_DECREF(item); Py_DECREF(number); @@ -244,24 +259,42 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field) //--------------------------------------------------------------------------- // Typemaps to convert an array of ints to a list for return values +// %typemap(out) wxArrayInt& { +// $result = PyList_New(0); +// size_t idx; +// for (idx = 0; idx < $1->GetCount(); idx += 1) { +// PyObject* val = PyInt_FromLong( $1->Item(idx) ); +// PyList_Append($result, val); +// Py_DECREF(val); +// } +// } + +// %typemap(out) wxArrayInt { +// $result = PyList_New(0); +// size_t idx; +// for (idx = 0; idx < $1.GetCount(); idx += 1) { +// PyObject* val = PyInt_FromLong( $1.Item(idx) ); +// PyList_Append($result, val); +// Py_DECREF(val); +// } +// } + %typemap(out) wxArrayInt& { - $result = PyList_New(0); - size_t idx; - for (idx = 0; idx < $1->GetCount(); idx += 1) { - PyObject* val = PyInt_FromLong( $1->Item(idx) ); - PyList_Append($result, val); - Py_DECREF(val); - } + $result = wxArrayInt2PyList_helper(*$1); } %typemap(out) wxArrayInt { - $result = PyList_New(0); - size_t idx; - for (idx = 0; idx < $1.GetCount(); idx += 1) { - PyObject* val = PyInt_FromLong( $1.Item(idx) ); - PyList_Append($result, val); - Py_DECREF(val); - } + $result = wxArrayInt2PyList_helper($1); +} + + +// convert array of doubles to a Python list +%typemap(out) wxArrayDouble& { + $result = wxArrayDouble2PyList_helper(*$1); +} + +%typemap(out) wxArrayDouble { + $result = wxArrayDouble2PyList_helper($1); } @@ -283,60 +316,22 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field) } -// These fragments are iserted in modules that need to convert PyObjects to -// integer values, my versions allow any numeric type to be used, as long as -// it can be converted to a PyInt. (Specifically, I allow floats where the -// default SWIG_AsLong would raise an obsucre exception from within -// PyLong_AsLong.) +//--------------------------------------------------------------------------- +// wxFileOffset, can be a 32-bit or a 64-bit integer -%fragment("SWIG_AsLong","header") %{ -SWIGSTATICINLINE(long) -SWIG_AsLong(PyObject * obj) -{ - if (PyNumber_Check(obj)) - return PyInt_AsLong(obj); - else { - PyObject* errmsg = PyString_FromFormat("Expected number, got %s", - obj->ob_type->tp_name); - PyErr_SetObject(PyExc_TypeError, errmsg); - Py_DECREF(errmsg); - return 0; - } +%typemap(in) wxFileOffset { + if (sizeof(wxFileOffset) > sizeof(long)) + $1 = PyLong_AsLongLong($input); + else + $1 = PyInt_AsLong($input); } -%} -%fragment("SWIG_AsUnsignedLong","header", fragment="SWIG_AsLong") %{ -SWIGSTATICINLINE(unsigned long) -SWIG_AsUnsignedLong(PyObject * obj) -{ - if (PyLong_Check(obj)) { - return PyLong_AsUnsignedLong(obj); - } else { - long i = SWIG_AsLong(obj); - if ( !PyErr_Occurred() && (i < 0)) { - PyErr_SetString(PyExc_TypeError, "negative value received for unsigned type"); - } - return i; - } +%typemap(out) wxFileOffset { + if (sizeof(wxFileOffset) > sizeof(long)) + $result = PyLong_FromLongLong($1); + else + $result = PyInt_FromLong($1); } -%} - - -%fragment("SWIG_AsDouble","header") %{ -SWIGSTATICINLINE(double) -SWIG_AsDouble(PyObject *obj) -{ - if (PyNumber_Check(obj)) - return PyFloat_AsDouble(obj); - else { - PyObject* errmsg = PyString_FromFormat("Expected number, got %s", - obj->ob_type->tp_name); - PyErr_SetObject(PyExc_TypeError, errmsg); - Py_DECREF(errmsg); - return 0; - } -} -%} //--------------------------------------------------------------------------- @@ -354,6 +349,26 @@ SWIG_AsDouble(PyObject *obj) } +//--------------------------------------------------------------------------- +// Typemaps for loading a image or bitmap from an object that implements the +// buffer interface + +%typemap(in) (buffer data, int DATASIZE) (Py_ssize_t temp) +{ + if (PyObject_AsReadBuffer($input, (const void**)(&$1), &temp) == -1) SWIG_fail; + $2 = (int)temp; +} + +%typemap(in) (buffer alpha, int ALPHASIZE) (Py_ssize_t temp) +{ + if ($input != Py_None) { + if (PyObject_AsReadBuffer($input, (const void**)(&$1), &temp) == -1) SWIG_fail; + $2 = (int)temp; + } +} + + + //--------------------------------------------------------------------------- // Typemaps to convert return values that are base class pointers // to the real derived type, if possible. See wxPyMake_wxObject in @@ -362,51 +377,51 @@ SWIG_AsDouble(PyObject *obj) // NOTE: For those classes that also call _setOORInfo these typemaps should be // disabled for the constructor. -%typemap(out) wxEvtHandler* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxMenu* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxValidator* { $result = wxPyMake_wxObject($1, $owner); } - -%typemap(out) wxApp* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxPyApp* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxDC* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxFSFile* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxFileSystem* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxImageList* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxListItem* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxMenuItem* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxMouseEvent* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxObject* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxPyPrintout* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxToolBarToolBase* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxToolTip* { $result = wxPyMake_wxObject($1, $owner); } - - -%typemap(out) wxBitmapButton* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxButton* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxControl* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxFrame* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxGrid* { $result = wxPyMake_wxObject($1, $owner); } -//%typemap(out) wxListCtrl* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxMDIChildFrame* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxMDIClientWindow* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxMenuBar* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxNotebook* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxStaticBox* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxStatusBar* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxTextCtrl* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxToolBar* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxToolBarBase* { $result = wxPyMake_wxObject($1, $owner); } -//%typemap(out) wxTreeCtrl* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxPyTreeCtrl* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxWindow* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxPyHtmlWindow* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxWizardPage* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxPyWizardPage* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxPanel* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxDialog* { $result = wxPyMake_wxObject($1, $owner); } -%typemap(out) wxScrolledWindow* { $result = wxPyMake_wxObject($1, $owner); } - -%typemap(out) wxSizer* { $result = wxPyMake_wxSizer($1, $owner); } +%typemap(out) wxEvtHandler* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxMenu* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxValidator* { $result = wxPyMake_wxObject($1, (bool)$owner); } + +%typemap(out) wxApp* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxPyApp* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxDC* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxFSFile* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxFileSystem* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxImageList* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxImage* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxListItem* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxMenuItem* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxMouseEvent* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxObject* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxPyPrintout* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxToolBarToolBase* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxToolTip* { $result = wxPyMake_wxObject($1, (bool)$owner); } + + +%typemap(out) wxBitmapButton* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxButton* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxControl* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxFrame* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxGrid* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxPyListCtrl* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxMDIChildFrame* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxMDIClientWindow* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxMenuBar* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxNotebook* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxStaticBox* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxStatusBar* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxTextCtrl* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxToolBar* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxToolBarBase* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxPyTreeCtrl* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxWindow* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxPyHtmlWindow* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxWizardPage* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxPyWizardPage* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxPanel* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxDialog* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxScrolledWindow* { $result = wxPyMake_wxObject($1, (bool)$owner); } + +%typemap(out) wxSizer* { $result = wxPyMake_wxObject($1, (bool)$owner); } //---------------------------------------------------------------------------