X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/87c2245b34abf6898c8e558bc7674c485c709a68..685d898512944add00640b6e37da89159ee4d9b5:/wxPython/src/my_typemaps.i diff --git a/wxPython/src/my_typemaps.i b/wxPython/src/my_typemaps.i index 8e5898332d..c538e130ae 100644 --- a/wxPython/src/my_typemaps.i +++ b/wxPython/src/my_typemaps.i @@ -35,8 +35,6 @@ } - - //--------------------------------------------------------------------------- // wxString typemaps @@ -98,34 +96,6 @@ -// //--------------------------------------------------------------------------- - - -// %typemap(python, in) wxMemoryBuffer& { -// if (!PyString_Check($source)) { -// PyErr_SetString(PyExc_TypeError, "String buffer expected"); -// return NULL; -// } -// char* str = PyString_AS_STRING($source); -// int len = PyString_GET_SIZE($source); -// $target = new wxMemoryBuffer(len); -// memcpy($target->GetData(), str, len); -// } - -// %typemap(python, freearg) wxMemoryBuffer& { -// if ($target) -// delete $source; -// } - -// %typemap(python, out) wxMemoryBuffer { -// $target = PyString_FromStringAndSize((char*)$source->GetData(), $source->GetDataLen()); -// } - -// %typemap(python, ret) wxMemoryBuffer { -// delete $source; -// } - - //--------------------------------------------------------------------------- // Typemaps to convert Python sequence objects (tuples, etc.) to // wxSize, wxPoint, wxRealPoint, and wxRect. @@ -275,62 +245,6 @@ } -// //--------------------------------------------------------------------------- -// // Map T_OUTPUTs for floats to return ints. - - -// %typemap(python,ignore) float *T_OUTPUT_TOINT(float temp), -// double *T_OUTPUT_TOINT(double temp) -// { -// $target = &temp; -// } - - -// %typemap(python,argout) float *T_OUTPUT_TOINT, -// double *T_OUTPUT_TOINT -// { -// PyObject *o; -// o = PyInt_FromLong((long) (*$source)); -// $target = t_output_helper($target, o); -// } - - -// %typemap(python,ignore) bool *T_OUTPUT(int temp) -// { -// $target = (bool*)&temp; -// } - -// %typemap(python,argout) bool *T_OUTPUT -// { -// PyObject *o; -// o = PyInt_FromLong((long) (*$source)); -// $target = t_output_helper($target, o); -// } - -// %typemap(python,ignore) bool *OUTPUT = bool *T_OUTPUT; -// %typemap(python,argout) bool *OUTPUT = bool *T_OUTPUT; - - - -// %typemap(python,ignore) byte *T_OUTPUT(int temp) -// { -// $target = (byte*)&temp; -// } - -// %typemap(python,argout) byte *T_OUTPUT -// { -// PyObject *o; -// o = PyInt_FromLong((long) (*$source)); -// $target = t_output_helper($target, o); -// } - -// %typemap(python,ignore) byte *OUTPUT = byte *T_OUTPUT; -// %typemap(python,argout) byte *OUTPUT = byte *T_OUTPUT; - - -// %typemap(python,ignore) wxCoord *OUTPUT = int *OUTPUT; -// %typemap(python,argout) wxCoord *OUTPUT = int *OUTPUT; - //--------------------------------------------------------------------------- // Typemaps to convert return values that are base class pointers @@ -373,6 +287,7 @@ %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); }