diff --git a/include/wx/msw/webview_edge.h b/include/wx/msw/webview_edge.h index 55c0dbd044..6a77065a3b 100644 --- a/include/wx/msw/webview_edge.h +++ b/include/wx/msw/webview_edge.h @@ -108,7 +108,7 @@ public: virtual void EnableContextMenu(bool enable = true) wxOVERRIDE; virtual bool IsContextMenuEnabled() const wxOVERRIDE; - virtual void EnableDevTools(bool enable = true) wxOVERRIDE; + virtual void EnableAccessToDevTools(bool enable = true) wxOVERRIDE; virtual bool IsAccessToDevToolsEnabled() const wxOVERRIDE; virtual bool RunScript(const wxString& javascript, wxString* output = NULL) wxOVERRIDE; diff --git a/include/wx/webview.h b/include/wx/webview.h index 2f20c788f1..9573ac99bf 100644 --- a/include/wx/webview.h +++ b/include/wx/webview.h @@ -159,7 +159,7 @@ public: { m_showMenu = enable; } - virtual void EnableDevTools(bool WXUNUSED(enable) = true) { } + virtual void EnableAccessToDevTools(bool WXUNUSED(enable) = true) { } virtual wxString GetCurrentTitle() const = 0; virtual wxString GetCurrentURL() const = 0; // TODO: handle choosing a frame when calling GetPageSource()? diff --git a/interface/wx/webview.h b/interface/wx/webview.h index 62b4857e11..56e33a5679 100644 --- a/interface/wx/webview.h +++ b/interface/wx/webview.h @@ -712,7 +712,7 @@ public: @since 3.1.4 */ - virtual void EnableDevTools(bool enable = true); + virtual void EnableAccessToDevTools(bool enable = true); /** Returns @true if dev tools are available to the user. diff --git a/samples/webview/webview.cpp b/samples/webview/webview.cpp index 3dba5c8d5b..99ca20e5dd 100644 --- a/samples/webview/webview.cpp +++ b/samples/webview/webview.cpp @@ -716,7 +716,7 @@ void WebFrame::OnEnableContextMenu(wxCommandEvent& evt) void WebFrame::OnEnableDevTools(wxCommandEvent& evt) { - m_browser->EnableDevTools(evt.IsChecked()); + m_browser->EnableAccessToDevTools(evt.IsChecked()); } void WebFrame::OnFind(wxCommandEvent& WXUNUSED(evt)) diff --git a/src/msw/webview_edge.cpp b/src/msw/webview_edge.cpp index d7504dffeb..a41c364476 100644 --- a/src/msw/webview_edge.cpp +++ b/src/msw/webview_edge.cpp @@ -671,7 +671,7 @@ bool wxWebViewEdge::IsContextMenuEnabled() const return true; } -void wxWebViewEdge::EnableDevTools(bool enable) +void wxWebViewEdge::EnableAccessToDevTools(bool enable) { wxCOMPtr settings(m_impl->GetSettings()); if (settings)