Updated wxpython.py example to use EVT_IDLE instead

cztomczak · cztomczak · commit c92b13bfa4c5 · 2012-12-27T23:48:40.000-08:00
of timer to do message loop work.
diff --git a/cefpython/cef1/windows/binaries/panda3d_.py b/cefpython/cef1/windows/binaries/panda3d_.py
@@ -15,7 +15,6 @@
 # This will enable your copy of python to find the panda libraries.
 
 # TODO: fix the blurriness of the browser when window is resized.
-# TODO: add keyboard handlers.
 
 import platform
 if platform.architecture()[0] != "32bit":
diff --git a/cefpython/cef1/windows/binaries/wxpython.py b/cefpython/cef1/windows/binaries/wxpython.py
@@ -2,7 +2,8 @@
 
 import platform
 if platform.architecture()[0] != "32bit":
-    raise Exception("Architecture not supported: %s" % platform.architecture()[0])
+    raise Exception("Architecture not supported: %s" % (
+            platform.architecture()[0]))
 
 import sys
 if sys.hexversion >= 0x02070000 and sys.hexversion < 0x03000000:
@@ -15,92 +16,63 @@
 import wx
 
 class MainFrame(wx.Frame):
-
     browser = None
 
     def __init__(self):
-
-        wx.Frame.__init__(self, parent=None, id=wx.ID_ANY, title='wxPython example', size=(600,400))
+        wx.Frame.__init__(self, parent=None, id=wx.ID_ANY,
+                          title='wxPython example', size=(600,400))
         self.CreateMenu()
+
         windowInfo = cefpython.WindowInfo()
         windowInfo.SetAsChild(self.GetHandle())
-        self.browser = cefpython.CreateBrowserSync(windowInfo, browserSettings={}, navigateURL="cefsimple.html")
+        self.browser = cefpython.CreateBrowserSync(windowInfo,
+                browserSettings={}, navigateURL="cefsimple.html")
 
         self.Bind(wx.EVT_SET_FOCUS, self.OnSetFocus)
         self.Bind(wx.EVT_SIZE, self.OnSize)
         self.Bind(wx.EVT_CLOSE, self.OnClose)
-        """self.Bind(wx.EVT_IDLE, self.OnIdle)"""
+        self.Bind(wx.EVT_IDLE, self.OnIdle)
 
     def CreateMenu(self):
-
         filemenu = wx.Menu()
         filemenu.Append(1, "Open")
         filemenu.Append(2, "Exit")
-
         aboutmenu = wx.Menu()
         aboutmenu.Append(1, "CEF Python")
-
         menubar = wx.MenuBar()
         menubar.Append(filemenu,"&File")
         menubar.Append(aboutmenu, "&About")
-
         self.SetMenuBar(menubar)
 
     def OnSetFocus(self, event):
-
         cefpython.WindowUtils.OnSetFocus(self.GetHandle(), 0, 0, 0)
 
     def OnSize(self, event):
-
         cefpython.WindowUtils.OnSize(self.GetHandle(), 0, 0, 0)
 
     def OnClose(self, event):
-
         self.browser.CloseBrowser()
         self.Destroy()
 
-    """def OnIdle(self, event):
-        cefpython.SingleMessageLoop()"""
+    def OnIdle(self, event):
+        cefpython.SingleMessageLoop()
 
 class MyApp(wx.App):
 
-    timer = None
-    timerID = 1
-
     def OnInit(self):
-
-        self.CreateTimer()
         frame = MainFrame()
         self.SetTopWindow(frame)
         frame.Show()
         return True
 
-    def CreateTimer(self):
-
-        # See "Making a render loop": http://wiki.wxwidgets.org/Making_a_render_loop
-        # Another approach is to use EVT_IDLE in MainFrame, see which one fits you better.
-        self.timer = wx.Timer(self, self.timerID)
-        self.timer.Start(10) # 10ms
-        wx.EVT_TIMER(self, self.timerID, self.OnTimer)
-
-    def OnTimer(self, event):
-
-        cefpython.SingleMessageLoop()
-
-    def OnExit(self):
-
-        # When app.MainLoop() returns, SingleMessageLoop() should not be called anymore.
-        self.timer.Stop()
-
 if __name__ == '__main__':
-
     sys.excepthook = cefpython.ExceptHook
     settings = {
         # Change to LOGSEVERITY_INFO if you want less debug output.
         "log_severity": cefpython.LOGSEVERITY_VERBOSE,
         "release_dcheck_enabled": True
     }
-    cefpython.Initialize(settings) # Initialize cefpython before wx.
+    cefpython.Initialize(settings)
 
     print('wx.version=%s' % wx.version())
     app = MyApp(False)
