Application of the most recent wxWebView patch, the only changes were so tab to space conversions. Please note this probably won't compile.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-04 15:40:00 +00:00
parent 1a9dfe8dcb
commit cfcf1d6ee3
23 changed files with 5130 additions and 6 deletions
--- a/src/common/webview.cpp
+++ b/src/common/webview.cpp
@@ -0,0 +1,113 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        webview.cpp
+// Purpose:     Common interface and events for web view component
+// Author:      Marianne Gagnon
+// Id:          $Id$
+// Copyright:   (c) 2010 Marianne Gagnon
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#include "wx/webview.h"
+
+#include "wx/osx/webkit.h"
+#include "wx/gtk/webkit.h"
+#include "wx/msw/webkitie.h"
+
+extern WXDLLEXPORT_DATA(const char) wxWebViewNameStr[] = "wxWebView";
+extern WXDLLEXPORT_DATA(const char) wxWebViewDefaultURLStr[] = "about:blank";
+
+IMPLEMENT_DYNAMIC_CLASS(wxWebNavigationEvent, wxCommandEvent)
+
+wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_NAVIGATING, wxWebNavigationEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_NAVIGATED, wxWebNavigationEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_LOADED, wxWebNavigationEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_ERROR, wxWebNavigationEvent );
+
+// static
+wxWebView* wxWebView::New(wxWebViewBackend backend)
+{
+    switch (backend)
+    {
+        #if wxHAVE_WEB_BACKEND_OSX_WEBKIT
+            case wxWEB_VIEW_BACKEND_OSX_WEBKIT:
+                return new wxOSXWebKitCtrl();
+        #endif
+
+        #if wxHAVE_WEB_BACKEND_GTK_WEBKIT
+            case wxWEB_VIEW_BACKEND_GTK_WEBKIT:
+                return new wxGtkWebKitCtrl();
+        #endif
+
+        #if wxHAVE_WEB_BACKEND_IE
+            case wxWEB_VIEW_BACKEND_IE:
+                return new wxIEPanel();
+        #endif
+
+        case wxWEB_VIEW_BACKEND_DEFAULT:
+
+            #if wxHAVE_WEB_BACKEND_OSX_WEBKIT
+            return new wxOSXWebKitCtrl();
+            #endif
+
+            #if wxHAVE_WEB_BACKEND_GTK_WEBKIT
+            return new wxGtkWebKitCtrl();
+            #endif
+
+            #if wxHAVE_WEB_BACKEND_IE
+            return new wxIEPanel();
+            #endif
+
+        // fall-through intended
+        default:
+            return NULL;
+    }
+}
+
+// static
+wxWebView* wxWebView::New(wxWindow* parent,
+       wxWindowID id,
+       const wxString& url,
+       const wxPoint& pos,
+       const wxSize& size,
+       wxWebViewBackend backend,
+       long style,
+       const wxString& name)
+{
+    switch (backend)
+    {
+        #if wxHAVE_WEB_BACKEND_OSX_WEBKIT
+            case wxWEB_VIEW_BACKEND_OSX_WEBKIT:
+                return new wxOSXWebKitCtrl(parent, id, url, pos, size, style,
+                                           name);
+        #endif
+
+        #if wxHAVE_WEB_BACKEND_GTK_WEBKIT
+            case wxWEB_VIEW_BACKEND_GTK_WEBKIT:
+                return new wxGtkWebKitCtrl(parent, id, url, pos, size, style,
+                                           name);
+        #endif
+
+        #if wxHAVE_WEB_BACKEND_IE
+            case wxWEB_VIEW_BACKEND_IE:
+                return new wxIEPanel(parent, id, url, pos, size, style, name);
+        #endif
+
+        case wxWEB_VIEW_BACKEND_DEFAULT:
+
+            #if wxHAVE_WEB_BACKEND_OSX_WEBKIT
+            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);
+            #endif
+
+            #if wxHAVE_WEB_BACKEND_IE
+            return new wxIEPanel(parent, id, url, pos, size, style, name);
+            #endif
+
+        // fall-through intended
+        default:
+            return NULL;
+    }
+}