Merge branch 'webkit-extension-fixes' of https://github.com/vslavik/wxWidgets

Improve WebKit2 extension loading: make the code cleaner and safer.

See https://github.com/wxWidgets/wxWidgets/pull/2075

include/wx/gtk/webview_webkit.h

@@ -162,6 +162,7 @@ private:
 #if wxUSE_WEBVIEW_WEBKIT2
     bool CanExecuteEditingCommand(const gchar* command) const;
     void SetupWebExtensionServer();
+    GDBusProxy *GetExtensionProxy() const;
     bool RunScriptSync(const wxString& javascript, wxString* output = NULL);
 #endif
 

include/wx/utils.h

@@ -162,7 +162,7 @@ WXDLLIMPEXP_BASE wxLinuxDistributionInfo wxGetLinuxDistributionInfo();
 WXDLLIMPEXP_BASE wxString wxNow();
 
 // Return path where wxWidgets is installed (mostly useful in Unices)
-WXDLLIMPEXP_BASE const wxChar *wxGetInstallPrefix();
+WXDLLIMPEXP_BASE wxString wxGetInstallPrefix();
 // Return path to wxWin data (/usr/share/wx/%{version}) (Unices)
 WXDLLIMPEXP_BASE wxString wxGetDataDir();