Version

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

diff --git a/wxPython/src/_mdi.i b/wxPython/src/_mdi.i
index dab48d326d5b471328536239e24d080d9db101a0..1ad5530ff766c3d806971e1d04d0152099aaaab6 100644 (file)
--- a/wxPython/src/_mdi.i
+++ b/wxPython/src/_mdi.i
@@ -47,7 +47,7 @@ public:
                      const wxSize& size = wxDefaultSize,
                      long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
                      const wxString& name = wxPyFrameNameStr);
-    %name(PreMDIParentFrame)wxMDIParentFrame();
+    %RenameCtor(PreMDIParentFrame, wxMDIParentFrame());
 
     bool Create(wxWindow *parent,
                      const wxWindowID id=-1,
@@ -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,
@@ -94,7 +95,10 @@ public:
                     const wxSize& size = wxDefaultSize,
                     long style = wxDEFAULT_FRAME_STYLE,
                     const wxString& name = wxPyFrameNameStr);
-    %name(PreMDIChildFrame)wxMDIChildFrame();
+    %RenameCtor(PreMDIChildFrame, wxMDIChildFrame());
+
+    // Turn it back on again
+    %typemap(out) wxMDIChildFrame* { $result = wxPyMake_wxObject($1, $owner); }
 
     bool Create(wxMDIParentFrame* parent,
                     const wxWindowID id=-1,
@@ -105,7 +109,7 @@ public:
                     const wxString& name = wxPyFrameNameStr);
 
     void Activate();
-    void Maximize(bool maximize);
+    void Maximize(bool maximize=true);
     void Restore();
 
 };
@@ -119,9 +123,13 @@ 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();
+    %RenameCtor(PreMDIClientWindow, wxMDIClientWindow());
+
+    // Turn it back on again
+    %typemap(out) wxMDIClientWindow* { $result = wxPyMake_wxObject($1, $owner); }
 
     bool Create(wxMDIParentFrame* parent, long style = 0);
 };