wxRect::union and docstring fixes

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

diff --git a/wxPython/src/_mdi.i b/wxPython/src/_mdi.i
index dab48d326d5b471328536239e24d080d9db101a0..f5607a591cdfa85a0fab99ae1a7a70376ceaca12 100644 (file)
--- a/wxPython/src/_mdi.i
+++ b/wxPython/src/_mdi.i
@@ -86,6 +86,7 @@ class wxMDIChildFrame : public wxFrame {
 public:
     %pythonAppend wxMDIChildFrame         "self._setOORInfo(self)"
     %pythonAppend wxMDIChildFrame()       ""
+    %typemap(out) wxMDIChildFrame*;    // turn off this typemap
 
     wxMDIChildFrame(wxMDIParentFrame* parent,
                     const wxWindowID id=-1,
@@ -96,6 +97,9 @@ public:
                     const wxString& name = wxPyFrameNameStr);
     %name(PreMDIChildFrame)wxMDIChildFrame();
 
+    // Turn it back on again
+    %typemap(out) wxMDIChildFrame* { $result = wxPyMake_wxObject($1, $owner); }
+
     bool Create(wxMDIParentFrame* parent,
                     const wxWindowID id=-1,
                     const wxString& title = wxPyEmptyString,
@@ -119,10 +123,14 @@ class wxMDIClientWindow : public wxWindow {
 public:
     %pythonAppend wxMDIClientWindow         "self._setOORInfo(self)"
     %pythonAppend wxMDIClientWindow()       ""
+    %typemap(out) wxMDIClientWindow*;    // turn off this typemap
 
     wxMDIClientWindow(wxMDIParentFrame* parent, long style = 0);
     %name(PreMDIClientWindow)wxMDIClientWindow();
 
+    // Turn it back on again
+    %typemap(out) wxMDIClientWindow* { $result = wxPyMake_wxObject($1, $owner); }
+
     bool Create(wxMDIParentFrame* parent, long style = 0);
 };