X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7c75283f2144469e8fa6a24ca285b42fab69a6b..8170f2ee3eeff010b78c8b204f0b6d598c6e1066:/wxPython/wx/lib/iewin.py?ds=inline diff --git a/wxPython/wx/lib/iewin.py b/wxPython/wx/lib/iewin.py index 7ebc0097c2..cf74d7fdc1 100644 --- a/wxPython/wx/lib/iewin.py +++ b/wxPython/wx/lib/iewin.py @@ -107,14 +107,19 @@ EVT_UpdatePageStatus = wx.PyEventBinder(wxEVT_UpdatePageStatus, 1) EVT_PrivacyImpactedStateChange = wx.PyEventBinder(wxEVT_PrivacyImpactedStateChange, 1) -# For this there are af ew special methods implemented in C++ in the +# For this there are a few special methods implemented in C++ in the # IEHtmlWindowBase class, so derive from it instead of ActiveXWindow. class IEHtmlWindow(wx.activex.IEHtmlWindowBase): - def __init__(self, parent, ID=-1, pos=wx.DefaultPosition, - size=wx.DefaultSize, style=0, name='IEHtmlWindow'): + def __init__(self, parent, id=-1, pos=wx.DefaultPosition, + size=wx.DefaultSize, style=0, name='IEHtmlWindow', ID=-1): + # in case the old 'ID' param is used as a keyword + if ID != -1: + id = ID + wx.activex.IEHtmlWindowBase.__init__(self, parent, wx.activex.CLSID('{8856F961-340A-11D0-A96B-00C04FD705A2}'), - ID, pos, size, style, name) + id, pos, size, style, name) + # Methods from IEHtmlWindowBase. Redirected from here just for # the sake of completeness... @@ -136,7 +141,7 @@ class IEHtmlWindow(wx.activex.IEHtmlWindowBase): return self.Navigate2(URL, Flags) - def GetStringSelection(self, asHTML): + def GetStringSelection(self, asHTML=True): """ Returns the contents of the selected portion of the document as either html or plain text. @@ -144,7 +149,7 @@ class IEHtmlWindow(wx.activex.IEHtmlWindowBase): return wx.activex.IEHtmlWindowBase.GetStringSelection(self, asHTML) - def GetText(self, asHTML): + def GetText(self, asHTML=True): """ Returns the contents of the the html document as either html or plain text. """