diff --git a/utils/wxPython/src/gdi.i b/utils/wxPython/src/gdi.i index 353c478c54..5e91e0cdd4 100644 --- a/utils/wxPython/src/gdi.i +++ b/utils/wxPython/src/gdi.i @@ -322,12 +322,6 @@ public: //---------------------------------------------------------------------- -#ifdef __WXMSW__ -typedef unsigned long wxDash; -#else -typedef char wxDash; -#endif - class wxPen { public: diff --git a/utils/wxPython/src/my_typemaps.i b/utils/wxPython/src/my_typemaps.i index 7efbaa8b69..fb0fdfc0aa 100644 --- a/utils/wxPython/src/my_typemaps.i +++ b/utils/wxPython/src/my_typemaps.i @@ -45,6 +45,17 @@ delete [] $source; } +// wxDash is a signed char +%typemap(python,in) wxDash* choices { + $target = (wxDash*)byte_LIST_helper($source); + if ($target == NULL) { + return NULL; + } +} +%typemap(python,freearg) wxDash* choices { + delete [] $source; +} + %typemap(python,in) int* choices { $target = int_LIST_helper($source); @@ -79,15 +90,6 @@ } -#ifdef __WXMSW__ -%typemap(python,in) wxDash* choices = unsigned long* choices; -%typemap(python,freearg) wxDash* choices = unsigned long* choices; -#else -%typemap(python,in) wxDash* choices = byte* choices; -%typemap(python,freearg) wxDash* choices = byte* choices; -#endif - - %typemap(python,in) char** choices { $target = string_LIST_helper($source); if ($target == NULL) {