rebaked to include latest modifications (mainly choicebkg addition)

[wxWidgets.git] / wxPython / contrib / iewin / iewin.i

diff --git a/wxPython/contrib/iewin/iewin.i b/wxPython/contrib/iewin/iewin.i
index f2d402722267807fdac27d9b2ed44797c0463862..e76a1f80bd41cea157fef2f9216034d95bb6c65d 100644 (file)
--- a/wxPython/contrib/iewin/iewin.i
+++ b/wxPython/contrib/iewin/iewin.i
@@ -11,7 +11,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
-%module iewin
+%module(package="wx") iewin
 
 %{
 #include "wx/wxPython/wxPython.h"
@@ -24,7 +24,13 @@
 //---------------------------------------------------------------------------
 
 %import core.i
-%pythoncode { wx = core }
+%pythoncode { wx = _core }
+%pythoncode { __docfilter__ = wx.__DocFilter(globals()) }
+%pythoncode {
+    import warnings
+    warnings.warn("This module is deprecated.  Please use the wx.lib.iewin module instead.",    
+                  DeprecationWarning, stacklevel=2)
+}
 
 MAKE_CONST_WXSTRING_NOSWIG(PanelNameStr);
 
@@ -53,8 +59,7 @@ enum {
 };
 
 
-%pythoncode {
-    
+%pythoncode {    
 EVT_MSHTML_BEFORENAVIGATE2      = wx.PyEventBinder(wxEVT_COMMAND_MSHTML_BEFORENAVIGATE2, 1)
 EVT_MSHTML_NEWWINDOW2           = wx.PyEventBinder(wxEVT_COMMAND_MSHTML_NEWWINDOW2, 1)
 EVT_MSHTML_DOCUMENTCOMPLETE     = wx.PyEventBinder(wxEVT_COMMAND_MSHTML_DOCUMENTCOMPLETE, 1)
@@ -73,10 +78,12 @@ enum wxIEHtmlRefreshLevel {
 };
 
 
+MustHaveApp(wxIEHtmlWin);
+
 class wxIEHtmlWin : public wxWindow /* wxActiveX */ 
 {
 public:
-    %addtofunc wxIEHtmlWin      "self._setOORInfo(self)"
+    %pythonAppend wxIEHtmlWin      "self._setOORInfo(self)"
     
     wxIEHtmlWin(wxWindow * parent, wxWindowID id = -1,
                 const wxPoint& pos = wxDefaultPosition,