Wrapper updates for wxHtmlLinkInfo and other changes

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

diff --git a/utils/wxPython/src/mdi.i b/utils/wxPython/src/mdi.i
index 1eb539eb8337a3e2350f4e00c2564e0d5e22bb68..41de685303ac6e7f6afbdae8fad8f5a2551290eb 100644 (file)
--- a/utils/wxPython/src/mdi.i
+++ b/utils/wxPython/src/mdi.i
@@ -26,6 +26,9 @@
 %import _defs.i
 %import misc.i
 %import windows.i
+%import frames.i
+
+%pragma(python) code = "import wx"
 
 //----------------------------------------------------------------------
 
@@ -39,11 +42,12 @@ public:
                      long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
                      const char* name = "frame");
 
+    %pragma(python) addtomethod = "__init__:wx._StdFrameCallbacks(self)"
+
     void ActivateNext();
     void ActivatePrevious();
     void ArrangeIcons();
     void Cascade();
-    void GetClientSize(int* OUTPUT, int* OUTPUT);
     wxMDIChildFrame* GetActiveChild();
     wxMDIClientWindow* GetClientWindow();
     wxWindow* GetToolBar();
@@ -51,7 +55,9 @@ public:
     // TODO:  This isn't handled by the standard event-table system...
     //wxMDIClientWindow* OnCreateClient();
 
+#ifdef __WXMSW__
     void SetToolBar(wxToolBar* toolbar);
+#endif
     void Tile();
 };
 
@@ -67,9 +73,12 @@ public:
                     long style = wxDEFAULT_FRAME_STYLE,
                     const char* name = "frame");
 
+    %pragma(python) addtomethod = "__init__:wx._StdFrameCallbacks(self)"
+
     void Activate();
-    void Maximize();
+    void Maximize(bool maximize);
     void Restore();
+
 };
 
 
@@ -78,20 +87,8 @@ public:
 class wxMDIClientWindow : public wxWindow {
 public:
     wxMDIClientWindow(wxMDIParentFrame* parent, long style = 0);
+    %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
+    %pragma(python) addtomethod = "__init__:wx._StdOnScrollCallbacks(self)"
 };
 
 //---------------------------------------------------------------------------
-/////////////////////////////////////////////////////////////////////////////
-//
-// $Log$
-// Revision 1.2  1998/08/15 07:36:39  RD
-// - Moved the header in the .i files out of the code that gets put into
-// the .cpp files.  It caused CVS conflicts because of the RCS ID being
-// different each time.
-//
-// - A few minor fixes.
-//
-// Revision 1.1  1998/08/09 08:25:51  RD
-// Initial version
-//
-//