X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/81fd047894b93f13b252c2570b00ac234ed6ce8b..6caa0f5cd18fe9fb39c207d5f31fa5633479a822:/wxPython/src/aui.i

diff --git a/wxPython/src/aui.i b/wxPython/src/aui.i
index a544f93864..a5b3ff5f00 100755
--- a/wxPython/src/aui.i
+++ b/wxPython/src/aui.i
@@ -132,11 +132,21 @@ The following example shows a simple implementation that utilizes
 
 //---------------------------------------------------------------------------
 
-
+// Preprocessor stuff so SWIG doesn't get confused when %include-ing
+// the aui .h files.
+%ignore wxUSE_AUI;
+%ignore wxUSE_MENUS;
+%ignore wxABI_VERSION;
 #define wxUSE_AUI 1
+#define wxUSE_MENUS 1
+#define wxABI_VERSION 99999
+
 #define WXDLLIMPEXP_AUI
 #define unsigned
 #define wxDEPRECATED(decl)
+#define DECLARE_EVENT_TABLE()
+#define DECLARE_DYNAMIC_CLASS(foo)
+
 
 
 // We'll skip making wrappers for these, they have overloads that take a
@@ -175,20 +185,46 @@ The following example shows a simple implementation that utilizes
 %pythonAppend wxAuiTabCtrl::wxAuiTabCtrl "self._setOORInfo(self)";
 
 %pythonAppend wxAuiNotebook::wxAuiNotebook    "self._setOORInfo(self)";
-%pythonAppend wxAuiNotebook::wxAuiNotebook()  "self._setOORInfo(self)";
+%pythonAppend wxAuiNotebook::wxAuiNotebook()  "val._setOORInfo(val)";
 %ignore wxAuiiNotebook::~wxAuiNotebook;
 %rename(PreAuiNotebook) wxAuiNotebook::wxAuiNotebook();
 
+// Link error...
+%ignore wxAuiDefaultTabArt::SetWindow;        
+
+// ignore this overload
+%ignore wxAuiTabContainer::GetPage(size_t idx) const;
+
+
+
+%pythonAppend wxAuiMDIParentFrame::wxAuiMDIParentFrame    "self._setOORInfo(self)";
+%pythonAppend wxAuiMDIParentFrame::wxAuiMDIParentFrame()  "val._setOORInfo(val)";
+%ignore wxAuiMDIParentFrame::~wxAuiMDIParentFrame;
+%rename(PreAuiMDIParentFrame) wxAuiMDIParentFrame::wxAuiMDIParentFrame();
 
+%pythonAppend wxAuiMDIChildFrame::wxAuiMDIChildFrame    "self._setOORInfo(self)";
+%pythonAppend wxAuiMDIChildFrame::wxAuiMDIChildFrame()  "val._setOORInfo(val)";
+%ignore wxAuiMDIChildFrame::~wxAuiMDIChildFrame;
+%rename(PreAuiMDIChildFrame) wxAuiMDIChildFrame::wxAuiMDIChildFrame();
+
+%pythonAppend wxAuiMDIClientWindow::wxAuiMDIClientWindow    "self._setOORInfo(self)";
+%pythonAppend wxAuiMDIClientWindow::wxAuiMDIClientWindow()  "val._setOORInfo(val)";
+%ignore wxAuiMDIClientWindow::~wxAuiMDIClientWindow;
+%rename(PreAuiMDIClientWindow) wxAuiMDIClientWindow::wxAuiMDIClientWindow();
 
-%ignore wxAuiDefaultTabArt::SetWindow;        // Link error...
 
 //---------------------------------------------------------------------------
 // Get all our defs from the REAL header files.
+
+#define wxColor wxColour  // fix problem in dockart.h
+
 %include framemanager.h
 %include dockart.h
 %include floatpane.h
 %include auibook.h
+%include tabmdi.h
+
+#undef wxColor
 
 //---------------------------------------------------------------------------
 // Methods to inject into the FrameManager class that will sort out calls to
@@ -706,8 +742,4 @@ class wxPyAuiTabArt :  public wxAuiDefaultTabArt
 
 //---------------------------------------------------------------------------
 
-#undef wxUSE_AUI
-#undef WXDLLIMPEXP_AUI
-
-//---------------------------------------------------------------------------