wxUSE_STL/wxArrayString fixes.

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

diff --git a/wxPython/src/my_typemaps.i b/wxPython/src/my_typemaps.i
index 78ea572224b99d683a288bf27ea384b3eced6d27..d9ce9153bf02b9488171a8dd96b09dfe631e9ab3 100644 (file)
--- a/wxPython/src/my_typemaps.i
+++ b/wxPython/src/my_typemaps.i
@@ -11,17 +11,6 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
-//---------------------------------------------------------------------------
-// Tell SWIG to wrap all the wrappers with our thread protection
-
-%exception {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    $action
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-}
-
-
 //----------------------------------------------------------------------
 // Typemaps to convert a list of items to an int (size) and an array
 
@@ -103,6 +92,7 @@
     $1 = new wxMemoryBuffer(len);
     temp = True;
     memcpy($1->GetData(), str, len);
+    $1->SetDataLen(len);
 }
 
 %typemap(freearg) wxMemoryBuffer& {
@@ -197,6 +187,7 @@
 %#else
         PyObject* str  = PyObject_Str(item);
 %#endif
+        if (PyErr_Occurred())  SWIG_fail;
         $1->Add(Py2wxString(str));
         Py_DECREF(item);
         Py_DECREF(str);
@@ -256,7 +247,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);
 }
@@ -349,55 +340,55 @@ SWIG_AsDouble(PyObject *obj)
 // 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) 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); }
-%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) 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_wxSizer($1, $owner); }
+
 
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------