X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7a446686f062b8abbedf34c01ef56c75396a8ab1..b8fbf1a035db2af6d3aba89203263a4711cb7c53:/wxPython/src/my_typemaps.i

diff --git a/wxPython/src/my_typemaps.i b/wxPython/src/my_typemaps.i
index 99df23b9e7..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;
 }
 
 //----------------------------------------------------------------------
@@ -288,6 +289,55 @@
     $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) 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); }
+
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 
+
+
+
+
+