wxAUI: Support serialization of individual PaneInfo structures

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

diff --git a/wxPython/src/aui.i b/wxPython/src/aui.i
index 72cf5dcc7e61a614623c7431fbad3804795cf72d..2c5857c6f4f87d37cdeb067499c9f60eed35c0c1 100755 (executable)
--- a/wxPython/src/aui.i
+++ b/wxPython/src/aui.i
@@ -136,8 +136,11 @@ The following example shows a simple implementation that utilizes
 #define wxUSE_AUI 1
 #define WXDLLIMPEXP_AUI
 #define unsigned
 #define wxUSE_AUI 1
 #define WXDLLIMPEXP_AUI
 #define unsigned

+#define wxDEPRECATED(decl)

 
 

-// We'll let SWIG handle the function overloading for these
+
+// We'll skip making wrappers for these, they have overloads that take a
+// wxSize or wxPoint

 %ignore wxPaneInfo::MaxSize(int x, int y);
 %ignore wxPaneInfo::MinSize(int x, int y);
 %ignore wxPaneInfo::BestSize(int x, int y);
 %ignore wxPaneInfo::MaxSize(int x, int y);
 %ignore wxPaneInfo::MinSize(int x, int y);
 %ignore wxPaneInfo::BestSize(int x, int y);


@@ -151,8 +154,11 @@ The following example shows a simple implementation that utilizes
 
 %rename(_AddPane1) wxFrameManager::AddPane(wxWindow* window, const wxPaneInfo& pane_info);
 %rename(_AddPane2) wxFrameManager::AddPane(wxWindow* window, int direction = wxLEFT,
 
 %rename(_AddPane1) wxFrameManager::AddPane(wxWindow* window, const wxPaneInfo& pane_info);
 %rename(_AddPane2) wxFrameManager::AddPane(wxWindow* window, int direction = wxLEFT,

-                                          const wxString& caption = wxEmptyString);
+                                           const wxString& caption = wxEmptyString);

 
 

+%rename(AddPaneAtPos) wxFrameManager::AddPane(wxWindow* window,
+                                              const wxPaneInfo& pane_info,
+                                              const wxPoint& drop_pos);

 
 // A typemap for the return value of wxFrameManager::GetAllPanes
 %typemap(out) wxPaneInfoArray& {
 
 // A typemap for the return value of wxFrameManager::GetAllPanes
 %typemap(out) wxPaneInfoArray& {


@@ -164,19 +170,28 @@ The following example shows a simple implementation that utilizes
 }
 
 
 }
 
 

+%nokwargs wxAuiTabContainer::SetActivePage;
+
+%pythonAppend wxAuiTabCtrl::wxAuiTabCtrl "self._setOORInfo(self)";
+
+%pythonAppend wxAuiMultiNotebook::wxAuiMultiNotebook    "self._setOORInfo(self)";
+%pythonAppend wxAuiMultiNotebook::wxAuiMultiNotebook()  "self._setOORInfo(self)";
+%ignore wxAuiMultiNotebook::~wxAuiMultiNotebook;
+%rename(PreAuiMultiNotebook) wxAuiMultiNotebook::wxAuiMultiNotebook();
+

 //---------------------------------------------------------------------------
 // Get all our defs from the REAL header files.
 %include framemanager.h
 %include dockart.h
 %include floatpane.h
 //---------------------------------------------------------------------------
 // Get all our defs from the REAL header files.
 %include framemanager.h
 %include dockart.h
 %include floatpane.h

-
+%include auibook.h

 
 //---------------------------------------------------------------------------
 // Methods to inject into the FrameManager class that will sort out calls to
 // the overloaded versions of GetPane and AddPane
 
 %extend wxFrameManager {
 
 //---------------------------------------------------------------------------
 // Methods to inject into the FrameManager class that will sort out calls to
 // the overloaded versions of GetPane and AddPane
 
 %extend wxFrameManager {

-%pythoncode {
+    %pythoncode {

     def GetPane(self, item):
         """
         GetPane(self, window_or_info item) -> PaneInfo
     def GetPane(self, item):
         """
         GetPane(self, window_or_info item) -> PaneInfo


@@ -222,12 +237,21 @@ The following example shows a simple implementation that utilizes
             if caption is None:
                 caption = ""
             return self._AddPane2(window, info, caption)
             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.")
+    }

 }
 
 //---------------------------------------------------------------------------
 
 %{
 }
 
 //---------------------------------------------------------------------------
 
 %{

+// A wxDocArt lcass that knows how to forward virtuals to Python methods  

 class wxPyDockArt :  public wxDefaultDockArt
 {
     wxPyDockArt() : wxDefaultDockArt() {}
 class wxPyDockArt :  public wxDefaultDockArt
 {
     wxPyDockArt() : wxDefaultDockArt() {}