X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d55734102e25f5d11bcb4bbac39083320afd3699..46ae103b9f08fc4e447d16a6a92b03cf55ee3189:/wxPython/src/_mdi.i?ds=sidebyside diff --git a/wxPython/src/_mdi.i b/wxPython/src/_mdi.i index dab48d326d..9264b85389 100644 --- a/wxPython/src/_mdi.i +++ b/wxPython/src/_mdi.i @@ -28,6 +28,7 @@ #define IDM_WINDOWICONS 4003 #define IDM_WINDOWNEXT 4004 #define IDM_WINDOWTILEVERT 4005 +#define IDM_WINDOWPREV 4006 #define wxFIRST_MDI_CHILD 4100 #define wxLAST_MDI_CHILD 4600 @@ -47,7 +48,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, @@ -75,7 +76,7 @@ public: void SetWindowMenu(wxMenu* menu); void SetToolBar(wxToolBar* toolbar); #endif - void Tile(); + void Tile(wxOrientation orient = wxHORIZONTAL); }; //--------------------------------------------------------------------------- @@ -86,6 +87,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 +96,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 +110,7 @@ public: const wxString& name = wxPyFrameNameStr); void Activate(); - void Maximize(bool maximize); + void Maximize(bool maximize=true); void Restore(); }; @@ -119,9 +124,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); };