X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b9048c56f0aa04b2adbb7813f9698abdda15184..42f8298f6f42d5d63bb3caf65682b7d9d9f8b702:/wxPython/src/_mdi.i diff --git a/wxPython/src/_mdi.i b/wxPython/src/_mdi.i index daf66d111a..1ad5530ff7 100644 --- a/wxPython/src/_mdi.i +++ b/wxPython/src/_mdi.i @@ -33,23 +33,25 @@ +MustHaveApp(wxMDIParentFrame); + class wxMDIParentFrame : public wxFrame { public: %pythonAppend wxMDIParentFrame "self._setOORInfo(self)" %pythonAppend wxMDIParentFrame() "" wxMDIParentFrame(wxWindow *parent, - const wxWindowID id, - const wxString& title, + const wxWindowID id=-1, + const wxString& title = wxPyEmptyString, const wxPoint& pos = wxDefaultPosition, 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, - const wxString& title, + const wxWindowID id=-1, + const wxString& title = wxPyEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, @@ -78,30 +80,36 @@ public: //--------------------------------------------------------------------------- +MustHaveApp(wxMDIChildFrame); + 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, - const wxString& title, + const wxWindowID id=-1, + const wxString& title = wxPyEmptyString, const wxPoint& pos = wxDefaultPosition, 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, - const wxString& title, + const wxWindowID id=-1, + const wxString& title = wxPyEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxPyFrameNameStr); void Activate(); - void Maximize(bool maximize); + void Maximize(bool maximize=true); void Restore(); }; @@ -109,13 +117,19 @@ public: //--------------------------------------------------------------------------- +MustHaveApp(wxMDIClientWindow); + 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); };