X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/54b29c1f984846f6a2a0bd26296c43c6bf7c300a..30e24d9dd5a5abf1c9a375ea259eb239b122b7f7:/wxPython/src/my_typemaps.i diff --git a/wxPython/src/my_typemaps.i b/wxPython/src/my_typemaps.i index ff4994d928..958ac1eac5 100644 --- a/wxPython/src/my_typemaps.i +++ b/wxPython/src/my_typemaps.i @@ -11,20 +11,27 @@ ///////////////////////////////////////////////////////////////////////////// -//--------------------------------------------------------------------------- -// Tell SWIG to wrap all the wrappers with our thread protection +//---------------------------------------------------------------------- +// Typemaps to convert a list of items to an int (size) and an array -%exception { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - $action - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; -} +%define MAKE_INT_ARRAY_TYPEMAPS(NAME, ARR_NAME) + %typemap(in) (int NAME, int* ARR_NAME) { + $1 = PyList_Size($input); + $2 = int_LIST_helper($input); + if ($2 == NULL) SWIG_fail; + } + %typemap(freearg) (int NAME, int* ARR_NAME) { + if ($2) delete [] $2; + } +%enddef -//---------------------------------------------------------------------- -// Typemaps to convert a list of items to an int (size) and an array +MAKE_INT_ARRAY_TYPEMAPS(widths, widths_field) +MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field) + + +// Same things for a wxString %typemap(in) (int choices, wxString* choices_array ) { $1 = PyList_Size($input); $2 = wxString_LIST_helper($input); @@ -35,14 +42,15 @@ } + //--------------------------------------------------------------------------- // 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) @@ -85,8 +93,44 @@ $1 = *sptr; delete sptr; } - - + +%typemap(typecheck, precedence=SWIG_TYPECHECK_POINTER) wxString& { + $1 = PyString_Check($input) || PyUnicode_Check($input); +} + +//--------------------------------------------------------------------------- +// wxMemoryBuffer (needed for wxSTC) + +%typemap(in) wxMemoryBuffer& (bool temp=false) { + if (!PyString_Check($input)) { + PyErr_SetString(PyExc_TypeError, "String buffer expected"); + SWIG_fail; + } + char* str = PyString_AS_STRING($input); + int len = PyString_GET_SIZE($input); + $1 = new wxMemoryBuffer(len); + temp = true; + memcpy($1->GetData(), str, len); + $1->SetDataLen(len); +} + +%typemap(freearg) wxMemoryBuffer& { + if (temp$argnum) delete $1; +} + +%typemap(out) wxMemoryBuffer { + $result = PyString_FromStringAndSize((char*)$1.GetData(), $1.GetDataLen()); +} + + + +%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 @@ -138,6 +182,15 @@ } +%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" @@ -150,48 +203,49 @@ $1 = wxColour_typecheck($input); } - - //--------------------------------------------------------------------------- // Typemap for wxArrayString from Python sequence objects -%typemap(in) wxArrayString& { +%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; int i, len=PySequence_Length($input); for (i=0; iAdd(Py2wxString(str)); + wxString* s = wxString_in_helper(item); + if (PyErr_Occurred()) SWIG_fail; + $1->Add(*s); + delete s; Py_DECREF(item); - Py_DECREF(str); } } %typemap(freearg) wxArrayString& { - if ($1) delete $1; + if (temp$argnum) delete $1; } //--------------------------------------------------------------------------- // Typemap for wxArrayInt from Python sequence objects -%typemap(in) wxArrayInt& { +%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; int i, len=PySequence_Length($input); for (i=0; iAdd(PyInt_AS_LONG(number)); Py_DECREF(item); Py_DECREF(number); @@ -199,35 +253,53 @@ } %typemap(freearg) wxArrayInt& { - if ($1) delete $1; + if (temp$argnum) delete $1; } //--------------------------------------------------------------------------- // 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); +} -// Typemaps to convert an array of ints to a list for return values + +// Typemaps to convert an array of strings to a list for return values %typemap(out) wxArrayString& { $result = wxArrayString2PyList_helper(*$1); } @@ -237,61 +309,120 @@ } +//--------------------------------------------------------------------------- + +%typemap(out) bool { + $result = $1 ? Py_True : Py_False; Py_INCREF($result); +} + + +//--------------------------------------------------------------------------- +// wxFileOffset, can be a 32-bit or a 64-bit integer + +%typemap(in) wxFileOffset { + if (sizeof(wxFileOffset) > sizeof(long)) + $1 = PyLong_AsLongLong($input); + else + $1 = PyInt_AsLong($input); +} + +%typemap(out) wxFileOffset { + if (sizeof(wxFileOffset) > sizeof(long)) + $result = PyLong_FromLongLong($1); + else + $result = PyInt_FromLong($1); +} + + +//--------------------------------------------------------------------------- +// Typemap for when GDI objects are returned by reference. This will cause a +// copy to be made instead of returning a reference to the same instance. The +// GDI object's internal refcounting scheme will do a copy-on-write of the +// internal data as needed. + +// These too? +//, wxRegion&, wxPalette& + +%typemap(out) wxBrush&, wxPen&, wxFont&, wxBitmap&, wxIcon&, wxCursor& { + $*1_ltype* resultptr = new $*1_ltype(*$1); + $result = SWIG_NewPointerObj((void*)(resultptr), $1_descriptor, 1); +} + + +//--------------------------------------------------------------------------- +// 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 // helpers.cpp -%typemap(out) wxEvtHandler* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxMenu* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxValidator* { $result = wxPyMake_wxObject($1); } - -%typemap(out) wxApp* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxPyApp* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxDC* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxFSFile* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxFileSystem* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxGridTableBase* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxImageList* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxListItem* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxMenuItem* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxMouseEvent* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxObject* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxPyPrintout* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxToolBarToolBase* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxToolTip* { $result = wxPyMake_wxObject($1); } - - -%typemap(out) wxBitmapButton* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxButton* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxControl* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxFrame* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxGrid* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxListCtrl* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxMDIChildFrame* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxMDIClientWindow* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxMenuBar* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxNotebook* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxStaticBox* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxStatusBar* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxTextCtrl* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxToolBar* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxToolBarBase* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxTreeCtrl* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxPyTreeCtrl* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxWindow* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxHtmlWindow* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxPyHtmlWindow* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxWizardPage* { $result = wxPyMake_wxObject($1); } - -%typemap(out) wxSizer* { $result = wxPyMake_wxSizer($1); } - - -//%typemap(python, out) wxHtmlCell* { $target = wxPyMake_wxObject($source); } -//%typemap(python, out) wxHtmlContainerCell* { $target = wxPyMake_wxObject($source); } -//%typemap(python, out) wxHtmlParser* { $target = wxPyMake_wxObject($source); } -//%typemap(python, out) wxHtmlWinParser* { $target = wxPyMake_wxObject($source); } +// NOTE: For those classes that also call _setOORInfo these typemaps should be +// disabled for the constructor. + +%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); } + //--------------------------------------------------------------------------- //---------------------------------------------------------------------------