X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c731eb47101d4656e5b736ce8e377830911bbe1d..0613b80c171f77425226621886e9160f6767ad30:/wxPython/contrib/iewin/iewin.i diff --git a/wxPython/contrib/iewin/iewin.i b/wxPython/contrib/iewin/iewin.i index 0259c427a2..01764566aa 100644 --- a/wxPython/contrib/iewin/iewin.i +++ b/wxPython/contrib/iewin/iewin.i @@ -14,22 +14,22 @@ %module iewin %{ -#include "wxPython.h" +#include "wx/wxPython/wxPython.h" +#include "wx/wxPython/pyclasses.h" +#include "wx/wxPython/pyistream.h" + #include "IEHtmlWin.h" %} //--------------------------------------------------------------------------- -%include typemaps.i -%include my_typemaps.i +%import core.i +%pythoncode { wx = core } + +MAKE_CONST_WXSTRING_NOSWIG(PanelNameStr); -%extern wx.i -%extern windows.i -%extern _defs.i -%extern misc.i -%extern events.i +%include _iewin_rename.i -%pragma(python) code = "import wx" //--------------------------------------------------------------------------- @@ -37,7 +37,7 @@ class wxMSHTMLEvent : public wxNotifyEvent { public: wxMSHTMLEvent(wxEventType commandType = wxEVT_NULL, int id = 0); - wxString GetText(); + wxString GetText1(); long GetLong1(); long GetLong2(); }; @@ -53,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) +} //--------------------------------------------------------------------------- @@ -83,26 +72,34 @@ enum wxIEHtmlRefreshLevel { }; -class wxIEHtmlWin : public wxWindow /* wxActiveX */ +class wxIEHtmlWin : public wxWindow /* wxActiveX */ { public: - wxIEHtmlWin(wxWindow * parent, wxWindowID id = -1); + %pythonAppend wxIEHtmlWin "self._setOORInfo(self)" + + 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); + + %pythoncode { Navigate = LoadUrl } 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 GoHome(); bool GoSearch(); - bool Refresh(wxIEHtmlRefreshLevel level); + %name(RefreshPage)bool Refresh(wxIEHtmlRefreshLevel level); bool Stop(); }; @@ -110,15 +107,4 @@ public: //--------------------------------------------------------------------------- -%init %{ - - wxClassInfo::CleanUpClasses(); - wxClassInfo::InitializeClasses(); - -%} -//---------------------------------------------------------------------- - -%pragma(python) include="_iewinextras.py"; - -//---------------------------------------------------------------------------