Fix the build system in gtk, plus a couple of compilation errors. wxWebView now successfully builds under gtk and the sample runs correctly.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -10,8 +10,7 @@
|
||||
// For compilers that support precompilation, includes "wx.h".
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
|
||||
#if wxHAVE_WEB_BACKEND_GTK_WEBKIT
|
||||
#if wxUSE_WEBVIEW_WEBKIT
|
||||
|
||||
#include "wx/stockitem.h"
|
||||
#include "wx/gtk/webview_webkit.h"
|
||||
@@ -359,7 +358,7 @@ void wxWebViewGTKWebKit::Reload(wxWebViewReloadFlags flags)
|
||||
|
||||
void wxWebViewGTKWebKit::LoadUrl(const wxString& url)
|
||||
{
|
||||
webkit_web_view_open(WEBKIT_WEB_VIEW(web_view), wxGTK_CONV(loc));
|
||||
webkit_web_view_open(WEBKIT_WEB_VIEW(web_view), wxGTK_CONV(url));
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user