Use the data scheme to load resources in the WebKitGTK+ implementation, rather than...

[wxWidgets.git] / src / common / webview.cpp

diff --git a/src/common/webview.cpp b/src/common/webview.cpp
index dbf877979fbdd3f2c97d92e12f56396ecedb7201..4ceb94c320cf35b4b55a186130739f8bdcc3bc36 100644 (file)
--- 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$
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -29,41 +29,36 @@ WX_CHECK_BUILD_OPTIONS("wxWEB")
 extern WXDLLIMPEXP_DATA_WEB(const char) wxWebViewNameStr[] = "wxWebView";
 extern WXDLLIMPEXP_DATA_WEB(const char) wxWebViewDefaultURLStr[] = "about:blank";
 
 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_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)
     {
 
 // static
 wxWebView* wxWebView::New(wxWebViewBackend backend)
 {
     switch (backend)
     {

-        #if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXOSX__)
-            case wxWEB_VIEW_BACKEND_OSX_WEBKIT:
-                return new wxOSXWebKitCtrl();
-        #endif
-
-        #if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXGTK__)
-            case wxWEB_VIEW_BACKEND_GTK_WEBKIT:
-                return new wxWebViewWebKit();
+        #if defined(wxUSE_WEBVIEW_WEBKIT) && \
+           (defined(__WXGTK__) || defined(__WXOSX__))
+        case wxWEB_VIEW_BACKEND_WEBKIT:
+            return new wxWebViewWebKit();

         #endif
 
         #if wxUSE_WEBVIEW_IE
         #endif
 
         #if wxUSE_WEBVIEW_IE

-            case wxWEB_VIEW_BACKEND_IE:
-                return new wxWebViewIE();
+        case wxWEB_VIEW_BACKEND_IE:
+            return new wxWebViewIE();

         #endif
 
         case wxWEB_VIEW_BACKEND_DEFAULT:
 
         #endif
 
         case wxWEB_VIEW_BACKEND_DEFAULT:
 

-            #if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXOSX__)
-            return new wxOSXWebKitCtrl();
-            #endif
-
-            #if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXGTK__)
+            #if defined(wxUSE_WEBVIEW_WEBKIT) && \
+               (defined(__WXGTK__) || defined(__WXOSX__))

             return new wxWebViewWebKit();
             #endif
 
             return new wxWebViewWebKit();
             #endif
 


@@ -89,30 +84,21 @@ wxWebView* wxWebView::New(wxWindow* parent,
 {
     switch (backend)
     {
 {
     switch (backend)
     {

-        #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 defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXGTK__)
-            case wxWEB_VIEW_BACKEND_GTK_WEBKIT:
-                return new wxWebViewWebKit(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 wxUSE_WEBVIEW_IE
         #endif
 
         #if wxUSE_WEBVIEW_IE

-            case wxWEB_VIEW_BACKEND_IE:
-                return new wxWebViewIE(parent, id, url, pos, size, style, name);
+        case wxWEB_VIEW_BACKEND_IE:
+            return new wxWebViewIE(parent, id, url, pos, size, style, name);

         #endif
 
         case wxWEB_VIEW_BACKEND_DEFAULT:
 
         #endif
 
         case wxWEB_VIEW_BACKEND_DEFAULT:
 

-            #if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXOSX__)
-            return new wxOSXWebKitCtrl(parent, id, url, pos, size, style, name);
-            #endif
-
-            #if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXGTK__)
+            #if defined(wxUSE_WEBVIEW_WEBKIT) && \
+               (defined(__WXGTK__) || defined(__WXOSX__))

             return new wxWebViewWebKit(parent, id, url, pos, size, style, name);
             #endif
 
             return new wxWebViewWebKit(parent, id, url, pos, size, style, name);
             #endif