No animate contrib anymore

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

diff --git a/wxPython/src/_mdi.i b/wxPython/src/_mdi.i
index f5607a591cdfa85a0fab99ae1a7a70376ceaca12..8f349914576b82dc1bc0be72bba06b20c4246b62 100644 (file)
--- 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_WINDOWICONS         4003
 #define IDM_WINDOWNEXT          4004
 #define IDM_WINDOWTILEVERT      4005

+#define IDM_WINDOWPREV          4006

 #define wxFIRST_MDI_CHILD       4100
 #define wxLAST_MDI_CHILD        4600
 
 #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);
                      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,
 
     bool Create(wxWindow *parent,
                      const wxWindowID id=-1,


@@ -64,7 +65,7 @@ public:
     void Cascade();
     wxMDIChildFrame* GetActiveChild();
     wxMDIClientWindow* GetClientWindow();
     void Cascade();
     wxMDIChildFrame* GetActiveChild();
     wxMDIClientWindow* GetClientWindow();

-    wxWindow* GetToolBar();
+//    wxWindow* GetToolBar();

 
     // TODO:  This isn't handled by the standard event-table system...
     //wxMDIClientWindow* OnCreateClient();
 
     // TODO:  This isn't handled by the standard event-table system...
     //wxMDIClientWindow* OnCreateClient();


@@ -75,7 +76,12 @@ public:
     void SetWindowMenu(wxMenu* menu);
     void SetToolBar(wxToolBar* toolbar);
 #endif
     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`");
+    

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------


@@ -95,7 +101,7 @@ public:
                     const wxSize& size = wxDefaultSize,
                     long style = wxDEFAULT_FRAME_STYLE,
                     const wxString& name = wxPyFrameNameStr);
                     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); }
 
     // Turn it back on again
     %typemap(out) wxMDIChildFrame* { $result = wxPyMake_wxObject($1, $owner); }


@@ -109,7 +115,7 @@ public:
                     const wxString& name = wxPyFrameNameStr);
 
     void Activate();
                     const wxString& name = wxPyFrameNameStr);
 
     void Activate();

-    void Maximize(bool maximize);
+    void Maximize(bool maximize=true);

     void Restore();
 
 };
     void Restore();
 
 };


@@ -126,7 +132,7 @@ public:
     %typemap(out) wxMDIClientWindow*;    // turn off this typemap
 
     wxMDIClientWindow(wxMDIParentFrame* parent, long style = 0);
     %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); }
 
     // Turn it back on again
     %typemap(out) wxMDIClientWindow* { $result = wxPyMake_wxObject($1, $owner); }