updated Joystick demo, is now wxDesigner-less

[wxWidgets.git] / wxPython / src / my_typemaps.i

diff --git a/wxPython/src/my_typemaps.i b/wxPython/src/my_typemaps.i
index 07ca2e32dc5eee435c0ac8354c686e84ac58e3df..ff4994d928db116b1b0a3a1b6d2643ecf7226ade 100644 (file)
--- a/wxPython/src/my_typemaps.i
+++ b/wxPython/src/my_typemaps.i
@@ -35,8 +35,6 @@
 }
 
 
-
-
 //---------------------------------------------------------------------------
 // wxString typemaps
 
@@ -51,18 +49,7 @@
         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(out) wxString* {
+%typemap(out) wxString& {
 %#if wxUSE_UNICODE
     $result = PyUnicode_FromWideChar($1->c_str(), $1->Len());
 %#else
@@ -71,15 +58,18 @@
 }
 
 
-%typemap(out) wxString& {
+%apply wxString& { wxString* }
+
+
+
+%typemap(out) wxString {
 %#if wxUSE_UNICODE
-    $result = PyUnicode_FromWideChar($1->c_str(), $1->Len());
+    $result = PyUnicode_FromWideChar($1.c_str(), $1.Len());
 %#else
-    $result = PyString_FromStringAndSize($1->c_str(), $1->Len());
+    $result = PyString_FromStringAndSize($1.c_str(), $1.Len());
 %#endif
 }
 
-
 %typemap(varout) wxString {
 %#if wxUSE_UNICODE
     $result = PyUnicode_FromWideChar($1.c_str(), $1.Len());
@@ -98,34 +88,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 +237,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