memory dc must have bitmap selected into it before it can be used for measuring

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

diff --git a/wxPython/wx/lib/activexwrapper.py b/wxPython/wx/lib/activexwrapper.py
index e4e66f445e7fbca3549a8d02094b41f4791064ad..81cf8e6035257c2bef96422655d7d62c5ee04853 100644 (file)
--- 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
 
 
 # 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)
     # 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
 
     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)
 
     # 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)
 def axw__getattr__(self, attr):
     try:
         return pywin.mfc.activex.Control.__getattr__(self, attr)


@@ -135,7 +135,7 @@ def axw_OEB(self, event):
 
 
 def axw_Cleanup(self):
 
 
 def axw_Cleanup(self):

-    del self._wnd
+    #del self._wnd

     self.close()
     pass
 
     self.close()
     pass