X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a7a014180017908d32f0af32ebfa140fdc82b390..35d8bffe0132c6456678045a8ada4ca104bbc6f2:/wxPython/wx/lib/activexwrapper.py diff --git a/wxPython/wx/lib/activexwrapper.py b/wxPython/wx/lib/activexwrapper.py index 81a5d455c4..81cf8e6035 100644 --- a/wxPython/wx/lib/activexwrapper.py +++ b/wxPython/wx/lib/activexwrapper.py @@ -89,12 +89,13 @@ def MakeActiveXClass(CoClass, eventClass=None, eventObj=None): # These functions will be used as methods in the new class -def axw__init__(self, parent, ID, pos=wx.DefaultPosition, size=wx.DefaultSize, style=0): - +def axw__init__(self, parent, ID=-1, pos=wx.DefaultPosition, size=wx.DefaultSize, style=0): + # init base classes pywin.mfc.activex.Control.__init__(self) wx.Window.__init__( self, parent, -1, pos, size, style|wx.NO_FULL_REPAINT_ON_RESIZE) - + self.this.own(False) # this should be set in wx.Window.__init__ when it calls _setOORInfo, but... + win32ui.EnableControlContainer() self._eventObj = self._eventObj # move from class to instance @@ -113,7 +114,6 @@ def axw__init__(self, parent, ID, pos=wx.DefaultPosition, size=wx.DefaultSize, s # hook some wx events self.Bind(wx.EVT_SIZE, self.axw_OnSize) - def axw__getattr__(self, attr): try: return pywin.mfc.activex.Control.__getattr__(self, attr)