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

Rename wxWebView::IsDevToolsEnabled() to IsAccessToDevToolsEnabled()

Browse Source
This commit is contained in:
Tobias Taschner
2020-01-15 16:22:43 +01:00
parent e20296fee2
commit bce0e65a80
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

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

2
include/wx/webview.h
View File

@@ -167,7 +167,7 @@ public:
virtual wxString GetPageText() const = 0; virtual wxString GetPageText() const = 0;
virtual bool IsBusy() const = 0; virtual bool IsBusy() const = 0;
virtual bool IsContextMenuEnabled() const { return m_showMenu; } 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 bool IsEditable() const = 0;
virtual void LoadURL(const wxString& url) = 0; virtual void LoadURL(const wxString& url) = 0;
virtual void Print() = 0; virtual void Print() = 0;

2
interface/wx/webview.h
View File

@@ -717,7 +717,7 @@ public:
@since 3.1.4 @since 3.1.4
*/ */
virtual bool IsDevToolsEnabled() const; virtual bool IsAccessToDevToolsEnabled() const;
/** /**
@name History @name History

2
samples/webview/webview.cpp
View File

@@ -952,7 +952,7 @@ void WebFrame::OnToolsClicked(wxCommandEvent& WXUNUSED(evt))
m_selection_delete->Enable(m_browser->HasSelection()); m_selection_delete->Enable(m_browser->HasSelection());
m_context_menu->Check(m_browser->IsContextMenuEnabled()); 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 //Firstly we clear the existing menu items, then we add the current ones
wxMenuHistoryMap::const_iterator it; wxMenuHistoryMap::const_iterator it;

2
src/msw/webview_edge.cpp
View File

@@ -658,7 +658,7 @@ void wxWebViewEdge::EnableDevTools(bool enable)
} }
} }
bool wxWebViewEdge::IsDevToolsEnabled() const bool wxWebViewEdge::IsAccessToDevToolsEnabled() const
{ {
wxCOMPtr<IWebView2Settings> settings; wxCOMPtr<IWebView2Settings> settings;
if (SUCCEEDED(m_webView->get_Settings(&settings))) if (SUCCEEDED(m_webView->get_Settings(&settings)))