Fixes to the wx examples. Using Timer by default, instead of

cztomczak · cztomczak · commit 24e44d3189e1 · 2013-12-14T20:44:16.000+01:00
EVT_IDLE. Changed the behavior of browser cleanup on close.

Suppress msgbox in cefpython3 installer, it breaks installation
when running installer from command line with the /SILENT
flag. By default uninstall any previously installed cefpython
package without asking.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+cef3-trunk
+svn-win32-1.8.5
diff --git a/cefpython/cef3/windows/binaries/wxpython.py b/cefpython/cef3/windows/binaries/wxpython.py
@@ -27,10 +27,24 @@
 import platform
 
 # Which method to use for message loop processing.
-#   EVT_IDLE - wx application has priority (default)
-#   EVT_TIMER - cef browser has priority
+#   EVT_IDLE - wx application has priority
+#   EVT_TIMER - cef browser has priority (default)
 # It seems that Flash content behaves better when using a timer.
-USE_EVT_IDLE = True
+# Not sure if using EVT_IDLE is correct, it doesn't work on Linux,
+# on Windows it works fine, but read the comment below.
+"""
+See comment by Robin Dunn:
+https://groups.google.com/d/msg/wxpython-users/hcNdMEx8u48/MD5Jgbm_k1kJ
+-------------------------------------------------------------------------------
+EVT_IDLE events are not sent continuously while the application is idle. 
+They are sent (normally once) when the app *becomes* idle, which 
+usually means when the event queue has just been emptied.  If you want 
+EVT_IDLE events to be sent continuously then you need to call 
+event.RequestMore() from the handler. Be careful however as that will 
+cause your application to consume 100% of the CPU if there is no limits.
+-------------------------------------------------------------------------------
+"""
+USE_EVT_IDLE = False # If False then Timer will be used.
 
 TEST_EMBEDDING_IN_PANEL = True
 
@@ -167,11 +181,14 @@ def OnSize(self, event):
         cefpython.WindowUtils.OnSize(self.GetHandleForBrowser(), 0, 0, 0)
 
     def OnClose(self, event):
-        self.browser.CloseBrowser()
+        print("MainFrame.OnClose()")
+        self.browser.ParentWindowWillClose()
         self.Destroy()
 
     def OnIdle(self, event):
         cefpython.MessageLoopWork()
+        # See the comment at the top of the file by Robin Dunn.
+        # | event.RequestMore()
 
 def PyPrint(message):
     print(message)
diff --git a/cefpython/cef3/windows/installer/innosetup.template b/cefpython/cef3/windows/installer/innosetup.template
@@ -129,7 +129,7 @@ begin
 
                     MsgBox('No installation of Python %(PYTHON_VERSION)s '
                            + 'found in registry.' + #13 + 'Be sure to enter '
-                           + 'a pathname that places CEF Python 3 on the '
+                           + 'a pathname that places Python on the '
                            + 'PYTHONPATH',
                            mbConfirmation, MB_OK);
                     PythonDir := 'C:\Python';
@@ -154,14 +154,8 @@ begin
     Result := False;
     if FileExists(FileName) then begin
         Result := True;
-        ResultCode := MsgBox('A prior CEF Python 3 installation was found in '
-                + 'this directory.  It' + #13 + 'is recommended that it be '
-                + 'uninstalled first.' + #13#13 + 'Should I do it?',
-                mbConfirmation, MB_YESNO);
-        if ResultCode = IDYES then begin
-            Exec(FileName, '/SILENT', WizardDirValue(), SW_SHOWNORMAL,
-                 ewWaitUntilTerminated, ResultCode);
-        end;
+        Exec(FileName, '/SILENT', WizardDirValue(), SW_SHOWNORMAL,
+             ewWaitUntilTerminated, ResultCode);
     end;
 end;
 
diff --git a/cefpython/cef3/wx-subpackage/chromectrl.py b/cefpython/cef3/wx-subpackage/chromectrl.py
@@ -89,14 +89,9 @@ class ChromeWindow(wx.Window):
     Standalone CEF component. The class provides facilites for interacting
     with wx message loop
     """
-    def __init__(self, parent, url="", useTimer=None,
+    def __init__(self, parent, url="", useTimer=True,
                  timerMillis=DEFAULT_TIMER_MILLIS, browserSettings=None,
                  size=(-1, -1), *args, **kwargs):
-        if platform.system() == "Linux" and useTimer == None:
-            # On Linux OnIdle does not work correctly, must use timer.
-            useTimer = True
-        useTimer = bool(useTimer)
-
         wx.Window.__init__(self, parent, id=wx.ID_ANY, size=size,
                            *args, **kwargs)
         # On Linux absolute file urls need to start with "file://"
@@ -126,22 +121,29 @@ def __init__(self, parent, url="", useTimer=None,
         if platform.system() == "Windows":
             self.Bind(wx.EVT_SET_FOCUS, self.OnSetFocus)
             self.Bind(wx.EVT_SIZE, self.OnSize)
+        
         if useTimer:
             self.timerID = 1
             self._CreateTimer(timerMillis)
         else:
             self.Bind(wx.EVT_IDLE, self.OnIdle)
+
+        self.Bind(wx.EVT_CLOSE, self.OnClose)
         self._useTimer = useTimer
 
-    def __del__(self):
-        '''cleanup stuff'''
+    def OnClose(self, event):
         if self._useTimer:
             self.timer.Stop()
-        # Calling Unbind() is unnecessary and will cause problems on Windows 8:
-        # https://groups.google.com/d/topic/cefpython/iXE7e1ekArI/discussion
-        # | self.Unbind(wx.EVT_IDLE)
-        # CloseBrowser() parameter: forceClose=True
-        self.browser.CloseBrowser(True)
+        else:
+            try:
+                self.Unbind(wx.EVT_IDLE)
+            except:
+                # Calling Unbind() may cause problems on Windows 8:
+                # https://groups.google.com/d/topic/cefpython/iXE7e1ekArI/discussion
+                # (it was causing problems in __del__, this might not
+                #  be true anymore in OnClose, but still let's make sure)
+                pass
+        self.browser.ParentWindowWillClose()
 
     def _CreateTimer(self, millis):
         self.timer = wx.Timer(self, self.timerID)
@@ -191,15 +193,10 @@ def LoadUrl(self, url, onLoadStart=None, onLoadEnd=None):
 
 
 class ChromeCtrl(wx.Panel):
-    def __init__(self, parent, url="", useTimer=None,
+    def __init__(self, parent, url="", useTimer=True,
                  timerMillis=DEFAULT_TIMER_MILLIS, 
                  browserSettings=None, hasNavBar=True,
                  *args, **kwargs):
-        if platform.system() == "Linux" and useTimer == None:
-            # On Linux OnIdle does not work correctly, must use timer.
-            useTimer = True
-        useTimer = bool(useTimer)
-
         # You also have to set the wx.WANTS_CHARS style for
         # all parent panels/controls, if it's deeply embedded.
         wx.Panel.__init__(self, parent, style=wx.WANTS_CHARS, *args, **kwargs)
