X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..bf44306ebca5d26e204ef17851516d844bc2f0a7:/wxPython/src/mdi.i?ds=sidebyside

diff --git a/wxPython/src/mdi.i b/wxPython/src/mdi.i
index 6fc5ed554a..21b4336e5e 100644
--- a/wxPython/src/mdi.i
+++ b/wxPython/src/mdi.i
@@ -37,12 +37,19 @@ public:
     wxMDIParentFrame(wxWindow *parent,
                      const wxWindowID id,
                      const wxString& title,
-                     const wxPoint& pos = wxPyDefaultPosition,
-                     const wxSize& size = wxPyDefaultSize,
+                     const wxPoint& pos = wxDefaultPosition,
+                     const wxSize& size = wxDefaultSize,
                      long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
                      const char* name = "frame");
+    %name(wxPreMDIParentFrame)wxMDIParentFrame();
 
-    %pragma(python) addtomethod = "__init__:#wx._StdFrameCallbacks(self)"
+    bool Create(wxWindow *parent,
+                     const wxWindowID id,
+                     const wxString& title,
+                     const wxPoint& pos = wxDefaultPosition,
+                     const wxSize& size = wxDefaultSize,
+                     long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
+                     const char* name = "frame");
 
     void ActivateNext();
     void ActivatePrevious();
@@ -55,7 +62,10 @@ public:
     // TODO:  This isn't handled by the standard event-table system...
     //wxMDIClientWindow* OnCreateClient();
 
+
 #ifdef __WXMSW__
+    wxMenu* GetWindowMenu();
+    void SetWindowMenu(wxMenu* menu);
     void SetToolBar(wxToolBar* toolbar);
 #endif
     void Tile();
@@ -68,12 +78,20 @@ public:
     wxMDIChildFrame(wxMDIParentFrame* parent,
                     const wxWindowID id,
                     const wxString& title,
-                    const wxPoint& pos = wxPyDefaultPosition,
-                    const wxSize& size = wxPyDefaultSize,
+                    const wxPoint& pos = wxDefaultPosition,
+                    const wxSize& size = wxDefaultSize,
+                    long style = wxDEFAULT_FRAME_STYLE,
+                    const char* name = "frame");
+    %name(wxPreMDIChildFrame)wxMDIChildFrame();
+
+    bool Create(wxMDIParentFrame* parent,
+                    const wxWindowID id,
+                    const wxString& title,
+                    const wxPoint& pos = wxDefaultPosition,
+                    const wxSize& size = wxDefaultSize,
                     long style = wxDEFAULT_FRAME_STYLE,
                     const char* name = "frame");
 
-    %pragma(python) addtomethod = "__init__:#wx._StdFrameCallbacks(self)"
 
     void Activate();
     void Maximize(bool maximize);
@@ -87,6 +105,13 @@ public:
 class wxMDIClientWindow : public wxWindow {
 public:
     wxMDIClientWindow(wxMDIParentFrame* parent, long style = 0);
+    %name(wxPreMDIClientWindow)wxMDIClientWindow();
+
+    %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
+    %pragma(python) addtomethod = "__init__:#wx._StdOnScrollCallbacks(self)"
+
+    bool Create(wxMDIParentFrame* parent, long style = 0);
+
     %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
     %pragma(python) addtomethod = "__init__:#wx._StdOnScrollCallbacks(self)"
 };