No real changes, just avoid overloaded virtual wxWebView::SetPage().
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:
@@ -303,8 +303,6 @@ public:
|
||||
|
||||
virtual void Print();
|
||||
|
||||
virtual void SetPage(const wxString& html, const wxString& baseUrl);
|
||||
|
||||
virtual wxWebViewZoom GetZoom() const;
|
||||
virtual void SetZoom(wxWebViewZoom zoom);
|
||||
|
||||
@@ -356,6 +354,9 @@ public:
|
||||
|
||||
DECLARE_EVENT_TABLE();
|
||||
|
||||
protected:
|
||||
virtual void DoSetPage(const wxString& html, const wxString& baseUrl);
|
||||
|
||||
private:
|
||||
wxIEContainer* m_container;
|
||||
wxAutomationObject m_ie;
|
||||
|
Reference in New Issue
Block a user