diff --git a/include/wx/msw/webview_edge.h b/include/wx/msw/webview_edge.h index ee69e7229a..528fd66bfd 100644 --- a/include/wx/msw/webview_edge.h +++ b/include/wx/msw/webview_edge.h @@ -112,7 +112,7 @@ public: virtual bool IsContextMenuEnabled() const wxOVERRIDE; virtual void EnableDevTools(bool enable = true) wxOVERRIDE; - virtual bool IsDevToolsEnabled() const 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 cea7a11e26..2f20c788f1 100644 --- a/include/wx/webview.h +++ b/include/wx/webview.h @@ -167,7 +167,7 @@ public: virtual wxString GetPageText() const = 0; virtual bool IsBusy() const = 0; virtual bool IsContextMenuEnabled() const { return m_showMenu; } - virtual bool IsDevToolsEnabled() const { return false; } + virtual bool IsAccessToDevToolsEnabled() const { return false; } virtual bool IsEditable() const = 0; virtual void LoadURL(const wxString& url) = 0; virtual void Print() = 0; diff --git a/interface/wx/webview.h b/interface/wx/webview.h index d27364b325..7039ccc4b3 100644 --- a/interface/wx/webview.h +++ b/interface/wx/webview.h @@ -717,7 +717,7 @@ public: @since 3.1.4 */ - virtual bool IsDevToolsEnabled() const; + virtual bool IsAccessToDevToolsEnabled() const; /** @name History diff --git a/samples/webview/webview.cpp b/samples/webview/webview.cpp index d5ec2dffcf..3dba5c8d5b 100644 --- a/samples/webview/webview.cpp +++ b/samples/webview/webview.cpp @@ -952,7 +952,7 @@ void WebFrame::OnToolsClicked(wxCommandEvent& WXUNUSED(evt)) m_selection_delete->Enable(m_browser->HasSelection()); m_context_menu->Check(m_browser->IsContextMenuEnabled()); - m_dev_tools->Check(m_browser->IsDevToolsEnabled()); + m_dev_tools->Check(m_browser->IsAccessToDevToolsEnabled()); //Firstly we clear the existing menu items, then we add the current ones wxMenuHistoryMap::const_iterator it; diff --git a/src/msw/webview_edge.cpp b/src/msw/webview_edge.cpp index f778a148ae..074f4d8023 100644 --- a/src/msw/webview_edge.cpp +++ b/src/msw/webview_edge.cpp @@ -658,7 +658,7 @@ void wxWebViewEdge::EnableDevTools(bool enable) } } -bool wxWebViewEdge::IsDevToolsEnabled() const +bool wxWebViewEdge::IsAccessToDevToolsEnabled() const { wxCOMPtr settings; if (SUCCEEDED(m_webView->get_Settings(&settings)))