Add some version checks to help compiling on OSX.

[wxWidgets.git] / src / gtk / webview_webkit.cpp

diff --git a/src/gtk/webview_webkit.cpp b/src/gtk/webview_webkit.cpp
index d6d139b83674d5f6e475deb91782be853f996ee2..91973b1d5f52c9b73111a33dbaacfcefc10d4538 100644 (file)
--- a/src/gtk/webview_webkit.cpp
+++ b/src/gtk/webview_webkit.cpp
@@ -16,6 +16,8 @@
 #include "wx/gtk/webview_webkit.h"
 #include "wx/gtk/control.h"
 #include "wx/gtk/private.h"
 #include "wx/gtk/webview_webkit.h"
 #include "wx/gtk/control.h"
 #include "wx/gtk/private.h"

+#include "wx/filesys.h"
+#include "wx/base64.h"

 #include "webkit/webkit.h"
 
 // ----------------------------------------------------------------------------
 #include "webkit/webkit.h"
 
 // ----------------------------------------------------------------------------


@@ -26,8 +28,9 @@ extern "C"
 {
 
 static void
 {
 
 static void

-wxgtk_webkitctrl_load_status_callback(GtkWidget* widget, GParamSpec* arg1,
-                                      wxWebViewGTKWebKit *webKitCtrl)
+wxgtk_webview_webkit_load_status(GtkWidget* widget, 
+                                 GParamSpec*,
+                                 wxWebViewWebKit *webKitCtrl)

 {
     if (!webKitCtrl->m_ready) return;
 
 {
     if (!webKitCtrl->m_ready) return;
 


@@ -41,65 +44,103 @@ wxgtk_webkitctrl_load_status_callback(GtkWidget* widget, GParamSpec* arg1,
     if (status == WEBKIT_LOAD_FINISHED)
     {
         webKitCtrl->m_busy = false;
     if (status == WEBKIT_LOAD_FINISHED)
     {
         webKitCtrl->m_busy = false;

-        wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_LOADED,
-                                       webKitCtrl->GetId(),
-                                       url, target, false);
+        wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_LOADED,
+                             webKitCtrl->GetId(),
+                             url, target);

 
         if (webKitCtrl && webKitCtrl->GetEventHandler())
 
         if (webKitCtrl && webKitCtrl->GetEventHandler())

-            webKitCtrl->GetEventHandler()->ProcessEvent(thisEvent);
+            webKitCtrl->GetEventHandler()->ProcessEvent(event);

     }
     else if (status ==  WEBKIT_LOAD_COMMITTED)
     {
         webKitCtrl->m_busy = true;
     }
     else if (status ==  WEBKIT_LOAD_COMMITTED)
     {
         webKitCtrl->m_busy = true;

-        wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
-                                       webKitCtrl->GetId(),
-                                       url, target, false);
+        wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
+                             webKitCtrl->GetId(),
+                             url, target);

 
         if (webKitCtrl && webKitCtrl->GetEventHandler())
 
         if (webKitCtrl && webKitCtrl->GetEventHandler())

-            webKitCtrl->GetEventHandler()->ProcessEvent(thisEvent);
+            webKitCtrl->GetEventHandler()->ProcessEvent(event);

     }
 }
 
     }
 }
 

-static WebKitNavigationResponse
-wxgtk_webkitctrl_navigation_requ_callback(WebKitWebView        *web_view,
-                                          WebKitWebFrame       *frame,
-                                          WebKitNetworkRequest *request,
-                                          wxWebViewGTKWebKit      *webKitCtrl)
+static gboolean
+wxgtk_webview_webkit_navigation(WebKitWebView *,
+                                WebKitWebFrame *frame,
+                                WebKitNetworkRequest *request,
+                                WebKitWebNavigationAction *,
+                                WebKitWebPolicyDecision *policy_decision,
+                                wxWebViewWebKit *webKitCtrl)

 {
 {

+    if(webKitCtrl->m_guard)
+    {
+        webKitCtrl->m_guard = false;
+        //We set this to make sure that we don't try to load the page again from 
+        //the resource request callback
+        webKitCtrl->m_vfsurl = webkit_network_request_get_uri(request);
+        webkit_web_policy_decision_use(policy_decision);
+        return FALSE;
+    }
+

     webKitCtrl->m_busy = true;
 
     const gchar* uri = webkit_network_request_get_uri(request);
 
     wxString target = webkit_web_frame_get_name (frame);
     webKitCtrl->m_busy = true;
 
     const gchar* uri = webkit_network_request_get_uri(request);
 
     wxString target = webkit_web_frame_get_name (frame);

-    wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_NAVIGATING,
-                                   webKitCtrl->GetId(),
-                                   wxString( uri, wxConvUTF8 ),
-                                   target,
-                                   true);
+    wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATING,
+                         webKitCtrl->GetId(),
+                         wxString( uri, wxConvUTF8 ),
+                         target);

 
     if (webKitCtrl && webKitCtrl->GetEventHandler())
 
     if (webKitCtrl && webKitCtrl->GetEventHandler())

-        webKitCtrl->GetEventHandler()->ProcessEvent(thisEvent);
+        webKitCtrl->GetEventHandler()->ProcessEvent(event);

 
 

-    if (thisEvent.IsVetoed())
+    if (!event.IsAllowed())

     {
         webKitCtrl->m_busy = false;
     {
         webKitCtrl->m_busy = false;

-        return WEBKIT_NAVIGATION_RESPONSE_IGNORE;
+        webkit_web_policy_decision_ignore(policy_decision);
+        return TRUE;

     }
     else
     {
     }
     else
     {

-        return  WEBKIT_NAVIGATION_RESPONSE_ACCEPT;
+        wxString wxuri = uri;
+        wxSharedPtr<wxWebViewHandler> handler;
+        wxVector<wxSharedPtr<wxWebViewHandler> > hanlders = webKitCtrl->GetHandlers();
+        //We are not vetoed so see if we match one of the additional handlers
+        for(wxVector<wxSharedPtr<wxWebViewHandler> >::iterator it = hanlders.begin();
+            it != hanlders.end(); ++it)
+        {
+            if(wxuri.substr(0, (*it)->GetName().length()) == (*it)->GetName())
+            {
+                handler = (*it);
+            }
+        }
+        //If we found a handler we can then use it to load the file directly 
+        //ourselves
+        if(handler)
+        {
+            webKitCtrl->m_guard = true;
+            wxFSFile* file = handler->GetFile(wxuri);
+            if(file)
+            {
+                webKitCtrl->SetPage(*file->GetStream(), wxuri);
+            }
+            //We need to throw some sort of error here if file is NULL
+            webkit_web_policy_decision_ignore(policy_decision);
+            return TRUE;
+        }
+        return FALSE;

     }
 }
 
 static gboolean
     }
 }
 
 static gboolean

-wxgtk_webkitctrl_error (WebKitWebView  *web_view,
-                        WebKitWebFrame *web_frame,
-                        gchar          *uri,
-                        gpointer        web_error,
-                        wxWebViewGTKWebKit* webKitWindow)
+wxgtk_webview_webkit_error(WebKitWebView*,
+                           WebKitWebFrame*,
+                           gchar *uri,
+                           gpointer web_error,
+                           wxWebViewWebKit* webKitWindow)

 {
     webKitWindow->m_busy = false;
 {
     webKitWindow->m_busy = false;

-    wxWebNavigationError type = wxWEB_NAV_ERR_OTHER;
+    wxWebViewNavigationError type = wxWEB_NAV_ERR_OTHER;

 
     GError* error = (GError*)web_error;
     wxString description(error->message, wxConvUTF8);
 
     GError* error = (GError*)web_error;
     wxString description(error->message, wxConvUTF8);


@@ -218,32 +259,119 @@ wxgtk_webkitctrl_error (WebKitWebView  *web_view,
     }
     */
 
     }
     */
 

-    wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_ERROR,
-                                   webKitWindow->GetId(),
-                                   uri,
-                                   wxEmptyString,
-                                   false);
-    thisEvent.SetString(description);
-    thisEvent.SetInt(type);
+    wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_ERROR,
+                         webKitWindow->GetId(),
+                         uri, "");
+    event.SetString(description);
+    event.SetInt(type);

 
     if (webKitWindow && webKitWindow->GetEventHandler())
     {
 
     if (webKitWindow && webKitWindow->GetEventHandler())
     {

-        webKitWindow->GetEventHandler()->ProcessEvent(thisEvent);
+        webKitWindow->GetEventHandler()->ProcessEvent(event);

     }
 
     return FALSE;
 }
 
     }
 
     return FALSE;
 }
 

+static gboolean
+wxgtk_webview_webkit_new_window(WebKitWebView*,
+                                WebKitWebFrame *frame,
+                                WebKitNetworkRequest *request,
+                                WebKitWebNavigationAction*,
+                                WebKitWebPolicyDecision *policy_decision,
+                                wxWebViewWebKit *webKitCtrl)
+{
+    const gchar* uri = webkit_network_request_get_uri(request);
+
+    wxString target = webkit_web_frame_get_name (frame);
+    wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NEWWINDOW,
+                                       webKitCtrl->GetId(),
+                                       wxString( uri, wxConvUTF8 ),
+                                       target);
+
+    if (webKitCtrl && webKitCtrl->GetEventHandler())
+        webKitCtrl->GetEventHandler()->ProcessEvent(event);
+
+    //We always want the user to handle this themselves
+    webkit_web_policy_decision_ignore(policy_decision);
+    return TRUE;
+}
+
+static void
+wxgtk_webview_webkit_title_changed(WebKitWebView*,
+                                   WebKitWebFrame*,
+                                   gchar *title,
+                                   wxWebViewWebKit *webKitCtrl)
+{
+    wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED,
+                         webKitCtrl->GetId(),
+                         webKitCtrl->GetCurrentURL(),
+                         "");
+    event.SetString(wxString(title, wxConvUTF8));
+
+    if (webKitCtrl && webKitCtrl->GetEventHandler())
+        webKitCtrl->GetEventHandler()->ProcessEvent(event);
+
+}
+
+static void
+wxgtk_webview_webkit_resource_req(WebKitWebView *,
+                                  WebKitWebFrame *,
+                                  WebKitWebResource *,
+                                  WebKitNetworkRequest *request,
+                                  WebKitNetworkResponse *,
+                                  wxWebViewWebKit *webKitCtrl)
+{
+    wxString uri = webkit_network_request_get_uri(request);
+    
+    wxSharedPtr<wxWebViewHandler> handler;
+    wxVector<wxSharedPtr<wxWebViewHandler> > hanlders = webKitCtrl->GetHandlers();
+    
+    //We are not vetoed so see if we match one of the additional handlers
+    for(wxVector<wxSharedPtr<wxWebViewHandler> >::iterator it = hanlders.begin();
+        it != hanlders.end(); ++it)
+    {
+        if(uri.substr(0, (*it)->GetName().length()) == (*it)->GetName())
+        {
+            handler = (*it);
+        }
+    }
+    //If we found a handler we can then use it to load the file directly 
+    //ourselves
+    if(handler)
+    {
+        //If it is requsting the page itself then return as we have already
+        //loaded it from the archive
+        if(webKitCtrl->m_vfsurl == uri)
+            return;
+
+        wxFSFile* file = handler->GetFile(uri);
+        if(file)
+        {
+            //We load the data into a data url to save it being written out again
+            size_t size = file->GetStream()->GetLength();
+            char *buffer = new char[size];
+            file->GetStream()->Read(buffer, size);
+            wxString data = wxBase64Encode(buffer, size);
+            delete[] buffer;
+            wxString mime = file->GetMimeType();
+            wxString path = "data:" + mime + ";base64," + data;
+            //Then we can redirect the call
+            webkit_network_request_set_uri(request, path);
+        }
+        
+    }
+}

 
 } // extern "C"
 
 //-----------------------------------------------------------------------------
 
 } // extern "C"
 
 //-----------------------------------------------------------------------------

-// wxWebViewGTKWebKit
+// wxWebViewWebKit

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-//IMPLEMENT_DYNAMIC_CLASS(wxWebViewGTKWebKit, wxControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewWebKit, wxWebView);

 
 

-bool wxWebViewGTKWebKit::Create(wxWindow *parent,
+bool wxWebViewWebKit::Create(wxWindow *parent,

                       wxWindowID id,
                       const wxString &url,
                       const wxPoint& pos,
                       wxWindowID id,
                       const wxString &url,
                       const wxPoint& pos,


@@ -253,11 +381,12 @@ bool wxWebViewGTKWebKit::Create(wxWindow *parent,
 {
     m_ready = false;
     m_busy = false;
 {
     m_ready = false;
     m_busy = false;

+    m_guard = false;

 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {

-        wxFAIL_MSG( wxT("wxWebViewGTKWebKit creation failed") );
+        wxFAIL_MSG( wxT("wxWebViewWebKit creation failed") );

         return false;
     }
 
         return false;
     }
 


@@ -274,18 +403,23 @@ bool wxWebViewGTKWebKit::Create(wxWindow *parent,
     gtk_widget_show(web_view);
 
     g_signal_connect_after(web_view, "notify::load-status",
     gtk_widget_show(web_view);
 
     g_signal_connect_after(web_view, "notify::load-status",

-                           G_CALLBACK(wxgtk_webkitctrl_load_status_callback),
+                           G_CALLBACK(wxgtk_webview_webkit_load_status),

                            this);
                            this);

-    g_signal_connect_after(web_view, "navigation-requested",
-                           G_CALLBACK(wxgtk_webkitctrl_navigation_requ_callback),
+    g_signal_connect_after(web_view, "navigation-policy-decision-requested",
+                           G_CALLBACK(wxgtk_webview_webkit_navigation),

                            this);
     g_signal_connect_after(web_view, "load-error", 
                            this);
     g_signal_connect_after(web_view, "load-error", 

-                           G_CALLBACK(wxgtk_webkitctrl_error),
+                           G_CALLBACK(wxgtk_webview_webkit_error),

                            this);
 
                            this);
 

-    // this signal can be added if we care about new frames open requests
-    //g_signal_connect_after(web_view, "new-window-policy-decision-requested",
-    //                       G_CALLBACK(...), this);
+    g_signal_connect_after(web_view, "new-window-policy-decision-requested",
+                           G_CALLBACK(wxgtk_webview_webkit_new_window), this);
+
+    g_signal_connect_after(web_view, "title-changed",
+                           G_CALLBACK(wxgtk_webview_webkit_title_changed), this);
+
+    g_signal_connect_after(web_view, "resource-request-starting",
+                           G_CALLBACK(wxgtk_webview_webkit_resource_req), this);

 
     m_parent->DoAddChild( this );
 
 
     m_parent->DoAddChild( this );
 


@@ -294,12 +428,17 @@ bool wxWebViewGTKWebKit::Create(wxWindow *parent,
     /* Open a webpage */
     webkit_web_view_load_uri (WEBKIT_WEB_VIEW (web_view), url);
 
     /* Open a webpage */
     webkit_web_view_load_uri (WEBKIT_WEB_VIEW (web_view), url);
 

+    //Get the initial history limit so we can enable and disable it later
+    WebKitWebBackForwardList* history;
+    history = webkit_web_view_get_back_forward_list(WEBKIT_WEB_VIEW(web_view));
+    m_historyLimit = webkit_web_back_forward_list_get_limit(history);
+

     m_ready = true;
 
     return true;
 }
 
     m_ready = true;
 
     return true;
 }
 

-bool wxWebViewGTKWebKit::Enable( bool enable )
+bool wxWebViewWebKit::Enable( bool enable )

 {
     if (!wxControl::Enable(enable))
         return false;
 {
     if (!wxControl::Enable(enable))
         return false;


@@ -313,38 +452,38 @@ bool wxWebViewGTKWebKit::Enable( bool enable )
 }
 
 GdkWindow*
 }
 
 GdkWindow*

-wxWebViewGTKWebKit::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
+wxWebViewWebKit::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const

 {
     GdkWindow* window = gtk_widget_get_parent_window(m_widget);
     return window;
 }
 
 {
     GdkWindow* window = gtk_widget_get_parent_window(m_widget);
     return window;
 }
 

-void wxWebViewGTKWebKit::ZoomIn()
+void wxWebViewWebKit::ZoomIn()

 {
     webkit_web_view_zoom_in (WEBKIT_WEB_VIEW(web_view));
 }
 
 {
     webkit_web_view_zoom_in (WEBKIT_WEB_VIEW(web_view));
 }
 

-void wxWebViewGTKWebKit::ZoomOut()
+void wxWebViewWebKit::ZoomOut()

 {
     webkit_web_view_zoom_out (WEBKIT_WEB_VIEW(web_view));
 }
 
 {
     webkit_web_view_zoom_out (WEBKIT_WEB_VIEW(web_view));
 }
 

-void wxWebViewGTKWebKit::SetWebkitZoom(float level)
+void wxWebViewWebKit::SetWebkitZoom(float level)

 {
     webkit_web_view_set_zoom_level (WEBKIT_WEB_VIEW(web_view), level);
 }
 
 {
     webkit_web_view_set_zoom_level (WEBKIT_WEB_VIEW(web_view), level);
 }
 

-float wxWebViewGTKWebKit::GetWebkitZoom()
+float wxWebViewWebKit::GetWebkitZoom() const

 {
     return webkit_web_view_get_zoom_level (WEBKIT_WEB_VIEW(web_view));
 }
 
 {
     return webkit_web_view_get_zoom_level (WEBKIT_WEB_VIEW(web_view));
 }
 

-void wxWebViewGTKWebKit::Stop()
+void wxWebViewWebKit::Stop()

 {
      webkit_web_view_stop_loading (WEBKIT_WEB_VIEW(web_view));
 }
 
 {
      webkit_web_view_stop_loading (WEBKIT_WEB_VIEW(web_view));
 }
 

-void wxWebViewGTKWebKit::Reload(wxWebViewReloadFlags flags)
+void wxWebViewWebKit::Reload(wxWebViewReloadFlags flags)

 {
     if (flags & wxWEB_VIEW_RELOAD_NO_CACHE)
     {
 {
     if (flags & wxWEB_VIEW_RELOAD_NO_CACHE)
     {


@@ -356,36 +495,159 @@ void wxWebViewGTKWebKit::Reload(wxWebViewReloadFlags flags)
     }
 }
 
     }
 }
 

-void wxWebViewGTKWebKit::LoadUrl(const wxString& url)
+void wxWebViewWebKit::LoadURL(const wxString& url)

 {
 {

-    webkit_web_view_open(WEBKIT_WEB_VIEW(web_view), wxGTK_CONV(url));
+    webkit_web_view_load_uri(WEBKIT_WEB_VIEW(web_view), wxGTK_CONV(url));

 }
 
 
 }
 
 

-void wxWebViewGTKWebKit::GoBack()
+void wxWebViewWebKit::GoBack()

 {
     webkit_web_view_go_back (WEBKIT_WEB_VIEW(web_view));
 }
 
 {
     webkit_web_view_go_back (WEBKIT_WEB_VIEW(web_view));
 }
 

-void wxWebViewGTKWebKit::GoForward()
+void wxWebViewWebKit::GoForward()

 {
     webkit_web_view_go_forward (WEBKIT_WEB_VIEW(web_view));
 }
 
 
 {
     webkit_web_view_go_forward (WEBKIT_WEB_VIEW(web_view));
 }
 
 

-bool wxWebViewGTKWebKit::CanGoBack()
+bool wxWebViewWebKit::CanGoBack() const

 {
     return webkit_web_view_can_go_back (WEBKIT_WEB_VIEW(web_view));
 }
 
 
 {
     return webkit_web_view_can_go_back (WEBKIT_WEB_VIEW(web_view));
 }
 
 

-bool wxWebViewGTKWebKit::CanGoForward()
+bool wxWebViewWebKit::CanGoForward() const

 {
     return webkit_web_view_can_go_forward (WEBKIT_WEB_VIEW(web_view));
 }
 
 {
     return webkit_web_view_can_go_forward (WEBKIT_WEB_VIEW(web_view));
 }
 

+void wxWebViewWebKit::ClearHistory()
+{
+    WebKitWebBackForwardList* history;
+    history = webkit_web_view_get_back_forward_list(WEBKIT_WEB_VIEW(web_view));
+    webkit_web_back_forward_list_clear(history);
+}
+
+void wxWebViewWebKit::EnableHistory(bool enable)
+{
+    WebKitWebBackForwardList* history;
+    history = webkit_web_view_get_back_forward_list(WEBKIT_WEB_VIEW(web_view));
+    if(enable)
+    {
+        webkit_web_back_forward_list_set_limit(history, m_historyLimit);
+    }
+    else
+    {
+        webkit_web_back_forward_list_set_limit(history, 0);
+    }
+}
+
+wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetBackwardHistory()
+{
+    wxVector<wxSharedPtr<wxWebViewHistoryItem> > backhist; 
+    WebKitWebBackForwardList* history;
+    history = webkit_web_view_get_back_forward_list(WEBKIT_WEB_VIEW(web_view));
+    GList* list = webkit_web_back_forward_list_get_back_list_with_limit(history, 
+                                                                        m_historyLimit);
+    //We need to iterate in reverse to get the order we desire
+    for(int i = g_list_length(list) - 1; i >= 0 ; i--)
+    {
+        WebKitWebHistoryItem* gtkitem = (WebKitWebHistoryItem*)g_list_nth_data(list, i);
+        wxWebViewHistoryItem* wxitem = new wxWebViewHistoryItem(
+                                   webkit_web_history_item_get_uri(gtkitem),
+                                   webkit_web_history_item_get_title(gtkitem));
+        wxitem->m_histItem = gtkitem;
+        wxSharedPtr<wxWebViewHistoryItem> item(wxitem);
+        backhist.push_back(item);
+    }
+    return backhist;
+}
+
+wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetForwardHistory()
+{
+    wxVector<wxSharedPtr<wxWebViewHistoryItem> > forwardhist; 
+    WebKitWebBackForwardList* history;
+    history = webkit_web_view_get_back_forward_list(WEBKIT_WEB_VIEW(web_view));
+    GList* list = webkit_web_back_forward_list_get_forward_list_with_limit(history, 
+                                                                           m_historyLimit);
+    for(guint i = 0; i < g_list_length(list); i++)
+    {
+        WebKitWebHistoryItem* gtkitem = (WebKitWebHistoryItem*)g_list_nth_data(list, i);
+        wxWebViewHistoryItem* wxitem = new wxWebViewHistoryItem(
+                                   webkit_web_history_item_get_uri(gtkitem),
+                                   webkit_web_history_item_get_title(gtkitem));
+        wxitem->m_histItem = gtkitem;
+        wxSharedPtr<wxWebViewHistoryItem> item(wxitem);
+        forwardhist.push_back(item);
+    }
+    return forwardhist;
+}
+
+void wxWebViewWebKit::LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item)
+{
+    WebKitWebHistoryItem* gtkitem = item->m_histItem;
+    if(gtkitem)
+    {
+        WebKitWebBackForwardList* history;
+        history = webkit_web_view_get_back_forward_list(WEBKIT_WEB_VIEW(web_view));
+        webkit_web_view_go_to_back_forward_item(WEBKIT_WEB_VIEW(web_view), 
+                                                WEBKIT_WEB_HISTORY_ITEM(gtkitem));
+    }
+}
+
+bool wxWebViewWebKit::CanCut() const
+{
+    return webkit_web_view_can_cut_clipboard(WEBKIT_WEB_VIEW(web_view));
+}
+
+bool wxWebViewWebKit::CanCopy() const
+{
+    return webkit_web_view_can_copy_clipboard(WEBKIT_WEB_VIEW(web_view));
+}
+
+bool wxWebViewWebKit::CanPaste() const
+{
+    return webkit_web_view_can_paste_clipboard(WEBKIT_WEB_VIEW(web_view));
+}
+
+void wxWebViewWebKit::Cut()
+{
+    webkit_web_view_cut_clipboard(WEBKIT_WEB_VIEW(web_view));
+}
+
+void wxWebViewWebKit::Copy()
+{
+    webkit_web_view_copy_clipboard(WEBKIT_WEB_VIEW(web_view));
+}
+
+void wxWebViewWebKit::Paste()
+{
+    webkit_web_view_paste_clipboard(WEBKIT_WEB_VIEW(web_view));
+}
+
+bool wxWebViewWebKit::CanUndo() const
+{
+    return webkit_web_view_can_undo(WEBKIT_WEB_VIEW(web_view));
+}

 
 

-wxString wxWebViewGTKWebKit::GetCurrentURL()
+bool wxWebViewWebKit::CanRedo() const
+{
+    return webkit_web_view_can_redo(WEBKIT_WEB_VIEW(web_view));
+}
+
+void wxWebViewWebKit::Undo()
+{
+    webkit_web_view_undo(WEBKIT_WEB_VIEW(web_view));
+}
+
+void wxWebViewWebKit::Redo()
+{
+    webkit_web_view_redo(WEBKIT_WEB_VIEW(web_view));
+}
+
+wxString wxWebViewWebKit::GetCurrentURL() const

 {
     // FIXME: check which encoding the web kit control uses instead of
     // assuming UTF8 (here and elsewhere too)
 {
     // FIXME: check which encoding the web kit control uses instead of
     // assuming UTF8 (here and elsewhere too)


@@ -394,14 +656,14 @@ wxString wxWebViewGTKWebKit::GetCurrentURL()
 }
 
 
 }
 
 

-wxString wxWebViewGTKWebKit::GetCurrentTitle()
+wxString wxWebViewWebKit::GetCurrentTitle() const

 {
     return wxString::FromUTF8(webkit_web_view_get_title(
                                 WEBKIT_WEB_VIEW(web_view)));
 }
 
 
 {
     return wxString::FromUTF8(webkit_web_view_get_title(
                                 WEBKIT_WEB_VIEW(web_view)));
 }
 
 

-wxString wxWebViewGTKWebKit::GetPageSource()
+wxString wxWebViewWebKit::GetPageSource() const

 {
     WebKitWebFrame* frame = webkit_web_view_get_main_frame(
         WEBKIT_WEB_VIEW(web_view));
 {
     WebKitWebFrame* frame = webkit_web_view_get_main_frame(
         WEBKIT_WEB_VIEW(web_view));


@@ -414,7 +676,7 @@ wxString wxWebViewGTKWebKit::GetPageSource()
 }
 
 
 }
 
 

-wxWebViewZoom wxWebViewGTKWebKit::GetZoom()
+wxWebViewZoom wxWebViewWebKit::GetZoom() const

 {
     float zoom = GetWebkitZoom();
 
 {
     float zoom = GetWebkitZoom();
 


@@ -446,7 +708,7 @@ wxWebViewZoom wxWebViewGTKWebKit::GetZoom()
 }
 
 
 }
 
 

-void wxWebViewGTKWebKit::SetZoom(wxWebViewZoom zoom)
+void wxWebViewWebKit::SetZoom(wxWebViewZoom zoom)

 {
     // arbitrary way to map our common zoom enum to float zoom
     switch (zoom)
 {
     // arbitrary way to map our common zoom enum to float zoom
     switch (zoom)


@@ -476,14 +738,14 @@ void wxWebViewGTKWebKit::SetZoom(wxWebViewZoom zoom)
     }
 }
 
     }
 }
 

-void wxWebViewGTKWebKit::SetZoomType(wxWebViewZoomType type)
+void wxWebViewWebKit::SetZoomType(wxWebViewZoomType type)

 {
     webkit_web_view_set_full_content_zoom(WEBKIT_WEB_VIEW(web_view),
                                           (type == wxWEB_VIEW_ZOOM_TYPE_LAYOUT ?
                                           TRUE : FALSE));
 }
 
 {
     webkit_web_view_set_full_content_zoom(WEBKIT_WEB_VIEW(web_view),
                                           (type == wxWEB_VIEW_ZOOM_TYPE_LAYOUT ?
                                           TRUE : FALSE));
 }
 

-wxWebViewZoomType wxWebViewGTKWebKit::GetZoomType() const
+wxWebViewZoomType wxWebViewWebKit::GetZoomType() const

 {
     gboolean fczoom = webkit_web_view_get_full_content_zoom(
             WEBKIT_WEB_VIEW(web_view));
 {
     gboolean fczoom = webkit_web_view_get_full_content_zoom(
             WEBKIT_WEB_VIEW(web_view));


@@ -492,13 +754,13 @@ wxWebViewZoomType wxWebViewGTKWebKit::GetZoomType() const
     else        return wxWEB_VIEW_ZOOM_TYPE_TEXT;
 }
 
     else        return wxWEB_VIEW_ZOOM_TYPE_TEXT;
 }
 

-bool wxWebViewGTKWebKit::CanSetZoomType(wxWebViewZoomType) const
+bool wxWebViewWebKit::CanSetZoomType(wxWebViewZoomType) const

 {
     // this port supports all zoom types
     return true;
 }
 
 {
     // this port supports all zoom types
     return true;
 }
 

-void wxWebViewGTKWebKit::SetPage(const wxString& html, const wxString& baseUri)
+void wxWebViewWebKit::SetPage(const wxString& html, const wxString& baseUri)

 {
     webkit_web_view_load_string (WEBKIT_WEB_VIEW(web_view),
                                  html.mb_str(wxConvUTF8),
 {
     webkit_web_view_load_string (WEBKIT_WEB_VIEW(web_view),
                                  html.mb_str(wxConvUTF8),


@@ -507,7 +769,7 @@ void wxWebViewGTKWebKit::SetPage(const wxString& html, const wxString& baseUri)
                                  baseUri.mb_str(wxConvUTF8));
 }
 
                                  baseUri.mb_str(wxConvUTF8));
 }
 

-void wxWebViewGTKWebKit::Print()
+void wxWebViewWebKit::Print()

 {
     WebKitWebFrame* frame = webkit_web_view_get_main_frame(
             WEBKIT_WEB_VIEW(web_view));
 {
     WebKitWebFrame* frame = webkit_web_view_get_main_frame(
             WEBKIT_WEB_VIEW(web_view));


@@ -522,7 +784,7 @@ void wxWebViewGTKWebKit::Print()
 }
 
 
 }
 
 

-bool wxWebViewGTKWebKit::IsBusy()
+bool wxWebViewWebKit::IsBusy() const

 {
     return m_busy;
 
 {
     return m_busy;
 


@@ -548,9 +810,110 @@ bool wxWebViewGTKWebKit::IsBusy()
      */
 }
 
      */
 }
 

+void wxWebViewWebKit::SetEditable(bool enable)
+{
+    webkit_web_view_set_editable(WEBKIT_WEB_VIEW(web_view), enable);
+}
+
+bool wxWebViewWebKit::IsEditable() const
+{
+    return webkit_web_view_get_editable(WEBKIT_WEB_VIEW(web_view));
+}
+
+void wxWebViewWebKit::DeleteSelection()
+{
+    webkit_web_view_delete_selection(WEBKIT_WEB_VIEW(web_view));
+}
+
+bool wxWebViewWebKit::HasSelection() const
+{
+    return webkit_web_view_has_selection(WEBKIT_WEB_VIEW(web_view));
+}
+
+void wxWebViewWebKit::SelectAll()
+{
+    webkit_web_view_select_all(WEBKIT_WEB_VIEW(web_view));
+}
+
+wxString wxWebViewWebKit::GetSelectedText() const
+{
+    WebKitDOMDocument* doc; 
+    WebKitDOMDOMWindow* win;
+    WebKitDOMDOMSelection* sel;
+    WebKitDOMRange* range;
+
+    doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(web_view));
+    win = webkit_dom_document_get_default_view(WEBKIT_DOM_DOCUMENT(doc));
+    sel = webkit_dom_dom_window_get_selection(WEBKIT_DOM_DOM_WINDOW(win));
+    range = webkit_dom_dom_selection_get_range_at(WEBKIT_DOM_DOM_SELECTION(sel), 
+                                                  0, NULL);
+    return wxString(webkit_dom_range_get_text(WEBKIT_DOM_RANGE(range)), 
+                    wxConvUTF8);
+}
+
+wxString wxWebViewWebKit::GetSelectedSource() const
+{
+    WebKitDOMDocument* doc; 
+    WebKitDOMDOMWindow* win;
+    WebKitDOMDOMSelection* sel;
+    WebKitDOMRange* range;
+    WebKitDOMElement* div;
+    WebKitDOMDocumentFragment* clone;
+    WebKitDOMHTMLElement* html;
+
+    doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(web_view));
+    win = webkit_dom_document_get_default_view(WEBKIT_DOM_DOCUMENT(doc));
+    sel = webkit_dom_dom_window_get_selection(WEBKIT_DOM_DOM_WINDOW(win));
+    range = webkit_dom_dom_selection_get_range_at(WEBKIT_DOM_DOM_SELECTION(sel), 
+                                                  0, NULL);
+    div = webkit_dom_document_create_element(WEBKIT_DOM_DOCUMENT(doc), "div", NULL);
+
+    clone = webkit_dom_range_clone_contents(WEBKIT_DOM_RANGE(range), NULL);
+    webkit_dom_node_append_child(&div->parent_instance, &clone->parent_instance, NULL);
+    html = (WebKitDOMHTMLElement*)div;
+
+    return wxString(webkit_dom_html_element_get_inner_html(WEBKIT_DOM_HTML_ELEMENT(html)), 
+                    wxConvUTF8);
+}
+
+void wxWebViewWebKit::ClearSelection()
+{
+    WebKitDOMDocument* doc; 
+    WebKitDOMDOMWindow* win;
+    WebKitDOMDOMSelection* sel;
+
+    doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(web_view));
+    win = webkit_dom_document_get_default_view(WEBKIT_DOM_DOCUMENT(doc));
+    sel = webkit_dom_dom_window_get_selection(WEBKIT_DOM_DOM_WINDOW(win));
+    webkit_dom_dom_selection_remove_all_ranges(WEBKIT_DOM_DOM_SELECTION(sel));
+
+}
+
+wxString wxWebViewWebKit::GetPageText() const
+{
+    WebKitDOMDocument* doc; 
+    WebKitDOMHTMLElement* body;
+
+    doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(web_view));
+    body = webkit_dom_document_get_body(WEBKIT_DOM_DOCUMENT(doc));
+    return wxString(webkit_dom_html_element_get_inner_text(WEBKIT_DOM_HTML_ELEMENT(body)), 
+                    wxConvUTF8);
+}
+
+void wxWebViewWebKit::RunScript(const wxString& javascript)
+{
+    webkit_web_view_execute_script(WEBKIT_WEB_VIEW(web_view), 
+                                   javascript.mb_str(wxConvUTF8));
+}
+
+void wxWebViewWebKit::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler)
+{
+    m_handlerList.push_back(handler);
+}
+

 // static
 wxVisualAttributes
 // static
 wxVisualAttributes

-wxWebViewGTKWebKit::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+wxWebViewWebKit::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))

 {
      return GetDefaultAttributesFromGTKWidget(webkit_web_view_new);
 }
 {
      return GetDefaultAttributesFromGTKWidget(webkit_web_view_new);
 }