Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename wxWebView::EnableDevTools() to EnableAccessToDevTools()

Browse Source
This commit is contained in:
Tobias Taschner
2020-01-16 09:38:35 +01:00
parent f48770ee5a
commit 9f11abd8fc
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/webview_edge.h
View File

@@ -108,7 +108,7 @@ public:
virtual void EnableContextMenu(bool enable = true) wxOVERRIDE; virtual void EnableContextMenu(bool enable = true) wxOVERRIDE;
virtual bool IsContextMenuEnabled() const 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 IsAccessToDevToolsEnabled() const wxOVERRIDE;
virtual bool RunScript(const wxString& javascript, wxString* output = NULL) wxOVERRIDE; virtual bool RunScript(const wxString& javascript, wxString* output = NULL) wxOVERRIDE;

2
include/wx/webview.h
View File

@@ -159,7 +159,7 @@ public:
{ {
m_showMenu = enable; m_showMenu = enable;
} }
virtual void EnableDevTools(bool WXUNUSED(enable) = true) { } virtual void EnableAccessToDevTools(bool WXUNUSED(enable) = true) { }
virtual wxString GetCurrentTitle() const = 0; virtual wxString GetCurrentTitle() const = 0;
virtual wxString GetCurrentURL() const = 0; virtual wxString GetCurrentURL() const = 0;
// TODO: handle choosing a frame when calling GetPageSource()? // TODO: handle choosing a frame when calling GetPageSource()?

2
interface/wx/webview.h
View File

@@ -712,7 +712,7 @@ public:
@since 3.1.4 @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. Returns @true if dev tools are available to the user.

2
samples/webview/webview.cpp
View File

@@ -716,7 +716,7 @@ void WebFrame::OnEnableContextMenu(wxCommandEvent& evt)
void WebFrame::OnEnableDevTools(wxCommandEvent& evt) void WebFrame::OnEnableDevTools(wxCommandEvent& evt)
{ {
m_browser->EnableDevTools(evt.IsChecked()); m_browser->EnableAccessToDevTools(evt.IsChecked());
} }
void WebFrame::OnFind(wxCommandEvent& WXUNUSED(evt)) void WebFrame::OnFind(wxCommandEvent& WXUNUSED(evt))

2
src/msw/webview_edge.cpp
View File

@@ -671,7 +671,7 @@ bool wxWebViewEdge::IsContextMenuEnabled() const
return true; return true;
} }
void wxWebViewEdge::EnableDevTools(bool enable) void wxWebViewEdge::EnableAccessToDevTools(bool enable)
{ {
wxCOMPtr<IWebView2Settings2> settings(m_impl->GetSettings()); wxCOMPtr<IWebView2Settings2> settings(m_impl->GetSettings());
if (settings) if (settings)