changes for wxDash

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/wxPython/src/gdi.i b/utils/wxPython/src/gdi.i
index 353c478c54265232a28431ede64b125d4e2d2859..5e91e0cdd4c76c16fa832ad1c621b5440d18c57b 100644 (file)
--- 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:
 
 class wxPen {
 public:

diff --git a/utils/wxPython/src/my_typemaps.i b/utils/wxPython/src/my_typemaps.i
index 7efbaa8b6968b62ea9456cc24011c0754bf524fd..fb0fdfc0aa412d98feacf40a4632131b0785c487 100644 (file)
--- a/utils/wxPython/src/my_typemaps.i
+++ b/utils/wxPython/src/my_typemaps.i
@@ -45,6 +45,17 @@
     delete [] $source;
 }
 
     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);
 
 %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) {
 %typemap(python,in) char** choices {
     $target = string_LIST_helper($source);
     if ($target == NULL) {