X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b9048c56f0aa04b2adbb7813f9698abdda15184..9ac884500ce30c58e24b0a6af1288b576d2e03e4:/wxPython/src/_mdi.i diff --git a/wxPython/src/_mdi.i b/wxPython/src/_mdi.i index daf66d111a..8f34991457 100644 --- a/wxPython/src/_mdi.i +++ b/wxPython/src/_mdi.i @@ -28,28 +28,31 @@ #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 +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, @@ -62,7 +65,7 @@ public: void Cascade(); wxMDIChildFrame* GetActiveChild(); wxMDIClientWindow* GetClientWindow(); - wxWindow* GetToolBar(); +// wxWindow* GetToolBar(); // TODO: This isn't handled by the standard event-table system... //wxMDIClientWindow* OnCreateClient(); @@ -73,35 +76,46 @@ public: void SetWindowMenu(wxMenu* menu); void SetToolBar(wxToolBar* toolbar); #endif - void Tile(); + void Tile(wxOrientation orient = wxHORIZONTAL); + + %property(ActiveChild, GetActiveChild, doc="See `GetActiveChild`"); + %property(ClientWindow, GetClientWindow, doc="See `GetClientWindow`"); +// %property(ToolBar, GetToolBar, doc="See `GetToolBar`"); + }; //--------------------------------------------------------------------------- +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 +123,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); };