Merge remote-tracking branch 'origin/master'

Czarek · Czarek · commit 142df92108e8 · 2015-01-10T18:33:26.000+01:00
diff --git a/cefpython/cef3/wx-subpackage/chromectrl.py b/cefpython/cef3/wx-subpackage/chromectrl.py
@@ -132,6 +132,12 @@ def __init__(self, parent, url="", useTimer=True,
                  size=(-1, -1), *args, **kwargs):
         wx.Window.__init__(self, parent, id=wx.ID_ANY, size=size,
                            *args, **kwargs)
+
+        # This timer is not used anymore, but creating it for backwards
+        # compatibility. In one of external projects ChromeWindow.timer.Stop()
+        # is being called during browser destruction.
+        self.timer = wx.Timer()
+
         # On Linux absolute file urls need to start with "file://"
         # otherwise a path of "/home/some" is converted to "http://home/some".
         if platform.system() == "Linux":
