X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/97ad1425fe7da4bc129e73e48e268ebdc878d621..eea4d01c65f9b29baa1193db762b4c6b8144af24:/src/common/webview.cpp

diff --git a/src/common/webview.cpp b/src/common/webview.cpp
index 9d710449fe..4ceb94c320 100644
--- a/src/common/webview.cpp
+++ b/src/common/webview.cpp
@@ -3,7 +3,7 @@
 // Purpose:     Common interface and events for web view component
 // Author:      Marianne Gagnon
 // Id:          $Id$
-// Copyright:   (c) 2010 Marianne Gagnon
+// Copyright:   (c) 2010 Marianne Gagnon, 2011 Steven Lamerton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -18,9 +18,9 @@
 
 #include "wx/webview.h"
 
-#include "wx/osx/webview.h"
-#include "wx/gtk/webview.h"
-#include "wx/msw/webviewie.h"
+#include "wx/osx/webview_webkit.h"
+#include "wx/gtk/webview_webkit.h"
+#include "wx/msw/webview_ie.h"
 
 // DLL options compatibility check:
 #include "wx/app.h"
@@ -29,44 +29,40 @@ WX_CHECK_BUILD_OPTIONS("wxWEB")
 extern WXDLLIMPEXP_DATA_WEB(const char) wxWebViewNameStr[] = "wxWebView";
 extern WXDLLIMPEXP_DATA_WEB(const char) wxWebViewDefaultURLStr[] = "about:blank";
 
-IMPLEMENT_DYNAMIC_CLASS(wxWebNavigationEvent, wxCommandEvent)
+wxIMPLEMENT_ABSTRACT_CLASS(wxWebView, wxControl);
+wxIMPLEMENT_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 );
+wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_NEWWINDOW, wxWebNavigationEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED, wxWebNavigationEvent );
 
 // static
 wxWebView* wxWebView::New(wxWebViewBackend backend)
 {
     switch (backend)
     {
-        #if wxHAVE_WEB_BACKEND_OSX_WEBKIT
-            case wxWEB_VIEW_BACKEND_OSX_WEBKIT:
-                return new wxOSXWebKitCtrl();
+        #if defined(wxUSE_WEBVIEW_WEBKIT) && \
+           (defined(__WXGTK__) || defined(__WXOSX__))
+        case wxWEB_VIEW_BACKEND_WEBKIT:
+            return new wxWebViewWebKit();
         #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 wxWebViewIE();
+        #if wxUSE_WEBVIEW_IE
+        case wxWEB_VIEW_BACKEND_IE:
+            return new wxWebViewIE();
         #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();
+            #if defined(wxUSE_WEBVIEW_WEBKIT) && \
+               (defined(__WXGTK__) || defined(__WXOSX__))
+            return new wxWebViewWebKit();
             #endif
 
-            #if wxHAVE_WEB_BACKEND_IE
+            #if wxUSE_WEBVIEW_IE
             return new wxWebViewIE();
             #endif
 
@@ -88,34 +84,25 @@ wxWebView* wxWebView::New(wxWindow* parent,
 {
     switch (backend)
     {
-        #if wxHAVE_WEB_BACKEND_OSX_WEBKIT
-            case wxWEB_VIEW_BACKEND_OSX_WEBKIT:
-                return new wxOSXWebKitCtrl(parent, id, url, pos, size, style,
-                                           name);
+        #if defined(wxUSE_WEBVIEW_WEBKIT) && \
+           (defined(__WXGTK__) || defined(__WXOSX__))
+        case wxWEB_VIEW_BACKEND_WEBKIT:
+            return new wxWebViewWebKit(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 wxWebViewIE(parent, id, url, pos, size, style, name);
+        #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
-            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__) || defined(__WXOSX__))
+            return new wxWebViewWebKit(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