Changes needed to solve wxPython's OOR problem for the wxOGL shapes.

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

diff --git a/wxPython/src/my_typemaps.i b/wxPython/src/my_typemaps.i
index f0246d60556cf33bfcd320c9fd87d8cfcd1e3bf5..249881280c6f2442da7f361c2d655484e0eb9511 100644 (file)
--- a/wxPython/src/my_typemaps.i
+++ b/wxPython/src/my_typemaps.i
@@ -18,6 +18,7 @@
     wxPy_BEGIN_ALLOW_THREADS;
     $function
     wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
 }
 
 //----------------------------------------------------------------------
@@ -151,7 +152,11 @@
 //---------------------------------------------------------------------------
 
 %{
-static char* wxStringErrorMsg = "string type is required for parameter";
+#if PYTHON_API_VERSION >= 1009
+    static char* wxStringErrorMsg = "String or Unicode type required";
+#else
+    static char* wxStringErrorMsg = "String type required";
+#endif
 %}
 
 // TODO:  Which works best???
@@ -185,7 +190,7 @@ static char* wxStringErrorMsg = "string type is required for parameter";
 #if PYTHON_API_VERSION >= 1009
     char* tmpPtr; int tmpSize;
     if (!PyString_Check($source) && !PyUnicode_Check($source)) {
-        PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
     if (PyString_AsStringAndSize($source, &tmpPtr, &tmpSize) == -1)
@@ -227,7 +232,7 @@ static char* wxStringErrorMsg = "string type is required for parameter";
 
 
 //---------------------------------------------------------------------------
-// Typemaps to convert Python sequence objects (2-tuples, etc.) to
+// Typemaps to convert Python sequence objects (tuples, etc.) to
 // wxSize, wxPoint, wxRealPoint, and wxRect.
 
 %typemap(python,in) wxSize& (wxSize temp) {
@@ -264,6 +269,29 @@ static char* wxStringErrorMsg = "string type is required for parameter";
         return NULL;
 }
 
+//---------------------------------------------------------------------------
+// Typemap for wxArrayString from Python sequence objects
+
+%typemap(python,in) wxArrayString& {
+    if (! PySequence_Check($source)) {
+        PyErr_SetString(PyExc_TypeError, "Sequence of strings expected.");
+        return NULL;
+    }
+    $target = new wxArrayString;
+    int i, len=PySequence_Length($source);
+    for (i=0; i<len; i++) {
+        PyObject* item = PySequence_GetItem($source, i);
+        PyObject* str  = PyObject_Str(item);
+        $target->Add(PyString_AsString(item));
+        Py_DECREF(item);
+        Py_DECREF(str);
+    }
+}
+
+%typemap(python, freearg) wxArrayString& {
+    if ($target)
+        delete $source;
+}
 
 //---------------------------------------------------------------------------
 // Map T_OUTPUTs for floats to return ints.
@@ -284,6 +312,57 @@ static char* wxStringErrorMsg = "string type is required for parameter";
     $target = t_output_helper($target, o);
 }
 
+//---------------------------------------------------------------------------
+// Typemaps to convert return values that are base class pointers
+// to the real derived type, if possible.  See wxPyMake_wxObject in
+// helpers.cpp
+
+%typemap(python, out) wxEvtHandler*             { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxMenu*                   { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxValidator*              { $target = wxPyMake_wxObject($source); }
+
+%typemap(python, out) wxDC*                     { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxFSFile*                 { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxFileSystem*             { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxGridTableBase*          { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxImageList*              { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxListItem*               { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxMenuItem*               { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxMouseEvent*             { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxObject*                 { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxPyPrintout*             { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxToolBarToolBase*        { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxToolTip*                { $target = wxPyMake_wxObject($source); }
+
+
+%typemap(python, out) wxButton*                 { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxControl*                { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxFrame*                  { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxGrid*                   { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxMDIChildFrame*          { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxMDIClientWindow*        { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxMenuBar*                { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxNotebook*               { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxStaticBox*              { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxStatusBar*              { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxTextCtrl*               { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxToolBar*                { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxToolBarBase*            { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxWindow*                 { $target = wxPyMake_wxObject($source); }
+
+%typemap(python, out) wxSizer*                  { $target = wxPyMake_wxSizer($source); }
+
+
+//%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); }
+
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 
+
+
+
+
+