X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c731eb47101d4656e5b736ce8e377830911bbe1d..6a30d63aeddf193ee6e672ce29911a8d29f4fe03:/wxPython/contrib/iewin/iewin.i

diff --git a/wxPython/contrib/iewin/iewin.i b/wxPython/contrib/iewin/iewin.i
index 0259c427a2..4420198602 100644
--- a/wxPython/contrib/iewin/iewin.i
+++ b/wxPython/contrib/iewin/iewin.i
@@ -16,6 +16,7 @@
 %{
 #include "wxPython.h"
 #include "IEHtmlWin.h"
+#include "pyistream.h"
 %}
 
 //---------------------------------------------------------------------------
@@ -28,16 +29,24 @@
 %extern _defs.i
 %extern misc.i
 %extern events.i
+%extern streams.i
 
 %pragma(python) code = "import wx"
 
 //---------------------------------------------------------------------------
 
+%{
+    // Put some wx default wxChar* values into wxStrings.
+    DECLARE_DEF_STRING(PanelNameStr);
+%}
+
+//---------------------------------------------------------------------------
+
 class wxMSHTMLEvent : public wxNotifyEvent
 {
 public:
     wxMSHTMLEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
-    wxString GetText();
+    wxString GetText1();
     long GetLong1();
     long GetLong2();
 };
@@ -86,11 +95,17 @@ enum wxIEHtmlRefreshLevel {
 class wxIEHtmlWin : public wxWindow /* wxActiveX */
 {
 public:
-    wxIEHtmlWin(wxWindow * parent, wxWindowID id = -1);
+    wxIEHtmlWin(wxWindow * parent, wxWindowID id = -1,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxString& name = wxPyPanelNameStr);
 
     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);
@@ -102,7 +117,7 @@ public:
     bool GoForward();
     bool GoHome();
     bool GoSearch();
-    bool Refresh(wxIEHtmlRefreshLevel level);
+    %name(RefreshPage)bool Refresh(wxIEHtmlRefreshLevel level);
     bool Stop();
 
 };
@@ -112,9 +127,6 @@ public:
 
 %init %{
 
-    wxClassInfo::CleanUpClasses();
-    wxClassInfo::InitializeClasses();
-
 %}
 
 //----------------------------------------------------------------------