updates from Andrea, plus some fixes

[wxWidgets.git] / wxPython / wx / lib / iewin.py

diff --git a/wxPython/wx/lib/iewin.py b/wxPython/wx/lib/iewin.py
index 31e6f0179516386024b53fc24de74d0555361fcc..cf74d7fdc145dac98f683e9e23de00ab2295cbd4 100644 (file)
--- a/wxPython/wx/lib/iewin.py
+++ b/wxPython/wx/lib/iewin.py
@@ -110,11 +110,16 @@ EVT_PrivacyImpactedStateChange = wx.PyEventBinder(wxEVT_PrivacyImpactedStateChan
 # 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...