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

No real changes, just avoid overloaded virtual wxWebView::SetPage().

Browse Source 
Instead, have two public non-virtual SetPage() methods forwarding to a private
DoSetPage(), as usual.

This avoids the need for "using wxWebView::SetPage" which is needed to avoid
warnings about hiding the other base class virtual when implementing one of
them and which was forgotten in wxMSW version resulting in warnings when using
g++ to compile it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-07-24 20:45:10 +00:00
parent 508bd1654f
commit a977376af3
7 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/webview.h
View File

@@ -127,12 +127,15 @@ public:
virtual void Reload(wxWebViewReloadFlags flags = wxWEB_VIEW_RELOAD_DEFAULT) = 0;
virtual void RunScript(const wxString& javascript) = 0;
virtual void SetEditable(bool enable = true) = 0;
virtual void SetPage(const wxString& html, const wxString& baseUrl) = 0;
virtual void SetPage(wxInputStream& html, wxString baseUrl)
void SetPage(const wxString& html, const wxString& baseUrl)
{
DoSetPage(html, baseUrl);
}
void SetPage(wxInputStream& html, wxString baseUrl)
{
wxStringOutputStream stream;
stream.Write(html);
SetPage(stream.GetString(), baseUrl);
DoSetPage(stream.GetString(), baseUrl);
}
virtual void Stop() = 0;
@@ -176,6 +179,9 @@ public:
virtual void Undo() = 0;
virtual void Redo() = 0;
protected:
virtual void DoSetPage(const wxString& html, const wxString& baseUrl) = 0;
wxDECLARE_ABSTRACT_CLASS(wxWebView);
};