diff --git a/include/wx/gtk/webview_webkit.h b/include/wx/gtk/webview_webkit.h index 455007a3ec..205caa6282 100644 --- a/include/wx/gtk/webview_webkit.h +++ b/include/wx/gtk/webview_webkit.h @@ -110,6 +110,8 @@ public: virtual wxString GetCurrentURL(); virtual wxString GetCurrentTitle(); virtual wxString GetPageSource(); + //We do not want to hide the other overloads + using wxWebView::SetPage; virtual void SetPage(const wxString& html, const wxString& baseUrl); virtual void Print(); virtual bool IsBusy(); diff --git a/src/gtk/webview_webkit.cpp b/src/gtk/webview_webkit.cpp index 96765cfd98..347b19c5d9 100644 --- a/src/gtk/webview_webkit.cpp +++ b/src/gtk/webview_webkit.cpp @@ -26,7 +26,7 @@ extern "C" { static void -wxgtk_webkitctrl_load_status_callback(GtkWidget* widget, GParamSpec* arg1, +wxgtk_webkitctrl_load_status_callback(GtkWidget* widget, GParamSpec*, wxWebViewWebKit *webKitCtrl) { if (!webKitCtrl->m_ready) return; @@ -61,7 +61,7 @@ wxgtk_webkitctrl_load_status_callback(GtkWidget* widget, GParamSpec* arg1, } static WebKitNavigationResponse -wxgtk_webkitctrl_navigation_requ_callback(WebKitWebView *web_view, +wxgtk_webkitctrl_navigation_requ_callback(WebKitWebView*, WebKitWebFrame *frame, WebKitNetworkRequest *request, wxWebViewWebKit *webKitCtrl) @@ -92,8 +92,8 @@ wxgtk_webkitctrl_navigation_requ_callback(WebKitWebView *web_view, } static gboolean -wxgtk_webkitctrl_error (WebKitWebView *web_view, - WebKitWebFrame *web_frame, +wxgtk_webkitctrl_error (WebKitWebView*, + WebKitWebFrame*, gchar *uri, gpointer web_error, wxWebViewWebKit* webKitWindow) @@ -235,10 +235,10 @@ wxgtk_webkitctrl_error (WebKitWebView *web_view, } static gboolean -wxgtk_webkitctrl_new_window(WebKitWebView *webView, +wxgtk_webkitctrl_new_window(WebKitWebView*, WebKitWebFrame *frame, WebKitNetworkRequest *request, - WebKitWebNavigationAction *navigation_action, + WebKitWebNavigationAction*, WebKitWebPolicyDecision *policy_decision, wxWebViewWebKit *webKitCtrl) {