X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03e9bead8a013fd207e9c3e35bcfdba22fef929d..99f09bc1b9cbc93a6cc952ec2c777d999d5483d0:/utils/wxPython/src/mdi.i

diff --git a/utils/wxPython/src/mdi.i b/utils/wxPython/src/mdi.i
index 1eb539eb83..86da963457 100644
--- 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,6 +42,8 @@ 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();
@@ -51,7 +56,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 +74,16 @@ public:
                     long style = wxDEFAULT_FRAME_STYLE,
                     const char* name = "frame");
 
+    %pragma(python) addtomethod = "__init__:wx._StdFrameCallbacks(self)"
+
     void Activate();
     void Maximize();
     void Restore();
+
+    void SetMenuBar(wxMenuBar *menu_bar);
+    void SetClientSize(int width, int height);
+    void GetPosition(int* OUTPUT, int* OUTPUT) const ;
+
 };
 
 
@@ -78,12 +92,42 @@ 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.5  1998/12/15 20:41:21  RD
+// Changed the import semantics from "from wxPython import *" to "from
+// wxPython.wx import *"  This is for people who are worried about
+// namespace pollution, they can use "from wxPython import wx" and then
+// prefix all the wxPython identifiers with "wx."
+//
+// Added wxTaskbarIcon for wxMSW.
+//
+// Made the events work for wxGrid.
+//
+// Added wxConfig.
+//
+// Added wxMiniFrame for wxGTK, (untested.)
+//
+// Changed many of the args and return values that were pointers to gdi
+// objects to references to reflect changes in the wxWindows API.
+//
+// Other assorted fixes and additions.
+//
+// Revision 1.4  1998/10/02 06:40:41  RD
+//
+// Version 0.4 of wxPython for MSW.
+//
+// Revision 1.3  1998/08/18 19:48:18  RD
+// more wxGTK compatibility things.
+//
+// It builds now but there are serious runtime problems...
+//
 // 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