Get/SetManagedWindow

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/_aui_docstrings.i b/wxPython/src/_aui_docstrings.i
index 72feb570e6622047d46089b083aa21ce2eafab67..0937cf027ad4326c283012d39c68bb9f597a92a3 100644 (file)
--- a/wxPython/src/_aui_docstrings.i
+++ b/wxPython/src/_aui_docstrings.i
@@ -83,9 +83,9 @@ pane will end up:
 DocStr(wxFrameManager::wxFrameManager,
 "Constructor.
 
-    :param frame: Specifies the `wx.Frame` which should be managed.
-        If not set in the call to this constructor then `SetFrame`
-        should be called.
+    :param managed_wnd: Specifies the `wx.Window` which should be
+        managed.  If not set in the call to this constructor then
+        `SetManagedWindow` should be called later.
 
     :param flags: Specifies options which allow the frame management
         behavior to be modified.
@@ -113,7 +113,7 @@ Valid flags are:
 DocStr(wxFrameManager::UnInit,
 "UnInit uninitializes the framework and should be called before a
 managed frame is destroyed. UnInit is usually called in the managed
-wx.Frame's destructor.
+window's destructor.
 ", "");
 
 DocStr(wxFrameManager::SetFlags,
@@ -125,14 +125,16 @@ DocStr(wxFrameManager::GetFlags,
 "GetFlags returns the current FrameManager's flags.
 ", "");
 
-DocStr(wxFrameManager::SetFrame,
-"SetFrame is called to specify the frame which is to be managed by the
-FrameManager.  It only needs to be called if the Frame was not given
-to the manager in the constructor.
+DocStr(wxFrameManager::SetManagedWindow,
+"SetManagedWindow is called to specify the window which is to be
+managed by the FrameManager.  It is normally a `wx.Frame` but it is
+possible to also allow docking within any container window.  This only
+needs to be called if the window was not given to the manager in the
+constructor.
 ", "");
 
-DocStr(wxFrameManager::GetFrame,
-"GetFrame returns the frame currently being managed by the
+DocStr(wxFrameManager::GetManagedWindow,
+"GetManagedWindow returns the window currently being managed by the
 FrameManager.
 ", "");
 

diff --git a/wxPython/src/aui.i b/wxPython/src/aui.i
index 72cf5dcc7e61a614623c7431fbad3804795cf72d..460622c94b612ede6158de43d632893df8ed7f19 100755 (executable)
--- a/wxPython/src/aui.i
+++ b/wxPython/src/aui.i
@@ -136,6 +136,8 @@ The following example shows a simple implementation that utilizes
 #define wxUSE_AUI 1
 #define WXDLLIMPEXP_AUI
 #define unsigned
+#define wxDEPRECATED(decl)
+
 
 // We'll let SWIG handle the function overloading for these
 %ignore wxPaneInfo::MaxSize(int x, int y);
@@ -176,7 +178,7 @@ The following example shows a simple implementation that utilizes
 // the overloaded versions of GetPane and AddPane
 
 %extend wxFrameManager {
-%pythoncode {
+    %pythoncode {
     def GetPane(self, item):
         """
         GetPane(self, window_or_info item) -> PaneInfo
@@ -222,7 +224,15 @@ The following example shows a simple implementation that utilizes
             if caption is None:
                 caption = ""
             return self._AddPane2(window, info, caption)
-}
+    }
+
+    // For backwards compatibility
+    %pythoncode {
+         SetFrame = wx._deprecated(SetManagedWindow,
+                                   "SetFrame is deprecated, use `SetManagedWindow` instead.")
+         GetFrame = wx._deprecated(GetManagedWindow,
+                                   "GetFrame is deprecated, use `GetManagedWindow` instead.")
+    }
 }
 
 //---------------------------------------------------------------------------