Moved tools to be a Python package in wxPython.tools, added scripts to

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

diff --git a/wxPython/contrib/iewin/iewin.i b/wxPython/contrib/iewin/iewin.i
index ee39c836a8cd44d229f155958de32af180fc247f..8a90a95c0cee2ac5e3ba80dbb43239d6314b4d4c 100644 (file)
--- a/wxPython/contrib/iewin/iewin.i
+++ b/wxPython/contrib/iewin/iewin.i
@@ -16,6 +16,7 @@
 %{
 #include "wxPython.h"
 #include "IEHtmlWin.h"
 %{
 #include "wxPython.h"
 #include "IEHtmlWin.h"

+#include "pyistream.h"

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


@@ -28,6 +29,7 @@
 %extern _defs.i
 %extern misc.i
 %extern events.i
 %extern _defs.i
 %extern misc.i
 %extern events.i

+%extern streams.i

 
 %pragma(python) code = "import wx"
 
 
 %pragma(python) code = "import wx"
 


@@ -44,7 +46,7 @@ class wxMSHTMLEvent : public wxNotifyEvent
 {
 public:
     wxMSHTMLEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
 {
 public:
     wxMSHTMLEvent(wxEventType commandType = wxEVT_NULL, int id = 0);

-    wxString GetText();
+    wxString GetText1();

     long GetLong1();
     long GetLong2();
 };
     long GetLong1();
     long GetLong2();
 };


@@ -101,7 +103,9 @@ public:
 
     void LoadUrl(const wxString&);
     bool LoadString(wxString html);
 
     void LoadUrl(const wxString&);
     bool LoadString(wxString html);

-    /* bool LoadStream(istream *strm); */
+    bool LoadStream(wxInputStream *is);
+
+    %pragma(python) addtoclass = "Navigate = LoadUrl"

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