Add dtor for wxCalendarDateAttr

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

diff --git a/wxPython/src/my_typemaps.i b/wxPython/src/my_typemaps.i
index 46d7bfb7d2e48d4f49c3ed8a7644ff41eb96ea3e..08a2c9c09b505e5b081b8370d455f183658a04e7 100644 (file)
--- a/wxPython/src/my_typemaps.i
+++ b/wxPython/src/my_typemaps.i
@@ -191,8 +191,6 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field)
     $1 = wxColour_typecheck($input);
 }
 
-
-
 //---------------------------------------------------------------------------
 // Typemap for wxArrayString from Python sequence objects
 
@@ -206,15 +204,11 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field)
     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
+        wxString* s = wxString_in_helper(item);
         if (PyErr_Occurred())  SWIG_fail;
-        $1->Add(Py2wxString(str));
+        $1->Add(*s);
+        delete s;
         Py_DECREF(item);
-        Py_DECREF(str);
     }
 }
 
@@ -329,52 +323,52 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field)
 // 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_wxSizer($1, $owner); }
+%typemap(out) wxEvtHandler*             { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxMenu*                   { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxValidator*              { $result = wxPyMake_wxObject($1, (bool)$owner); }
+
+%typemap(out) wxApp*                    { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxPyApp*                  { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxDC*                     { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxFSFile*                 { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxFileSystem*             { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxImageList*              { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxImage*                  { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxListItem*               { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxMenuItem*               { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxMouseEvent*             { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxObject*                 { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxPyPrintout*             { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxToolBarToolBase*        { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxToolTip*                { $result = wxPyMake_wxObject($1, (bool)$owner); }
+
+
+%typemap(out) wxBitmapButton*           { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxButton*                 { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxControl*                { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxFrame*                  { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxGrid*                   { $result = wxPyMake_wxObject($1, (bool)$owner); }
+//%typemap(out) wxListCtrl*               { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxMDIChildFrame*          { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxMDIClientWindow*        { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxMenuBar*                { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxNotebook*               { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxStaticBox*              { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxStatusBar*              { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxTextCtrl*               { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxToolBar*                { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxToolBarBase*            { $result = wxPyMake_wxObject($1, (bool)$owner); }
+//%typemap(out) wxTreeCtrl*               { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxPyTreeCtrl*             { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxWindow*                 { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxPyHtmlWindow*           { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxWizardPage*             { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxPyWizardPage*           { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxPanel*                  { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxDialog*                 { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxScrolledWindow*         { $result = wxPyMake_wxObject($1, (bool)$owner); }
+
+%typemap(out) wxSizer*                  { $result = wxPyMake_wxObject($1, (bool)$owner); }
 
 
 //---------------------------------------------------------------------------