X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7a446686f062b8abbedf34c01ef56c75396a8ab1..0a5bb138a71dfc1c706fc0858fb2801500e2c2e8:/wxPython/src/my_typemaps.i diff --git a/wxPython/src/my_typemaps.i b/wxPython/src/my_typemaps.i index 99df23b9e7..958ac1eac5 100644 --- a/wxPython/src/my_typemaps.i +++ b/wxPython/src/my_typemaps.i @@ -11,283 +11,424 @@ ///////////////////////////////////////////////////////////////////////////// -//--------------------------------------------------------------------------- -// Tell SWIG to wrap all the wrappers with Python's thread macros - -%except(python) { - wxPy_BEGIN_ALLOW_THREADS; - $function - wxPy_END_ALLOW_THREADS; -} - //---------------------------------------------------------------------- -// LCOUNT and choices go together. They allow a single Python list to be -// converted to an integer count and an array count items long. +// Typemaps to convert a list of items to an int (size) and an array -%typemap(python,build) int LCOUNT { - if (_in_choices) { - $target = PyList_Size(_in_choices); +%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; } - else { - $target = 0; + + %typemap(freearg) (int NAME, int* ARR_NAME) { + if ($2) delete [] $2; } -} +%enddef +MAKE_INT_ARRAY_TYPEMAPS(widths, widths_field) +MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field) + -%typemap(python,in) byte* choices { - $target = byte_LIST_helper($source); - if ($target == NULL) { - return NULL; - } +// Same things for a wxString +%typemap(in) (int choices, wxString* choices_array ) { + $1 = PyList_Size($input); + $2 = wxString_LIST_helper($input); + if ($2 == NULL) SWIG_fail; } -%typemap(python,freearg) byte* choices { - delete [] $source; +%typemap(freearg) (int choices, wxString* choices_array ) { + if ($2) delete [] $2; } -// wxDash is a signed char -%typemap(python,in) wxDash* choices { - $target = (wxDash*)byte_LIST_helper($source); - if ($target == NULL) { - return NULL; - } + + +//--------------------------------------------------------------------------- +// wxString typemaps + + +%typemap(in) wxString& (bool temp=false) { + $1 = wxString_in_helper($input); + if ($1 == NULL) SWIG_fail; + temp = true; } -%typemap(python,freearg) wxDash* choices { - delete [] $source; +%typemap(freearg) wxString& { + if (temp$argnum) + delete $1; } +%typemap(out) wxString& { +%#if wxUSE_UNICODE + $result = PyUnicode_FromWideChar($1->c_str(), $1->Len()); +%#else + $result = PyString_FromStringAndSize($1->c_str(), $1->Len()); +%#endif +} -%typemap(python,in) int* choices { - $target = int_LIST_helper($source); - if ($target == NULL) { - return NULL; - } + +%apply wxString& { wxString* } + + + +%typemap(out) wxString { +%#if wxUSE_UNICODE + $result = PyUnicode_FromWideChar($1.c_str(), $1.Len()); +%#else + $result = PyString_FromStringAndSize($1.c_str(), $1.Len()); +%#endif } -%typemap(python,freearg) int* choices { - delete [] $source; + +%typemap(varout) wxString { +%#if wxUSE_UNICODE + $result = PyUnicode_FromWideChar($1.c_str(), $1.Len()); +%#else + $result = PyString_FromStringAndSize($1.c_str(), $1.Len()); +%#endif } -%typemap(python,in) long* choices { - $target = long_LIST_helper($source); - if ($target == NULL) { - return NULL; - } +%typemap(in) wxString { + wxString* sptr = wxString_in_helper($input); + if (sptr == NULL) SWIG_fail; + $1 = *sptr; + delete sptr; } -%typemap(python,freearg) long* choices { - delete [] $source; + +%typemap(typecheck, precedence=SWIG_TYPECHECK_POINTER) wxString& { + $1 = PyString_Check($input) || PyUnicode_Check($input); } +//--------------------------------------------------------------------------- +// wxMemoryBuffer (needed for wxSTC) -%typemap(python,in) unsigned long* choices { - $target = (unsigned long*)long_LIST_helper($source); - if ($target == NULL) { - return NULL; +%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(python,freearg) unsigned long* choices { - delete [] $source; + +%typemap(freearg) wxMemoryBuffer& { + if (temp$argnum) delete $1; } +%typemap(out) wxMemoryBuffer { + $result = PyString_FromStringAndSize((char*)$1.GetData(), $1.GetDataLen()); +} -%typemap(python,in) char** choices { - $target = string_LIST_helper($source); - if ($target == NULL) { - return NULL; - } + + +%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. + + +%typemap(in) wxSize& (wxSize temp) { + $1 = &temp; + if ( ! wxSize_helper($input, &$1)) SWIG_fail; } -%typemap(python,freearg) char** choices { - delete [] $source; +%typemap(typecheck, precedence=SWIG_TYPECHECK_POINTER) wxSize& { + $1 = wxPySimple_typecheck($input, wxT("wxSize"), 2); } -%typemap(python,in) wxBitmap** choices { - $target = wxBitmap_LIST_helper($source); - if ($target == NULL) { - return NULL; - } +%typemap(in) wxPoint& (wxPoint temp) { + $1 = &temp; + if ( ! wxPoint_helper($input, &$1)) SWIG_fail; } -%typemap(python,freearg) wxBitmap** choices { - delete [] $source; +%typemap(typecheck, precedence=SWIG_TYPECHECK_POINTER) wxPoint& { + $1 = wxPySimple_typecheck($input, wxT("wxPoint"), 2); } -%typemap(python,in) wxString* choices { - $target = wxString_LIST_helper($source); - if ($target == NULL) { - return NULL; - } + +%typemap(in) wxRealPoint& (wxRealPoint temp) { + $1 = &temp; + if ( ! wxRealPoint_helper($input, &$1)) SWIG_fail; } -%typemap(python,freearg) wxString* choices { - delete [] $source; +%typemap(typecheck, precedence=SWIG_TYPECHECK_POINTER) wxRealPoint& { + $1 = wxPySimple_typecheck($input, wxT("wxRealPoint"), 2); } -%typemap(python,in) wxAcceleratorEntry* choices { - $target = wxAcceleratorEntry_LIST_helper($source); - if ($target == NULL) { - return NULL; - } + +%typemap(in) wxRect& (wxRect temp) { + $1 = &temp; + if ( ! wxRect_helper($input, &$1)) SWIG_fail; } -%typemap(python,freearg) wxAcceleratorEntry* choices { - delete [] $source; +%typemap(typecheck, precedence=SWIG_TYPECHECK_POINTER) wxRect& { + $1 = wxPySimple_typecheck($input, wxT("wxRect"), 4); } -%typemap(python,build) int PCOUNT { - $target = NPOINTS; + +%typemap(in) wxPoint2D& (wxPoint2D temp) { + $1 = &temp; + if ( ! wxPoint2D_helper($input, &$1)) SWIG_fail; } +%typemap(typecheck, precedence=SWIG_TYPECHECK_POINTER) wxPoint2D& { + $1 = wxPySimple_typecheck($input, wxT("wxPoint2D"), 2); +} + -%typemap(python,in) wxPoint* points (int NPOINTS) { - $target = wxPoint_LIST_helper($source, &NPOINTS); - if ($target == NULL) { - return NULL; - } +%typemap(in) wxRect2D& (wxRect2D temp) { + $1 = &temp; + if ( ! wxRect2D_helper($input, &$1)) SWIG_fail; } -%typemap(python,freearg) wxPoint* points { - delete [] $source; +%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" +%typemap(in) wxColour& (wxColour temp) { + $1 = &temp; + if ( ! wxColour_helper($input, &$1)) SWIG_fail; +} +%typemap(typecheck, precedence=SWIG_TYPECHECK_POINTER) wxColour& { + $1 = wxColour_typecheck($input); +} //--------------------------------------------------------------------------- +// Typemap for wxArrayString from Python sequence objects -%{ -#if PYTHON_API_VERSION >= 1009 - static char* wxStringErrorMsg = "String or Unicode type required"; -#else - static char* wxStringErrorMsg = "string type is required for parameter"; -#endif -%} - -// TODO: Which works best??? - -// Implementation #1 -// %typemap(python, in) wxString& (PyObject* temp, int tmpDoDecRef) { -// temp = $source; -// tmpDoDecRef = 0; -// #if PYTHON_API_VERSION >= 1009 -// if (PyUnicode_Check(temp) { -// temp = PyUnicode_AsUTF8String(temp); -// if (! temp) { -// PyErr_SetString(PyExc_TypeError, "Unicode encoding to UTF8 failed."); -// return NULL; -// } -// tmpDoDecRef = 1; -// #endif -// if (!PyString_Check(temp)) { -// PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); -// return NULL; -// } -// $target = new wxString(PyString_AsString(temp), PyString_Size(temp)); -// #if PYTHON_API_VERESION >= 1009 -// if (tmpDoDecRef) Py_DECREF(temp); -// #endif -// } - - -// Implementation #2 -%typemap(python, in) wxString& { -#if PYTHON_API_VERSION >= 1009 - char* tmpPtr; int tmpSize; - if (!PyString_Check($source) && !PyUnicode_Check($source)) { - PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); - return NULL; +%typemap(in) wxArrayString& (bool temp=false) { + if (! PySequence_Check($input)) { + PyErr_SetString(PyExc_TypeError, "Sequence of strings expected."); + SWIG_fail; } - if (PyString_AsStringAndSize($source, &tmpPtr, &tmpSize) == -1) - return NULL; - $target = new wxString(tmpPtr, tmpSize); -#else - if (!PyString_Check($source)) { - PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); - return NULL; + $1 = new wxArrayString; + temp = true; + int i, len=PySequence_Length($input); + for (i=0; iAdd(*s); + delete s; + Py_DECREF(item); } - $target = new wxString(PyString_AS_STRING($source), PyString_GET_SIZE($source)); -#endif } +%typemap(freearg) wxArrayString& { + if (temp$argnum) delete $1; +} +//--------------------------------------------------------------------------- +// Typemap for wxArrayInt from Python sequence objects +%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); + } +} -%typemap(python, freearg) wxString& { - if ($target) - delete $source; +%typemap(freearg) wxArrayInt& { + 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(python, out) wxString { - $target = PyString_FromStringAndSize($source->c_str(), $source->Len()); +%typemap(out) wxArrayInt& { + $result = wxArrayInt2PyList_helper(*$1); } -%typemap(python, ret) wxString { - delete $source; + +%typemap(out) wxArrayInt { + $result = wxArrayInt2PyList_helper($1); } -%typemap(python, out) wxString* { - $target = PyString_FromStringAndSize($source->c_str(), $source->Len()); +// 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 strings to a list for return values +%typemap(out) wxArrayString& { + $result = wxArrayString2PyList_helper(*$1); +} + +%typemap(out) wxArrayString { + $result = wxArrayString2PyList_helper($1); +} //--------------------------------------------------------------------------- -// Typemaps to convert Python sequence objects (2-tuples, etc.) to -// wxSize, wxPoint, wxRealPoint, and wxRect. -%typemap(python,in) wxSize& (wxSize temp) { - $target = &temp; - if (! wxSize_helper($source, &$target)) - return NULL; +%typemap(out) bool { + $result = $1 ? Py_True : Py_False; Py_INCREF($result); } -%typemap(python,in) wxPoint& (wxPoint temp) { - $target = &temp; - if (! wxPoint_helper($source, &$target)) - return NULL; -} -%typemap(python,in) wxRealPoint& (wxRealPoint temp) { - $target = &temp; - if (! wxRealPoint_helper($source, &$target)) - return NULL; +//--------------------------------------------------------------------------- +// 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(python,in) wxRect& (wxRect temp) { - $target = &temp; - if (! wxRect_helper($source, &$target)) - return NULL; +%typemap(out) wxFileOffset { + if (sizeof(wxFileOffset) > sizeof(long)) + $result = PyLong_FromLongLong($1); + else + $result = PyInt_FromLong($1); } + //--------------------------------------------------------------------------- -// Typemap to convert strings to wxColour. Two string formats are accepted, -// either a colour name, or a hex colour spec like "#RRGGBB" +// 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(python,in) wxColour& (wxColour temp) { - $target = &temp; - if (! wxColour_helper($source, &$target)) - return NULL; +%typemap(out) wxBrush&, wxPen&, wxFont&, wxBitmap&, wxIcon&, wxCursor& { + $*1_ltype* resultptr = new $*1_ltype(*$1); + $result = SWIG_NewPointerObj((void*)(resultptr), $1_descriptor, 1); } //--------------------------------------------------------------------------- -// Map T_OUTPUTs for floats to return ints. - +// Typemaps for loading a image or bitmap from an object that implements the +// buffer interface -%typemap(python,ignore) float *T_OUTPUT_TOINT(float temp), - double *T_OUTPUT_TOINT(double temp) +%typemap(in) (buffer data, int DATASIZE) (Py_ssize_t temp) { - $target = &temp; + if (PyObject_AsReadBuffer($input, (const void**)(&$1), &temp) == -1) SWIG_fail; + $2 = (int)temp; } - -%typemap(python,argout) float *T_OUTPUT_TOINT, - double *T_OUTPUT_TOINT +%typemap(in) (buffer alpha, int ALPHASIZE) (Py_ssize_t temp) { - PyObject *o; - o = PyInt_FromLong((long) (*$source)); - $target = t_output_helper($target, o); + 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 + +// 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); } + + //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- + + + + +