%addtofunc --> %pythonAppend

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

diff --git a/wxPython/contrib/iewin/iewin.i b/wxPython/contrib/iewin/iewin.i
index 76384ee1d0ca0d367f47efd7c044b496b216ab2b..01764566aaae6f0108e50e14e3d8fb4b8427dd59 100644 (file)
--- a/wxPython/contrib/iewin/iewin.i
+++ b/wxPython/contrib/iewin/iewin.i
@@ -14,31 +14,22 @@
 %module iewin
 
 %{
 %module iewin
 
 %{

-#include "wxPython.h"
+#include "wx/wxPython/wxPython.h"
+#include "wx/wxPython/pyclasses.h"
+#include "wx/wxPython/pyistream.h"    
+

 #include "IEHtmlWin.h"
 #include "IEHtmlWin.h"

-#include "pyistream.h"

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

-%include typemaps.i
-%include my_typemaps.i
-
-%extern wx.i
-%extern windows.i
-%extern _defs.i
-%extern misc.i
-%extern events.i
-%extern streams.i
+%import core.i
+%pythoncode { wx = core }

 
 

-%pragma(python) code = "import wx"
+MAKE_CONST_WXSTRING_NOSWIG(PanelNameStr);

 
 

-//---------------------------------------------------------------------------
+%include _iewin_rename.i

 
 

-%{
-    // Put some wx default wxChar* values into wxStrings.
-    DECLARE_DEF_STRING(PanelNameStr);
-%}

 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 


@@ -62,25 +53,14 @@ enum {
 };
 
 
 };
 
 

-%pragma(python) code = "
-def EVT_MSHTML_BEFORENAVIGATE2(win, id, func):
-    win.Connect(id, -1, wxEVT_COMMAND_MSHTML_BEFORENAVIGATE2, func)
-
-def EVT_MSHTML_NEWWINDOW2(win, id, func):
-    win.Connect(id, -1, wxEVT_COMMAND_MSHTML_NEWWINDOW2, func)
-
-def EVT_MSHTML_DOCUMENTCOMPLETE(win, id, func):
-    win.Connect(id, -1, wxEVT_COMMAND_MSHTML_DOCUMENTCOMPLETE, func)
-
-def EVT_MSHTML_PROGRESSCHANGE(win, id, func):
-    win.Connect(id, -1, wxEVT_COMMAND_MSHTML_PROGRESSCHANGE, func)
-
-def EVT_MSHTML_STATUSTEXTCHANGE(win, id, func):
-    win.Connect(id, -1, wxEVT_COMMAND_MSHTML_STATUSTEXTCHANGE, func)
-
-def EVT_MSHTML_TITLECHANGE(win, id, func):
-    win.Connect(id, -1, wxEVT_COMMAND_MSHTML_TITLECHANGE, func)
-"
+%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)
+EVT_MSHTML_PROGRESSCHANGE       = wx.PyEventBinder(wxEVT_COMMAND_MSHTML_PROGRESSCHANGE, 1)
+EVT_MSHTML_STATUSTEXTCHANGE     = wx.PyEventBinder(wxEVT_COMMAND_MSHTML_STATUSTEXTCHANGE, 1)
+EVT_MSHTML_TITLECHANGE          = wx.PyEventBinder(wxEVT_COMMAND_MSHTML_TITLECHANGE, 1)
+}

 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 


@@ -92,9 +72,11 @@ enum wxIEHtmlRefreshLevel {
 };
 
 
 };
 
 

-class wxIEHtmlWin : public wxWindow /* wxActiveX */
+class wxIEHtmlWin : public wxWindow /* wxActiveX */ 

 {
 public:
 {
 public:

+    %pythonAppend wxIEHtmlWin      "self._setOORInfo(self)"
+    

     wxIEHtmlWin(wxWindow * parent, wxWindowID id = -1,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
     wxIEHtmlWin(wxWindow * parent, wxWindowID id = -1,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,


@@ -105,13 +87,13 @@ public:
     bool LoadString(wxString html);
     bool LoadStream(wxInputStream *is);
 
     bool LoadString(wxString html);
     bool LoadStream(wxInputStream *is);
 

-    %pragma(python) addtoclass = "Navigate = LoadUrl"
+    %pythoncode { Navigate = LoadUrl }

 
     void SetCharset(wxString charset);
     void SetEditMode(bool seton);
     bool GetEditMode();
 
     void SetCharset(wxString charset);
     void SetEditMode(bool seton);
     bool GetEditMode();

-    wxString GetStringSelection(bool asHTML = FALSE);
-    wxString GetText(bool asHTML = FALSE);
+    wxString GetStringSelection(bool asHTML = False);
+    wxString GetText(bool asHTML = False);

 
     bool GoBack();
     bool GoForward();
 
     bool GoBack();
     bool GoForward();


@@ -125,15 +107,4 @@ public:
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-%init %{
-
-    wxClassInfo::CleanUpClasses();
-    wxClassInfo::InitializeClasses();
-
-%}
-
-//----------------------------------------------------------------------

 
 

-%pragma(python) include="_iewinextras.py";
-
-//---------------------------------------------------------------------------