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

Fix warnings for the OSX WebKit backend.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-08-01 17:57:48 +00:00
parent fdc255cfe0
commit e28cc3ca0a
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/osx/webview_webkit.h
View File

@@ -64,6 +64,8 @@ public:
virtual void SetPageTitle(const wxString& title) { m_pageTitle = title; } virtual void SetPageTitle(const wxString& title) { m_pageTitle = title; }
virtual wxString GetPageTitle(){ return m_pageTitle; } virtual wxString GetPageTitle(){ return m_pageTitle; }
//We do not want to hide the other overloads
using wxWebView::SetPage;
virtual void SetPage(const wxString& html, const wxString& baseUrl); virtual void SetPage(const wxString& html, const wxString& baseUrl);
virtual void Print(); virtual void Print();
@@ -82,12 +84,12 @@ public:
//History functions //History functions
virtual void ClearHistory() {} virtual void ClearHistory() {}
virtual void EnableHistory(bool enable = true) {} virtual void EnableHistory(bool WXUNUSED(enable) = true) {}
virtual wxVector<wxSharedPtr<wxWebHistoryItem> > GetBackwardHistory() virtual wxVector<wxSharedPtr<wxWebHistoryItem> > GetBackwardHistory()
{ return wxVector<wxSharedPtr<wxWebHistoryItem> >(); } { return wxVector<wxSharedPtr<wxWebHistoryItem> >(); }
virtual wxVector<wxSharedPtr<wxWebHistoryItem> > GetForwardHistory() virtual wxVector<wxSharedPtr<wxWebHistoryItem> > GetForwardHistory()
{ return wxVector<wxSharedPtr<wxWebHistoryItem> >(); } { return wxVector<wxSharedPtr<wxWebHistoryItem> >(); }
virtual void LoadHistoryItem(wxSharedPtr<wxWebHistoryItem> item) {} virtual void LoadHistoryItem(wxSharedPtr<wxWebHistoryItem> WXUNUSED(item)) {}
//Undo / redo functionality //Undo / redo functionality
virtual bool CanUndo() { return false; } virtual bool CanUndo() { return false; }
@@ -118,7 +120,7 @@ public:
void RunScript(const wxString& javascript); void RunScript(const wxString& javascript);
//Virtual Filesystem Support //Virtual Filesystem Support
virtual void RegisterHandler(wxWebHandler* handler) {}; virtual void RegisterHandler(wxWebHandler* WXUNUSED(handler)) {};
// ---- methods not from the parent (common) interface // ---- methods not from the parent (common) interface
bool CanGetPageSource(); bool CanGetPageSource();