hopefully fixes focus assertion

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

diff --git a/wxPython/src/mdi.i b/wxPython/src/mdi.i
index 7d68b700d08e94ef4a4242d3c962d57d196d0926..21b4336e5e64c1699b59e4942a58c4559c44f9f5 100644 (file)
--- a/wxPython/src/mdi.i
+++ b/wxPython/src/mdi.i
@@ -37,12 +37,19 @@ public:
     wxMDIParentFrame(wxWindow *parent,
                      const wxWindowID id,
                      const wxString& title,
     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");
                      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();
 
     void ActivateNext();
     void ActivatePrevious();


@@ -71,12 +78,20 @@ public:
     wxMDIChildFrame(wxMDIParentFrame* parent,
                     const wxWindowID id,
                     const wxString& title,
     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");
 
                     long style = wxDEFAULT_FRAME_STYLE,
                     const char* name = "frame");
 

-    %pragma(python) addtomethod = "__init__:#wx._StdFrameCallbacks(self)"

 
     void Activate();
     void Maximize(bool maximize);
 
     void Activate();
     void Maximize(bool maximize);


@@ -90,6 +105,13 @@ public:
 class wxMDIClientWindow : public wxWindow {
 public:
     wxMDIClientWindow(wxMDIParentFrame* parent, long style = 0);
 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)"
 };
     %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
     %pragma(python) addtomethod = "__init__:#wx._StdOnScrollCallbacks(self)"
 };