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:
38
configure.in
38
configure.in
@@ -7348,6 +7348,44 @@ if test "$wxUSE_WEB" = "yes"; then
|
|||||||
AC_DEFINE(wxUSE_WEB)
|
AC_DEFINE(wxUSE_WEB)
|
||||||
USE_WEB=1
|
USE_WEB=1
|
||||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS web"
|
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS web"
|
||||||
|
|
||||||
|
if test "$wxUSE_WEBVIEW_WEBKIT" = "yes" -a "$wxUSE_GTK" = 1; then
|
||||||
|
AC_DEFINE(wxUSE_WEBVIEW_WEBKIT)
|
||||||
|
AC_MSG_CHECKING([for webkitgtk libraries])
|
||||||
|
WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],webkitgtk-1.0)
|
||||||
|
if test "$ac_find_libraries" != "" ; then
|
||||||
|
WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
|
||||||
|
if test "$ac_path_to_link" != " -L/usr/lib" ; then
|
||||||
|
LDFLAGS="$LDFLAGS $ac_path_to_link"
|
||||||
|
fi
|
||||||
|
GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lwebkitgtk-1.0"
|
||||||
|
AC_MSG_RESULT([yes])
|
||||||
|
else
|
||||||
|
AC_MSG_RESULT([no])
|
||||||
|
AC_MSG_WARN([libwebkitgtk-1.0 not found; disabling webkit backend])
|
||||||
|
wxUSE_WEBVIEW_WEBKIT="no"
|
||||||
|
fi
|
||||||
|
|
||||||
|
AC_MSG_CHECKING(for webkitgtk includes)
|
||||||
|
WX_PATH_FIND_INCLUDES([$SEARCH_INCLUDE /usr/include/webkit-1.0], webkit/webkit.h)
|
||||||
|
if test "$ac_find_includes" != "" ; then
|
||||||
|
AC_MSG_RESULT(found in $ac_find_includes)
|
||||||
|
WX_INCLUDE_PATH_EXIST($ac_find_includes, $CPPFLAGS)
|
||||||
|
CPPFLAGS="$ac_path_to_include $CPPFLAGS"
|
||||||
|
else
|
||||||
|
AC_MSG_RESULT([not found])
|
||||||
|
fi
|
||||||
|
dnl we also depend on libsoup
|
||||||
|
AC_MSG_CHECKING(for libsoup includes)
|
||||||
|
WX_PATH_FIND_INCLUDES([$SEARCH_INCLUDE /usr/include/libsoup-2.4], libsoup/soup.h)
|
||||||
|
if test "$ac_find_includes" != "" ; then
|
||||||
|
AC_MSG_RESULT(found in $ac_find_includes)
|
||||||
|
WX_INCLUDE_PATH_EXIST($ac_find_includes, $CPPFLAGS)
|
||||||
|
CPPFLAGS="$ac_path_to_include $CPPFLAGS"
|
||||||
|
else
|
||||||
|
AC_MSG_RESULT([not found])
|
||||||
|
fi
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
|
@@ -42,32 +42,32 @@ wxWebView* wxWebView::New(wxWebViewBackend backend)
|
|||||||
{
|
{
|
||||||
switch (backend)
|
switch (backend)
|
||||||
{
|
{
|
||||||
#if wxHAVE_WEB_BACKEND_OSX_WEBKIT
|
#if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXOSX__)
|
||||||
case wxWEB_VIEW_BACKEND_OSX_WEBKIT:
|
case wxWEB_VIEW_BACKEND_OSX_WEBKIT:
|
||||||
return new wxOSXWebKitCtrl();
|
return new wxOSXWebKitCtrl();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if wxHAVE_WEB_BACKEND_GTK_WEBKIT
|
#if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXGTK__)
|
||||||
case wxWEB_VIEW_BACKEND_GTK_WEBKIT:
|
case wxWEB_VIEW_BACKEND_GTK_WEBKIT:
|
||||||
return new wxGtkWebKitCtrl();
|
return new wxWebViewGTKWebKit();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if wxHAVE_WEB_BACKEND_IE
|
#if wxUSE_WEBVIEW_IE
|
||||||
case wxWEB_VIEW_BACKEND_IE:
|
case wxWEB_VIEW_BACKEND_IE:
|
||||||
return new wxWebViewIE();
|
return new wxWebViewIE();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
case wxWEB_VIEW_BACKEND_DEFAULT:
|
case wxWEB_VIEW_BACKEND_DEFAULT:
|
||||||
|
|
||||||
#if wxHAVE_WEB_BACKEND_OSX_WEBKIT
|
#if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXOSX__)
|
||||||
return new wxOSXWebKitCtrl();
|
return new wxOSXWebKitCtrl();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if wxHAVE_WEB_BACKEND_GTK_WEBKIT
|
#if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXGTK__)
|
||||||
return new wxGtkWebKitCtrl();
|
return new wxWebViewGTKWebKit();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if wxHAVE_WEB_BACKEND_IE
|
#if wxUSE_WEBVIEW_IE
|
||||||
return new wxWebViewIE();
|
return new wxWebViewIE();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -89,34 +89,34 @@ wxWebView* wxWebView::New(wxWindow* parent,
|
|||||||
{
|
{
|
||||||
switch (backend)
|
switch (backend)
|
||||||
{
|
{
|
||||||
#if wxHAVE_WEB_BACKEND_OSX_WEBKIT
|
#if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXOSX__)
|
||||||
case wxWEB_VIEW_BACKEND_OSX_WEBKIT:
|
case wxWEB_VIEW_BACKEND_OSX_WEBKIT:
|
||||||
return new wxOSXWebKitCtrl(parent, id, url, pos, size, style,
|
return new wxOSXWebKitCtrl(parent, id, url, pos, size, style,
|
||||||
name);
|
name);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if wxHAVE_WEB_BACKEND_GTK_WEBKIT
|
#if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXGTK__)
|
||||||
case wxWEB_VIEW_BACKEND_GTK_WEBKIT:
|
case wxWEB_VIEW_BACKEND_GTK_WEBKIT:
|
||||||
return new wxGtkWebKitCtrl(parent, id, url, pos, size, style,
|
return new wxWebViewGTKWebKit(parent, id, url, pos, size, style,
|
||||||
name);
|
name);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if wxHAVE_WEB_BACKEND_IE
|
#if wxUSE_WEBVIEW_IE
|
||||||
case wxWEB_VIEW_BACKEND_IE:
|
case wxWEB_VIEW_BACKEND_IE:
|
||||||
return new wxWebViewIE(parent, id, url, pos, size, style, name);
|
return new wxWebViewIE(parent, id, url, pos, size, style, name);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
case wxWEB_VIEW_BACKEND_DEFAULT:
|
case wxWEB_VIEW_BACKEND_DEFAULT:
|
||||||
|
|
||||||
#if wxHAVE_WEB_BACKEND_OSX_WEBKIT
|
#if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXOSX__)
|
||||||
return new wxOSXWebKitCtrl(parent, id, url, pos, size, style, name);
|
return new wxOSXWebKitCtrl(parent, id, url, pos, size, style, name);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if wxHAVE_WEB_BACKEND_GTK_WEBKIT
|
#if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXGTK__)
|
||||||
return new wxGtkWebKitCtrl(parent, id, url, pos, size, style, name);
|
return new wxWebViewGTKWebKit(parent, id, url, pos, size, style, name);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if wxHAVE_WEB_BACKEND_IE
|
#if wxUSE_WEBVIEW_IE
|
||||||
return new wxWebViewIE(parent, id, url, pos, size, style, name);
|
return new wxWebViewIE(parent, id, url, pos, size, style, name);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@@ -10,8 +10,7 @@
|
|||||||
// For compilers that support precompilation, includes "wx.h".
|
// For compilers that support precompilation, includes "wx.h".
|
||||||
#include "wx/wxprec.h"
|
#include "wx/wxprec.h"
|
||||||
|
|
||||||
|
#if wxUSE_WEBVIEW_WEBKIT
|
||||||
#if wxHAVE_WEB_BACKEND_GTK_WEBKIT
|
|
||||||
|
|
||||||
#include "wx/stockitem.h"
|
#include "wx/stockitem.h"
|
||||||
#include "wx/gtk/webview_webkit.h"
|
#include "wx/gtk/webview_webkit.h"
|
||||||
@@ -359,7 +358,7 @@ void wxWebViewGTKWebKit::Reload(wxWebViewReloadFlags flags)
|
|||||||
|
|
||||||
void wxWebViewGTKWebKit::LoadUrl(const wxString& url)
|
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