From a5a432fc1f27b3bbb30f5c52986823ec60b9a344 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 5 Apr 2013 04:04:51 +0000 Subject: [PATCH] WEB_VIEW --> WEBVIEW git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73782 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- etg/webview.py | 12 +++--- samples/html2/HTML2_WebView.py | 8 ++-- unittests/test_webview.py | 77 +++++++++++++++++----------------- 3 files changed, 49 insertions(+), 48 deletions(-) diff --git a/etg/webview.py b/etg/webview.py index 1a83c8c5..cbbe4cc2 100644 --- a/etg/webview.py +++ b/etg/webview.py @@ -110,12 +110,12 @@ def run(): tools.fixEventClass(c) module.addPyCode("""\ - EVT_WEB_VIEW_NAVIGATING = wx.PyEventBinder( wxEVT_COMMAND_WEB_VIEW_NAVIGATING, 1 ) - EVT_WEB_VIEW_NAVIGATED = wx.PyEventBinder( wxEVT_COMMAND_WEB_VIEW_NAVIGATED, 1 ) - EVT_WEB_VIEW_LOADED = wx.PyEventBinder( wxEVT_COMMAND_WEB_VIEW_LOADED, 1 ) - EVT_WEB_VIEW_ERROR = wx.PyEventBinder( wxEVT_COMMAND_WEB_VIEW_ERROR, 1 ) - EVT_WEB_VIEW_NEWWINDOW = wx.PyEventBinder( wxEVT_COMMAND_WEB_VIEW_NEWWINDOW, 1 ) - EVT_WEB_VIEW_TITLE_CHANGED = wx.PyEventBinder( wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED, 1 ) + EVT_WEBVIEW_NAVIGATING = wx.PyEventBinder( wxEVT_COMMAND_WEBVIEW_NAVIGATING, 1 ) + EVT_WEBVIEW_NAVIGATED = wx.PyEventBinder( wxEVT_COMMAND_WEBVIEW_NAVIGATED, 1 ) + EVT_WEBVIEW_LOADED = wx.PyEventBinder( wxEVT_COMMAND_WEBVIEW_LOADED, 1 ) + EVT_WEBVIEW_ERROR = wx.PyEventBinder( wxEVT_COMMAND_WEBVIEW_ERROR, 1 ) + EVT_WEBVIEW_NEWWINDOW = wx.PyEventBinder( wxEVT_COMMAND_WEBVIEW_NEWWINDOW, 1 ) + EVT_WEBVIEW_TITLE_CHANGED = wx.PyEventBinder( wxEVT_COMMAND_WEBVIEW_TITLE_CHANGED, 1 ) """) diff --git a/samples/html2/HTML2_WebView.py b/samples/html2/HTML2_WebView.py index 07de949c..6ee5efcd 100644 --- a/samples/html2/HTML2_WebView.py +++ b/samples/html2/HTML2_WebView.py @@ -15,10 +15,10 @@ class TestPanel(wx.Panel): sizer = wx.BoxSizer(wx.VERTICAL) btnSizer = wx.BoxSizer(wx.HORIZONTAL) self.wv = webview.WebView.New(self) - self.Bind(webview.EVT_WEB_VIEW_NAVIGATING, self.OnWebViewNavigating, self.wv) - self.Bind(webview.EVT_WEB_VIEW_NAVIGATED, self.OnWebViewNavigated, self.wv) - self.Bind(webview.EVT_WEB_VIEW_LOADED, self.OnWebViewLoaded, self.wv) - self.Bind(webview.EVT_WEB_VIEW_TITLE_CHANGED, self.OnWebViewTitleChanged, self.wv) + self.Bind(webview.EVT_WEBVIEW_NAVIGATING, self.OnWebViewNavigating, self.wv) + self.Bind(webview.EVT_WEBVIEW_NAVIGATED, self.OnWebViewNavigated, self.wv) + self.Bind(webview.EVT_WEBVIEW_LOADED, self.OnWebViewLoaded, self.wv) + self.Bind(webview.EVT_WEBVIEW_TITLE_CHANGED, self.OnWebViewTitleChanged, self.wv) btn = wx.Button(self, -1, "Open", style=wx.BU_EXACTFIT) self.Bind(wx.EVT_BUTTON, self.OnOpenButton, btn) diff --git a/unittests/test_webview.py b/unittests/test_webview.py index de8cdb42..73052a66 100644 --- a/unittests/test_webview.py +++ b/unittests/test_webview.py @@ -27,48 +27,49 @@ class webview_Tests(wtc.WidgetTestCase): def test_webview5(self): - webview.WEB_VIEW_ZOOM_TINY - webview.WEB_VIEW_ZOOM_SMALL - webview.WEB_VIEW_ZOOM_MEDIUM - webview.WEB_VIEW_ZOOM_LARGE - webview.WEB_VIEW_ZOOM_LARGEST - webview.WEB_VIEW_ZOOM_TYPE_LAYOUT - webview.WEB_VIEW_ZOOM_TYPE_TEXT - webview.WEB_NAV_ERR_CONNECTION - webview.WEB_NAV_ERR_CERTIFICATE - webview.WEB_NAV_ERR_AUTH - webview.WEB_NAV_ERR_SECURITY - webview.WEB_NAV_ERR_NOT_FOUND - webview.WEB_NAV_ERR_REQUEST - webview.WEB_NAV_ERR_USER_CANCELLED - webview.WEB_NAV_ERR_OTHER - webview.WEB_VIEW_RELOAD_DEFAULT - webview.WEB_VIEW_RELOAD_NO_CACHE - webview.WEB_VIEW_FIND_WRAP - webview.WEB_VIEW_FIND_ENTIRE_WORD - webview.WEB_VIEW_FIND_MATCH_CASE - webview.WEB_VIEW_FIND_HIGHLIGHT_RESULT - webview.WEB_VIEW_FIND_BACKWARDS - webview.WEB_VIEW_FIND_DEFAULT - webview.WEB_VIEW_BACKEND_DEFAULT - webview.WEB_VIEW_BACKEND_WEBKIT - webview.WEB_VIEW_BACKEND_IE + webview.WEBVIEW_ZOOM_TINY + webview.WEBVIEW_ZOOM_SMALL + webview.WEBVIEW_ZOOM_MEDIUM + webview.WEBVIEW_ZOOM_LARGE + webview.WEBVIEW_ZOOM_LARGEST + webview.WEBVIEW_ZOOM_TYPE_LAYOUT + webview.WEBVIEW_ZOOM_TYPE_TEXT + webview.WEBVIEW_NAV_ERR_CONNECTION + webview.WEBVIEW_NAV_ERR_CERTIFICATE + webview.WEBVIEW_NAV_ERR_AUTH + webview.WEBVIEW_NAV_ERR_SECURITY + webview.WEBVIEW_NAV_ERR_NOT_FOUND + webview.WEBVIEW_NAV_ERR_REQUEST + webview.WEBVIEW_NAV_ERR_USER_CANCELLED + webview.WEBVIEW_NAV_ERR_OTHER + webview.WEBVIEW_RELOAD_DEFAULT + webview.WEBVIEW_RELOAD_NO_CACHE + webview.WEBVIEW_FIND_WRAP + webview.WEBVIEW_FIND_ENTIRE_WORD + webview.WEBVIEW_FIND_MATCH_CASE + webview.WEBVIEW_FIND_HIGHLIGHT_RESULT + webview.WEBVIEW_FIND_BACKWARDS + webview.WEBVIEW_FIND_DEFAULT + webview.WebViewBackendDefault + webview.WebViewBackendIE + webview.WebViewBackendWebKit + def test_webview6(self): - webview.wxEVT_COMMAND_WEB_VIEW_NAVIGATING - webview.wxEVT_COMMAND_WEB_VIEW_NAVIGATED - webview.wxEVT_COMMAND_WEB_VIEW_LOADED - webview.wxEVT_COMMAND_WEB_VIEW_ERROR - webview.wxEVT_COMMAND_WEB_VIEW_NEWWINDOW - webview.wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED + webview.wxEVT_COMMAND_WEBVIEW_NAVIGATING + webview.wxEVT_COMMAND_WEBVIEW_NAVIGATED + webview.wxEVT_COMMAND_WEBVIEW_LOADED + webview.wxEVT_COMMAND_WEBVIEW_ERROR + webview.wxEVT_COMMAND_WEBVIEW_NEWWINDOW + webview.wxEVT_COMMAND_WEBVIEW_TITLE_CHANGED - webview.EVT_WEB_VIEW_NAVIGATING - webview.EVT_WEB_VIEW_NAVIGATED - webview.EVT_WEB_VIEW_LOADED - webview.EVT_WEB_VIEW_ERROR - webview.EVT_WEB_VIEW_NEWWINDOW - webview.EVT_WEB_VIEW_TITLE_CHANGED + webview.EVT_WEBVIEW_NAVIGATING + webview.EVT_WEBVIEW_NAVIGATED + webview.EVT_WEBVIEW_LOADED + webview.EVT_WEBVIEW_ERROR + webview.EVT_WEBVIEW_NEWWINDOW + webview.EVT_WEBVIEW_TITLE_CHANGED