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

Fix the build system in gtk, plus a couple of compilation errors. wxWebView now successfully builds under gtk and the sample runs correctly.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-06-28 15:15:51 +00:00
parent 726cc8697c
commit ea1795398a
3 changed files with 56 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/common/webview.cpp
View File

@@ -42,32 +42,32 @@ wxWebView* wxWebView::New(wxWebViewBackend backend)
{
switch (backend)
{
#if wxHAVE_WEB_BACKEND_OSX_WEBKIT
#if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXOSX__)
case wxWEB_VIEW_BACKEND_OSX_WEBKIT:
return new wxOSXWebKitCtrl();
#endif
#if wxHAVE_WEB_BACKEND_GTK_WEBKIT
#if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXGTK__)
case wxWEB_VIEW_BACKEND_GTK_WEBKIT:
return new wxGtkWebKitCtrl();
return new wxWebViewGTKWebKit();
#endif
#if wxHAVE_WEB_BACKEND_IE
#if wxUSE_WEBVIEW_IE
case wxWEB_VIEW_BACKEND_IE:
return new wxWebViewIE();
#endif
case wxWEB_VIEW_BACKEND_DEFAULT:
#if wxHAVE_WEB_BACKEND_OSX_WEBKIT
#if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXOSX__)
return new wxOSXWebKitCtrl();
#endif
#if wxHAVE_WEB_BACKEND_GTK_WEBKIT
return new wxGtkWebKitCtrl();
#if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXGTK__)
return new wxWebViewGTKWebKit();
#endif
#if wxHAVE_WEB_BACKEND_IE
#if wxUSE_WEBVIEW_IE
return new wxWebViewIE();
#endif
@@ -89,34 +89,34 @@ wxWebView* wxWebView::New(wxWindow* parent,
{
switch (backend)
{
#if wxHAVE_WEB_BACKEND_OSX_WEBKIT
#if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXOSX__)
case wxWEB_VIEW_BACKEND_OSX_WEBKIT:
return new wxOSXWebKitCtrl(parent, id, url, pos, size, style,
name);
#endif
#if wxHAVE_WEB_BACKEND_GTK_WEBKIT
#if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXGTK__)
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);
#endif
#if wxHAVE_WEB_BACKEND_IE
#if wxUSE_WEBVIEW_IE
case wxWEB_VIEW_BACKEND_IE:
return new wxWebViewIE(parent, id, url, pos, size, style, name);
#endif
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);
#endif
#if wxHAVE_WEB_BACKEND_GTK_WEBKIT
return new wxGtkWebKitCtrl(parent, id, url, pos, size, style, name);
#if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXGTK__)
return new wxWebViewGTKWebKit(parent, id, url, pos, size, style, name);
#endif
#if wxHAVE_WEB_BACKEND_IE
#if wxUSE_WEBVIEW_IE
return new wxWebViewIE(parent, id, url, pos, size, style, name);
#endif