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 f4a0942c0822f7704172cf46bb115de5f66e170d..ff4994d928db116b1b0a3a1b6d2643ecf7226ade 100644 (file)
--- a/wxPython/src/my_typemaps.i
+++ b/wxPython/src/my_typemaps.i
@@ -35,166 +35,42 @@
 }
 
 
-
-
-// %typemap(python,build) int LCOUNT {
-//     if (_in_choices) {
-//         $target = PyList_Size(_in_choices);
-//     }
-//     else {
-//         $target = 0;
-//     }
-// }
-
-
-
-// %typemap(python,in) byte* choices  {
-//     $target = byte_LIST_helper($source);
-//     if ($target == NULL) {
-//         return NULL;
-//     }
-// }
-// %typemap(python,freearg) byte* choices {
-//     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);
-//     if ($target == NULL) {
-//         return NULL;
-//     }
-// }
-// %typemap(python,freearg) int* choices {
-//     delete [] $source;
-// }
-
-
-// %typemap(python,in) long* choices {
-//     $target = long_LIST_helper($source);
-//     if ($target == NULL) {
-//         return NULL;
-//     }
-// }
-// %typemap(python,freearg) long* choices {
-//     delete [] $source;
-// }
-
-
-// %typemap(python,in) unsigned long* choices {
-//     $target = (unsigned long*)long_LIST_helper($source);
-//     if ($target == NULL) {
-//         return NULL;
-//     }
-// }
-// %typemap(python,freearg) unsigned long* choices {
-//     delete [] $source;
-// }
-
-
-// %typemap(python,in) char** choices {
-//     $target = string_LIST_helper($source);
-//     if ($target == NULL) {
-//         return NULL;
-//     }
-// }
-// %typemap(python,freearg) char** choices {
-//     delete [] $source;
-// }
-
-
-// %typemap(python,in) wxBitmap** choices  {
-//     $target = wxBitmap_LIST_helper($source);
-//     if ($target == NULL) {
-//         return NULL;
-//     }
-// }
-// %typemap(python,freearg) wxBitmap** choices {
-//     delete [] $source;
-// }
-
-// %typemap(python,in) wxString* choices  {
-//     $target = wxString_LIST_helper($source);
-//     if ($target == NULL) {
-//         return NULL;
-//     }
-// }
-// %typemap(python,freearg) wxString* choices {
-//     delete [] $source;
-// }
-
-// %typemap(python,in) wxAcceleratorEntry* choices  {
-//     $target = wxAcceleratorEntry_LIST_helper($source);
-//     if ($target == NULL) {
-//         return NULL;
-//     }
-// }
-// %typemap(python,freearg) wxAcceleratorEntry* choices {
-//     delete [] $source;
-// }
-
-// %typemap(python,build) int PCOUNT {
-//     $target = NPOINTS;
-// }
-
-// %typemap(python,in) wxPoint* points (int NPOINTS) {
-//     $target = wxPoint_LIST_helper($source, &NPOINTS);
-//     if ($target == NULL) {
-//             return NULL;
-//     }
-// }
-// %typemap(python,freearg) wxPoint* points {
-//     delete [] $source;
-// }
-
-
-
-
 //---------------------------------------------------------------------------
+// wxString typemaps
 
 
-%typemap(in) wxString& (bool temp=false) {
+%typemap(in) wxString& (bool temp=False) {
     $1 = wxString_in_helper($input);
     if ($1 == NULL) SWIG_fail;
-    temp = true;
+    temp = True;
 }
-
-
 %typemap(freearg) wxString& {
     if (temp$argnum)
         delete $1;
 }
 
-
-
-%typemap(out) 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(python, 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(python, varout) wxString {
+%typemap(varout) wxString {
 %#if wxUSE_UNICODE
     $result = PyUnicode_FromWideChar($1.c_str(), $1.Len());
 %#else
@@ -203,34 +79,14 @@
 }
 
 
-
-// //---------------------------------------------------------------------------
-
-
-// %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;
-// }
-
+%typemap(in) wxString {
+    wxString* sptr = wxString_in_helper($input);
+    if (sptr == NULL) SWIG_fail;
+    $1 = *sptr;
+    delete sptr;
+}
+    
+   
 
 //---------------------------------------------------------------------------
 // Typemaps to convert Python sequence objects (tuples, etc.) to
@@ -381,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
@@ -479,6 +279,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); }