X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d14a1e28567de23c586bc80017073d0c39f8d18f..db679b8c836e69c111cdc31e62cf92cebe4f938f:/wxPython/src/my_typemaps.i

diff --git a/wxPython/src/my_typemaps.i b/wxPython/src/my_typemaps.i
index f4a0942c08..c22b3ae7ef 100644
--- a/wxPython/src/my_typemaps.i
+++ b/wxPython/src/my_typemaps.i
@@ -11,20 +11,27 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
-//---------------------------------------------------------------------------
-// Tell SWIG to wrap all the wrappers with our thread protection
+//----------------------------------------------------------------------
+// Typemaps to convert a list of items to an int (size) and an array
 
-%exception {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    $action
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-}
+%define MAKE_INT_ARRAY_TYPEMAPS(NAME, ARR_NAME)
+    %typemap(in) (int NAME, int* ARR_NAME) {
+        $1 = PyList_Size($input);
+        $2 =  int_LIST_helper($input);
+        if ($2 == NULL) SWIG_fail;
+    }
 
+    %typemap(freearg) (int NAME, int* ARR_NAME) {
+        if ($2) delete [] $2;
+    }
+%enddef
 
-//----------------------------------------------------------------------
-// Typemaps to convert a list of items to an int (size) and an array
+MAKE_INT_ARRAY_TYPEMAPS(widths, widths_field)
+MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field)
 
+    
+
+// Same things for a wxString
 %typemap(in) (int choices, wxString* choices_array ) {
     $1 = PyList_Size($input);
     $2 = wxString_LIST_helper($input);
@@ -36,132 +43,8 @@
 
 
 
-
-// %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) {
@@ -169,32 +52,33 @@
     if ($1 == NULL) SWIG_fail;
     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,33 +87,46 @@
 }
 
 
+%typemap(in) wxString {
+    wxString* sptr = wxString_in_helper($input);
+    if (sptr == NULL) SWIG_fail;
+    $1 = *sptr;
+    delete sptr;
+}
+
+%typemap(typecheck, precedence=SWIG_TYPECHECK_POINTER) wxString& {
+    $1 = PyString_Check($input) || PyUnicode_Check($input);
+}
+
+//---------------------------------------------------------------------------
+// wxMemoryBuffer  (needed for wxSTC)
 
-// //---------------------------------------------------------------------------
+%typemap(in) wxMemoryBuffer& (bool temp=false) {
+    if (!PyString_Check($input)) {
+        PyErr_SetString(PyExc_TypeError, "String buffer expected");
+        SWIG_fail;
+    }
+    char* str = PyString_AS_STRING($input);
+    int   len = PyString_GET_SIZE($input);
+    $1 = new wxMemoryBuffer(len);
+    temp = true;
+    memcpy($1->GetData(), str, len);
+    $1->SetDataLen(len);
+}
 
+%typemap(freearg) wxMemoryBuffer& {
+    if (temp$argnum) delete $1;
+}
 
-// %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(out) wxMemoryBuffer {
+    $result = PyString_FromStringAndSize((char*)$1.GetData(), $1.GetDataLen());
+}
 
-// %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(out) wxCharBuffer {
+    $result = PyString_FromString((char*)$1.data());
+}
 
 
 //---------------------------------------------------------------------------
@@ -299,39 +196,38 @@
 //---------------------------------------------------------------------------
 // Typemap for wxArrayString from Python sequence objects
 
-%typemap(in) wxArrayString& {
+%typemap(in) wxArrayString& (bool temp=false) {
     if (! PySequence_Check($input)) {
         PyErr_SetString(PyExc_TypeError, "Sequence of strings expected.");
         SWIG_fail;
     }
     $1 = new wxArrayString;
+    temp = true;
     int i, len=PySequence_Length($input);
     for (i=0; i<len; i++) {
         PyObject* item = PySequence_GetItem($input, i);
-%#if wxUSE_UNICODE
-        PyObject* str  = PyObject_Unicode(item);
-%#else
-        PyObject* str  = PyObject_Str(item);
-%#endif
-        $1->Add(Py2wxString(str));
+        wxString* s = wxString_in_helper(item);
+        if (PyErr_Occurred())  SWIG_fail;
+        $1->Add(*s);
+        delete s;
         Py_DECREF(item);
-        Py_DECREF(str);
     }
 }
 
 %typemap(freearg) wxArrayString& {
-    if ($1) delete $1;
+    if (temp$argnum) delete $1;
 }
 
 //---------------------------------------------------------------------------
 // Typemap for wxArrayInt from Python sequence objects
 
-%typemap(in) wxArrayInt& {
+%typemap(in) wxArrayInt& (bool temp=false) {
     if (! PySequence_Check($input)) {
         PyErr_SetString(PyExc_TypeError, "Sequence of integers expected.");
         SWIG_fail;
     }
     $1 = new wxArrayInt;
+    temp = true;
     int i, len=PySequence_Length($input);
     for (i=0; i<len; i++) {
         PyObject* item = PySequence_GetItem($input, i);
@@ -343,7 +239,7 @@
 }
 
 %typemap(freearg) wxArrayInt& {
-    if ($1) delete $1;
+    if (temp$argnum) delete $1;
 }
 
 
@@ -371,7 +267,7 @@
 
 
 
-// Typemaps to convert an array of ints to a list for return values
+// Typemaps to convert an array of strings to a list for return values
 %typemap(out) wxArrayString& {
     $result = wxArrayString2PyList_helper(*$1);
 }
@@ -381,61 +277,44 @@
 }
 
 
-// //---------------------------------------------------------------------------
-// // 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(out) bool {
+    $result = $1 ? Py_True : Py_False; Py_INCREF($result);
+}
 
-// %typemap(python,ignore) bool  *OUTPUT = bool *T_OUTPUT;
-// %typemap(python,argout) bool  *OUTPUT = bool *T_OUTPUT;
 
+//---------------------------------------------------------------------------
+// wxFileOffset, can be a 32-bit or a 64-bit integer
 
+%typemap(in) wxFileOffset {
+    if (sizeof(wxFileOffset) > sizeof(long))
+        $1 = PyLong_AsLongLong($input);
+    else
+        $1 = PyInt_AsLong($input);
+}
 
-// %typemap(python,ignore) byte *T_OUTPUT(int temp)
-// {
-//   $target = (byte*)&temp;
-// }
+%typemap(out) wxFileOffset {
+    if (sizeof(wxFileOffset) > sizeof(long))
+        $result = PyLong_FromLongLong($1);
+    else
+        $result = PyInt_FromLong($1);
+}
 
-// %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 for when GDI objects are returned by reference.  This will cause a
+// copy to be made instead of returning a reference to the same instance.  The
+// GDI object's internal refcounting scheme will do a copy-on-write of the
+// internal data as needed.
 
+// These too?
+//, wxRegion&, wxPalette&
 
-// %typemap(python,ignore) wxCoord *OUTPUT = int *OUTPUT;
-// %typemap(python,argout) wxCoord *OUTPUT = int *OUTPUT;
+%typemap(out) wxBrush&, wxPen&, wxFont&, wxBitmap&, wxIcon&, wxCursor& {
+    $*1_ltype* resultptr = new $*1_ltype(*$1);
+    $result = SWIG_NewPointerObj((void*)(resultptr), $1_descriptor, 1);
+}
 
 
 //---------------------------------------------------------------------------
@@ -443,54 +322,56 @@
 // to the real derived type, if possible.  See wxPyMake_wxObject in
 // helpers.cpp
 
-%typemap(out) wxEvtHandler*             { $result = wxPyMake_wxObject($1); }
-%typemap(out) wxMenu*                   { $result = wxPyMake_wxObject($1); }
-%typemap(out) wxValidator*              { $result = wxPyMake_wxObject($1); }
-
-%typemap(out) wxApp*                    { $result = wxPyMake_wxObject($1); }
-%typemap(out) wxPyApp*                  { $result = wxPyMake_wxObject($1); }
-%typemap(out) wxDC*                     { $result = wxPyMake_wxObject($1); }
-%typemap(out) wxFSFile*                 { $result = wxPyMake_wxObject($1); }
-%typemap(out) wxFileSystem*             { $result = wxPyMake_wxObject($1); }
-%typemap(out) wxGridTableBase*          { $result = wxPyMake_wxObject($1); }
-%typemap(out) wxImageList*              { $result = wxPyMake_wxObject($1); }
-%typemap(out) wxListItem*               { $result = wxPyMake_wxObject($1); }
-%typemap(out) wxMenuItem*               { $result = wxPyMake_wxObject($1); }
-%typemap(out) wxMouseEvent*             { $result = wxPyMake_wxObject($1); }
-%typemap(out) wxObject*                 { $result = wxPyMake_wxObject($1); }
-%typemap(out) wxPyPrintout*             { $result = wxPyMake_wxObject($1); }
-%typemap(out) wxToolBarToolBase*        { $result = wxPyMake_wxObject($1); }
-%typemap(out) wxToolTip*                { $result = wxPyMake_wxObject($1); }
-
-
-%typemap(out) wxBitmapButton*           { $result = wxPyMake_wxObject($1); }
-%typemap(out) wxButton*                 { $result = wxPyMake_wxObject($1); }
-%typemap(out) wxControl*                { $result = wxPyMake_wxObject($1); }
-%typemap(out) wxFrame*                  { $result = wxPyMake_wxObject($1); }
-%typemap(out) wxGrid*                   { $result = wxPyMake_wxObject($1); }
-%typemap(out) wxListCtrl*               { $result = wxPyMake_wxObject($1); }
-%typemap(out) wxMDIChildFrame*          { $result = wxPyMake_wxObject($1); }
-%typemap(out) wxMDIClientWindow*        { $result = wxPyMake_wxObject($1); }
-%typemap(out) wxMenuBar*                { $result = wxPyMake_wxObject($1); }
-%typemap(out) wxNotebook*               { $result = wxPyMake_wxObject($1); }
-%typemap(out) wxStaticBox*              { $result = wxPyMake_wxObject($1); }
-%typemap(out) wxStatusBar*              { $result = wxPyMake_wxObject($1); }
-%typemap(out) wxTextCtrl*               { $result = wxPyMake_wxObject($1); }
-%typemap(out) wxToolBar*                { $result = wxPyMake_wxObject($1); }
-%typemap(out) wxToolBarBase*            { $result = wxPyMake_wxObject($1); }
-%typemap(out) wxTreeCtrl*               { $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); }
-%typemap(out) wxWizardPage*             { $result = wxPyMake_wxObject($1); }
-
-%typemap(out) wxSizer*                  { $result = wxPyMake_wxSizer($1); }
-
-
-//%typemap(python, out) wxHtmlCell*               { $target = wxPyMake_wxObject($source); }
-//%typemap(python, out) wxHtmlContainerCell*      { $target = wxPyMake_wxObject($source); }
-//%typemap(python, out) wxHtmlParser*             { $target = wxPyMake_wxObject($source); }
-//%typemap(python, out) wxHtmlWinParser*          { $target = wxPyMake_wxObject($source); }
+// NOTE: For those classes that also call _setOORInfo these typemaps should be
+// disabled for the constructor.
+
+%typemap(out) wxEvtHandler*             { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxMenu*                   { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxValidator*              { $result = wxPyMake_wxObject($1, $owner); }
+
+%typemap(out) wxApp*                    { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxPyApp*                  { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxDC*                     { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxFSFile*                 { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxFileSystem*             { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxImageList*              { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxImage*                  { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxListItem*               { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxMenuItem*               { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxMouseEvent*             { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxObject*                 { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxPyPrintout*             { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxToolBarToolBase*        { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxToolTip*                { $result = wxPyMake_wxObject($1, $owner); }
+
+
+%typemap(out) wxBitmapButton*           { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxButton*                 { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxControl*                { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxFrame*                  { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxGrid*                   { $result = wxPyMake_wxObject($1, $owner); }
+//%typemap(out) wxListCtrl*               { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxMDIChildFrame*          { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxMDIClientWindow*        { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxMenuBar*                { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxNotebook*               { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxStaticBox*              { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxStatusBar*              { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxTextCtrl*               { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxToolBar*                { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxToolBarBase*            { $result = wxPyMake_wxObject($1, $owner); }
+//%typemap(out) wxTreeCtrl*               { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxPyTreeCtrl*             { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxWindow*                 { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxPyHtmlWindow*           { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxWizardPage*             { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxPyWizardPage*           { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxPanel*                  { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxDialog*                 { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxScrolledWindow*         { $result = wxPyMake_wxObject($1, $owner); }
+
+%typemap(out) wxSizer*                  { $result = wxPyMake_wxObject($1, $owner); }
+
 
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------