X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..594f0f5bf1355fb8d58f403d3ebacc1c1767c429:/wxPython/src/my_typemaps.i

diff --git a/wxPython/src/my_typemaps.i b/wxPython/src/my_typemaps.i
index 9ee9ee6479..b1c58defd6 100644
--- 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;
 }
 
 //----------------------------------------------------------------------
@@ -131,24 +132,15 @@
     delete [] $source;
 }
 
-
-
-
-
 %typemap(python,build) int PCOUNT {
-    if (_in_points) {
-        $target = PyList_Size(_in_points);
-    }
-    else {
-        $target = 0;
-    }
+	$target = NPOINTS;
 }
 
-%typemap(python,in) wxPoint* points  {
-    $target = wxPoint_LIST_helper($source);
-    if ($target == NULL) {
-        return NULL;
-    }
+%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;
@@ -156,19 +148,66 @@
 
 
 
+
 //---------------------------------------------------------------------------
 
 %{
-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 is required for parameter";
+#endif
 %}
 
+// TODO:  Which works best???
+
+// Implementation #1
+//  %typemap(python, in) wxString& (PyObject* temp, int tmpDoDecRef) {
+//      temp = $source;
+//      tmpDoDecRef = 0;
+//  #if PYTHON_API_VERSION >= 1009
+//      if (PyUnicode_Check(temp) {
+//          temp = PyUnicode_AsUTF8String(temp);
+//          if (! temp) {
+//              PyErr_SetString(PyExc_TypeError, "Unicode encoding to UTF8 failed.");
+//              return NULL;
+//          }
+//          tmpDoDecRef = 1;
+//  #endif
+//      if (!PyString_Check(temp)) {
+//          PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+//          return NULL;
+//      }
+//      $target = new wxString(PyString_AsString(temp), PyString_Size(temp));
+//  #if PYTHON_API_VERESION >= 1009
+//      if (tmpDoDecRef) Py_DECREF(temp);
+//  #endif
+//  }
+
+
+// Implementation #2
 %typemap(python, in) wxString& {
+#if PYTHON_API_VERSION >= 1009
+    char* tmpPtr; int tmpSize;
+    if (!PyString_Check($source) && !PyUnicode_Check($source)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    if (PyString_AsStringAndSize($source, &tmpPtr, &tmpSize) == -1)
+        return NULL;
+    $target = new wxString(tmpPtr, tmpSize);
+#else
     if (!PyString_Check($source)) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    $target = new wxString(PyString_AsString($source), PyString_Size($source));
+    $target = new wxString(PyString_AS_STRING($source), PyString_GET_SIZE($source));
+#endif
 }
+
+
+
+
 %typemap(python, freearg) wxString& {
     if ($target)
         delete $source;
@@ -222,7 +261,7 @@ static char* wxStringErrorMsg = "string type is required for parameter";
 
 //---------------------------------------------------------------------------
 // Typemap to convert strings to wxColour.  Two string formats are accepted,
-// either a colour name, for a hex colour spec like "#RRGGBB"
+// either a colour name, or a hex colour spec like "#RRGGBB"
 
 %typemap(python,in) wxColour& (wxColour temp) {
     $target = &temp;
@@ -251,5 +290,54 @@ static char* wxStringErrorMsg = "string type is required for parameter";
 }
 
 //---------------------------------------------------------------------------
+// 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) wxButton*                 { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxControl*                { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxDC*                     { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxEvtHandler*             { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxFSFile*                 { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxFileSystem*             { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxFrame*                  { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxGrid*                   { $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) wxMDIChildFrame*          { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxMDIClientWindow*        { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxMenu*                   { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxMenuBar*                { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxMenuItem*               { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxMouseEvent*             { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxNotebook*               { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxObject*                 { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxPyPrintout*             { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxSizer*                  { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxSizer*                  { $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) wxToolBarToolBase*        { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxToolTip*                { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxValidator*              { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxWindow*                 { $target = wxPyMake_wxObject($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); }
+
 //---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+
+
+
+
+