X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbc3761ee897d2cdae209c60d415ba00fe825554..30e24d9dd5a5abf1c9a375ea259eb239b122b7f7:/wxPython/src/my_typemaps.i diff --git a/wxPython/src/my_typemaps.i b/wxPython/src/my_typemaps.i index a16dbff87f..958ac1eac5 100644 --- a/wxPython/src/my_typemaps.i +++ b/wxPython/src/my_typemaps.i @@ -125,7 +125,10 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field) %typemap(out) wxCharBuffer { - $result = PyString_FromString((char*)$1.data()); + if ($1.data()) + $result = PyString_FromString((char*)$1.data()); + else + $result = PyString_FromString(""); } @@ -179,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" @@ -230,6 +242,10 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field) for (i=0; iAdd(PyInt_AS_LONG(number)); Py_DECREF(item); Py_DECREF(number); @@ -370,7 +386,7 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field) %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) 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); } @@ -386,7 +402,7 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field) %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) wxListCtrl* { $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); } @@ -396,7 +412,6 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field) %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) wxTreeCtrl* { $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); }