stdexception
diff --git a/‎cefpython/cef1/wx-subpackage/chromectrl.py‎
Lines changed: 47 additions & 45 deletions b/‎cefpython/cef1/wx-subpackage/chromectrl.py‎
Lines changed: 47 additions & 45 deletions
diff --git a/‎cefpython/cef1/wx-subpackage/examples/sample1.html‎
Lines changed: 33 additions & 0 deletions b/‎cefpython/cef1/wx-subpackage/examples/sample1.html‎
Lines changed: 33 additions & 0 deletions
diff --git a/‎cefpython/cef1/wx-subpackage/examples/sample1.py‎
Lines changed: 4 additions & 8 deletions b/‎cefpython/cef1/wx-subpackage/examples/sample1.py‎
Lines changed: 4 additions & 8 deletions
diff --git a/‎cefpython/cef1/wx-subpackage/examples/sample2.py‎
Lines changed: 5 additions & 5 deletions b/‎cefpython/cef1/wx-subpackage/examples/sample2.py‎
Lines changed: 5 additions & 5 deletions
diff --git a/‎cefpython/cef1/wx-subpackage/examples/sample3.py‎
Lines changed: 3 additions & 3 deletions b/‎cefpython/cef1/wx-subpackage/examples/sample3.py‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎cefpython/cef1/wx-subpackage/utils.py‎
Lines changed: 10 additions & 23 deletions b/‎cefpython/cef1/wx-subpackage/utils.py‎
Lines changed: 10 additions & 23 deletions
@@ -3,29 +3,12 @@
 
 #--------------------------------------------------------------------------------
 
-import platform
-if platform.architecture()[0] != "32bit":
-    raise Exception("Only 32bit architecture is supported")
-
-import os
-import sys
-try:
-    # Import local PYD file (portable zip).
-    if sys.hexversion >= 0x02070000 and sys.hexversion < 0x03000000:
-        import cefpython_py27 as cefpython
-    elif sys.hexversion >= 0x03000000 and sys.hexversion < 0x04000000:
-        import cefpython_py32 as cefpython
-    else:
-        raise Exception("Unsupported python version: %s" % sys.version)
-except ImportError:
-    # Import from package (installer).
-    from cefpython1 import cefpython
-
+from cefpython1 import cefpython
+from cefpython1.wx.utils import ExceptHook
+import os, sys, platform
 import wx
 import wx.lib.buttons as buttons
 
-from cefpython1.wx.utils import GetApplicationPath
-
 #-------------------------------------------------------------------------------
 
 # Default timer interval when timer used to service CEF message loop
@@ -111,14 +94,35 @@ def __init__(self, parent, url="", useTimer=False,
                  *args, **kwargs):
         wx.Window.__init__(self, parent, id=wx.ID_ANY, size=size,
                            *args, **kwargs)
+        # 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":
+            if url.startswith("/"):
+                url = "file://" + url
         self.url = url
+        
         windowInfo = cefpython.WindowInfo()
-        windowInfo.SetAsChild(self.GetHandle())
+        if platform.system() == "Windows":
+            windowInfo.SetAsChild(self.GetHandle())
+        elif platform.system() == "Linux":
+            windowInfo.SetAsChild(self.GetGtkWidget())
+        else:
+            raise Exception("Unsupported OS")
+        
+        # TODO: allow for custom browser settings for the ChromeWindow
+        browserSettings = {}
+        if platform.system() == "Linux":
+            # Disable plugins on Linux as Flash will crash the application
+            # in CEF 1 on Linux, it's a known problem.
+            if not "plugins_disabled" in browserSettings:
+                browserSettings["plugins_disabled"] = True
+
         self.browser = cefpython.CreateBrowserSync(windowInfo,
-                browserSettings={}, navigateUrl=url)
+                browserSettings=browserSettings, navigateUrl=url)
 
-        self.Bind(wx.EVT_SET_FOCUS, self.OnSetFocus)
-        self.Bind(wx.EVT_SIZE, self.OnSize)
+        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)
@@ -149,11 +153,12 @@ def OnIdle(self, event):
         event.Skip()
 
     def OnSetFocus(self, event):
+        """OS_WIN only."""
         cefpython.WindowUtils.OnSetFocus(self.GetHandle(), 0, 0, 0)
         event.Skip()
 
     def OnSize(self, event):
-        """Handle the the size event"""
+        """OS_WIN only. Handle the the size event"""
         cefpython.WindowUtils.OnSize(self.GetHandle(), 0, 0, 0)
         event.Skip()
 
@@ -246,6 +251,8 @@ def OnLoadStart(self, browser, frame):
                 browser.GetMainFrame().GetUrl())
             self.navigationBar.AddToHistory(browser.GetMainFrame().GetUrl())
 
+    def OnLoadEnd(self, browser, frame, httpStatusCode):
+        pass
 
 class DefaultClientHandler(object):
     def __init__(self, parentCtrl):
@@ -259,7 +266,7 @@ def OnLoadEnd(self, browser, frame, httpStatusCode):
 
     def OnLoadError(self, browser, frame, errorCode, failedUrl, errorText):
         # TODO
-        print "ERROR LOADING URL : %" % failedUrl
+        print("ERROR LOADING URL : %s" % failedUrl)
 
 class CallbackClientHandler(object):
     def __init__(self, onLoadStart=None, onLoadEnd=None):
@@ -276,7 +283,7 @@ def OnLoadEnd(self, browser, frame, httpStatusCode):
 
     def OnLoadError(self, browser, frame, errorCode, failedUrl, errorText):
         # TODO
-        print "ERROR LOADING URL : %" % failedUrl
+        print("ERROR LOADING URL : %s" % failedUrl)
 
 #-------------------------------------------------------------------------------
 
@@ -286,26 +293,21 @@ def Initialize(settings=None):
     """
     sys.excepthook = ExceptHook
     if not settings:
-        settings = {
-            "log_severity": cefpython.LOGSEVERITY_INFO,
-            "log_file": GetApplicationPath("debug.log"),
-            "release_dcheck_enabled": True # Enable only when debugging.
-        }
+        settings = {}
+    if not "log_severity" in settings:
+        settings["log_severity"] = cefpython.LOGSEVERITY_INFO
+    if not "log_file" in settings:
+        settings["log_file"] = ""
+    if platform.system() == "Linux":
+        # On Linux we need to set locales and resources directories.
+        if not "locales_dir_path" in settings:
+            settings["locales_dir_path"] = cefpython.GetModuleDirectory()+(
+                "/locales")
+        if not "resources_dir_path" in settings:
+            settings["resources_dir_path"] = cefpython.GetModuleDirectory()
+        
     cefpython.Initialize(settings)
 
 def Shutdown():
     """Shuts down CEF, should be called by app exiting code"""
     cefpython.Shutdown()
-
-def ExceptHook(t, value, traceObject):
-    import traceback, os, time
-    # This hook does the following: in case of exception display it,
-    # write to error.log, shutdown CEF and exit application.
-    error = "\n".join(traceback.format_exception(t, value, traceObject))
-    with open(GetApplicationPath("error.log"), "a") as f:
-        f.write("\n[%s] %s\n" % (time.strftime("%Y-%m-%d %H:%M:%S"), error))
-    print("\n"+error+"\n")
-    ##cefpython.QuitMessageLoop()
-    ##cefpython.Shutdown()
-    # So that "finally" does not execute.
-    ##os._exit(1)
 
@@ -0,0 +1,33 @@
+<!doctype html>
+<html>
+<head>
+    <meta charset=utf-8>
+    <title>sample 1</title>
+    <style>
+    body { font: 13px Segoe UI, Arial; line-height: 1.4em; }
+    pre { background: #ddd; font: 12px Consolas, Courier New; }
+    </style>
+</head>
+<body>
+
+sample1.py - wxPython example for the CEF Python framework
+
+<h3>Google Search</h3>
+
+    <a href="http://www.google.com/">http://www.google.com/</a>
+
+<h3>User agent</h3>
+
+    <script>document.write(navigator.userAgent)</script>
+
+<h3>Popup</h3>
+
+    <a href="javascript:window.open('sample1.html')">
+    	window.open('sample1.html')</a>
+
+<br><br><br><br><br><br><br><br><br><br><br>
+<br><br><br><br><br><br><br><br><br><br><br>
+<br><br><br><br><br><br><br><br><br><br><br>
+
+</body>
+</html>
@@ -3,7 +3,6 @@
 
 import os
 import wx
-
 import cefpython1.wx.chromectrl as chrome
 
 class MainFrame(wx.Frame):
@@ -12,10 +11,8 @@ def __init__(self):
                           title='cefwx example1', size=(600,400))
 
         self.cefWindow = chrome.ChromeWindow(self,
-                #url=os.path.join(os.path.dirname(os.path.abspath(__file__)),
-                # "../cefsimple.html"))
                 url=os.path.join(os.path.dirname(os.path.abspath(__file__)),
-                                 "../withpopup.html"))
+                                 "sample1.html"))
 
         sizer = wx.BoxSizer()
         sizer.Add(self.cefWindow, 1, wx.EXPAND, 0)
@@ -28,11 +25,10 @@ def OnClose(self, event):
 
 if __name__ == '__main__':
     chrome.Initialize()
-    print('wx.version=%s' % wx.version())
+    print('sample1.py: wx.version=%s' % wx.version())
     app = wx.PySimpleApp()
     MainFrame().Show()
     app.MainLoop()
-    del app # Let wx.App destructor do the cleanup before calling cefpython.Shutdown().
+    # Important: do the wx cleanup before calling Shutdown.
+    del app
     chrome.Shutdown()
-
-
@@ -3,7 +3,6 @@
 
 import wx
 import wx.lib.agw.flatnotebook as fnb
-
 import cefpython1.wx.chromectrl as chrome
 
 ROOT_NAME = "My Locations"
@@ -21,7 +20,7 @@
 class MainFrame(wx.Frame):
     def __init__(self):
         wx.Frame.__init__(self, parent=None, id=wx.ID_ANY,
-                          title='cefwx example2', size=(600, 400))
+                          title='cefwx example2', size=(1024, 768))
 
         self.initComponents()
         self.layoutComponents()
@@ -57,18 +56,19 @@ def OnSelChanged(self, event):
         event.Skip()
 
     def OnPageClosing(self, event):
-        print "One could place some extra closing stuff here"
+        print("sample2.py: One could place some extra closing stuff here")
         event.Skip()
 
     def OnClose(self, event):
         self.Destroy()
 
 if __name__ == '__main__':
     chrome.Initialize()
-    print('wx.version=%s' % wx.version())
+    print('sample2.py: wx.version=%s' % wx.version())
     app = wx.PySimpleApp()
     MainFrame().Show()
     app.MainLoop()
-    del app # Let wx.App destructor do the cleanup before calling cefpython.Shutdown().
+    # Important: do the wx cleanup before calling Shutdown.
+    del app
     chrome.Shutdown()
 
@@ -4,7 +4,6 @@
 import os
 import wx
 import wx.lib.agw.flatnotebook as fnb
-
 import cefpython1.wx.chromectrl as chrome
 
 class MainFrame(wx.Frame):
@@ -70,10 +69,11 @@ def _LayoutComponents(self):
 
 if __name__ == '__main__':
     chrome.Initialize()
-    print('wx.version=%s' % wx.version())
+    print('sample3.py: wx.version=%s' % wx.version())
     app = wx.PySimpleApp()
     MainFrame().Show()
     app.MainLoop()
-    del app # Let wx.App destructor do the cleanup before calling cefpython.Shutdown().
+    # Important: do the wx cleanup before calling Shutdown.
+    del app
     chrome.Shutdown()
 
@@ -3,26 +3,13 @@
 
 #-------------------------------------------------------------------------------
 
-import sys
-import os
-
-def GetApplicationPath(myFile=None):
-    import re, os
-    # If myFile is None return current directory without trailing slash.
-    if myFile is None:
-        myFile = ""
-    # Only when relative path.
-    if not myFile.startswith("/") and not myFile.startswith("\\") and not re.search(r"^[\w-]+:", myFile):
-        if hasattr(sys, "frozen"):
-            path = os.path.dirname(sys.executable)
-        elif "__file__" in globals():
-            path = os.path.dirname(os.path.realpath(__file__))
-        else:
-            path = os.getcwd()
-        path = path + os.sep + myFile
-        path = re.sub(r"[/\\]+", re.escape(os.sep), path)
-        path = re.sub(r"[/\\]+$", "", path)
-        return path
-    return str(myFile)
-
-
+def ExceptHook(type, value, traceObject):
+    import traceback, os
+    # This hook does the following: in case of exception display it,
+    # write to error.log, shutdown CEF and exit application.
+    error = "\n".join(traceback.format_exception(type, value, traceObject))
+    print("\n"+error+"\n")
+    #cefpython.QuitMessageLoop()
+    #cefpython.Shutdown()
+    # So that "finally" does not execute.
+    #os._exit(1)