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 36b3eace967f62556ddf3711a55b38df38d3a08b..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"
 
 // ----------------------------------------------------------------------------


@@ -42,48 +44,57 @@ wxgtk_webview_webkit_load_status(GtkWidget* widget,
     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 gboolean
     }
 }
 
 static gboolean

-wxgtk_webview_webkit_navigation(WebKitWebView*,
+wxgtk_webview_webkit_navigation(WebKitWebView *,

                                 WebKitWebFrame *frame,
                                 WebKitNetworkRequest *request,
                                 WebKitWebFrame *frame,
                                 WebKitNetworkRequest *request,

-                                WebKitWebNavigationAction*,
+                                WebKitWebNavigationAction *,

                                 WebKitWebPolicyDecision *policy_decision,
                                 wxWebViewWebKit *webKitCtrl)
 {
                                 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;
         webkit_web_policy_decision_ignore(policy_decision);
     {
         webKitCtrl->m_busy = false;
         webkit_web_policy_decision_ignore(policy_decision);


@@ -91,6 +102,32 @@ wxgtk_webview_webkit_navigation(WebKitWebView*,
     }
     else
     {
     }
     else
     {

+        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;
     }
 }
         return FALSE;
     }
 }


@@ -103,7 +140,7 @@ wxgtk_webview_webkit_error(WebKitWebView*,
                            wxWebViewWebKit* webKitWindow)
 {
     webKitWindow->m_busy = false;
                            wxWebViewWebKit* webKitWindow)
 {
     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);


@@ -222,17 +259,15 @@ wxgtk_webview_webkit_error(WebKitWebView*,
     }
     */
 
     }
     */
 

-    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;


@@ -249,24 +284,83 @@ wxgtk_webview_webkit_new_window(WebKitWebView*,
     const gchar* uri = webkit_network_request_get_uri(request);
 
     wxString target = webkit_web_frame_get_name (frame);
     const gchar* uri = webkit_network_request_get_uri(request);
 
     wxString target = webkit_web_frame_get_name (frame);

-    wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_NEWWINDOW,
-                                   webKitCtrl->GetId(),
-                                   wxString( uri, wxConvUTF8 ),
-                                   target,
-                                   true);
+    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())
 
     if (webKitCtrl && webKitCtrl->GetEventHandler())

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

 
 

-    if (thisEvent.IsVetoed())
+}
+
+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)

     {
     {

-        webkit_web_policy_decision_ignore(policy_decision);
+        if(uri.substr(0, (*it)->GetName().length()) == (*it)->GetName())
+        {
+            handler = (*it);
+        }

     }
     }

-    else
+    //If we found a handler we can then use it to load the file directly 
+    //ourselves
+    if(handler)

     {
     {

-        webkit_web_policy_decision_use(policy_decision);
+        //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);
+        }
+        

     }
     }

-    return TRUE;

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


@@ -275,7 +369,7 @@ wxgtk_webview_webkit_new_window(WebKitWebView*,
 // wxWebViewWebKit
 //-----------------------------------------------------------------------------
 
 // wxWebViewWebKit
 //-----------------------------------------------------------------------------
 

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

 
 bool wxWebViewWebKit::Create(wxWindow *parent,
                       wxWindowID id,
 
 bool wxWebViewWebKit::Create(wxWindow *parent,
                       wxWindowID id,


@@ -287,6 +381,7 @@ bool wxWebViewWebKit::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 ))


@@ -320,6 +415,12 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
     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, "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 );
 
     PostCreation(size);
     m_parent->DoAddChild( this );
 
     PostCreation(size);


@@ -372,7 +473,7 @@ 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 wxWebViewWebKit::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));
 }


@@ -394,7 +495,7 @@ void wxWebViewWebKit::Reload(wxWebViewReloadFlags flags)
     }
 }
 
     }
 }
 

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

 {
     webkit_web_view_load_uri(WEBKIT_WEB_VIEW(web_view), wxGTK_CONV(url));
 }
 {
     webkit_web_view_load_uri(WEBKIT_WEB_VIEW(web_view), wxGTK_CONV(url));
 }


@@ -411,13 +512,13 @@ void wxWebViewWebKit::GoForward()
 }
 
 
 }
 
 

-bool wxWebViewWebKit::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 wxWebViewWebKit::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));
 }


@@ -443,9 +544,9 @@ void wxWebViewWebKit::EnableHistory(bool enable)
     }
 }
 
     }
 }
 

-wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewWebKit::GetBackwardHistory()
+wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetBackwardHistory()

 {
 {

-    wxVector<wxSharedPtr<wxWebHistoryItem> > backhist; 
+    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, 
     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, 


@@ -454,18 +555,19 @@ wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewWebKit::GetBackwardHistory()
     for(int i = g_list_length(list) - 1; i >= 0 ; i--)
     {
         WebKitWebHistoryItem* gtkitem = (WebKitWebHistoryItem*)g_list_nth_data(list, i);
     for(int i = g_list_length(list) - 1; i >= 0 ; i--)
     {
         WebKitWebHistoryItem* gtkitem = (WebKitWebHistoryItem*)g_list_nth_data(list, i);

-        wxSharedPtr<wxWebHistoryItem> item(new wxWebHistoryItem(
-                                           webkit_web_history_item_get_uri(gtkitem),
-                                           webkit_web_history_item_get_title(gtkitem)));
+        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);
         backhist.push_back(item);

-        m_historyMap[item] = gtkitem;

     }
     return backhist;
 }
 
     }
     return backhist;
 }
 

-wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewWebKit::GetForwardHistory()
+wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetForwardHistory()

 {
 {

-    wxVector<wxSharedPtr<wxWebHistoryItem> > forwardhist; 
+    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, 
     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, 


@@ -473,37 +575,39 @@ wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewWebKit::GetForwardHistory()
     for(guint i = 0; i < g_list_length(list); i++)
     {
         WebKitWebHistoryItem* gtkitem = (WebKitWebHistoryItem*)g_list_nth_data(list, i);
     for(guint i = 0; i < g_list_length(list); i++)
     {
         WebKitWebHistoryItem* gtkitem = (WebKitWebHistoryItem*)g_list_nth_data(list, i);

-        wxSharedPtr<wxWebHistoryItem> item(new wxWebHistoryItem(
-                                           webkit_web_history_item_get_uri(gtkitem),
-                                           webkit_web_history_item_get_title(gtkitem)));
+        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);
         forwardhist.push_back(item);

-        m_historyMap[item] = gtkitem;

     }
     return forwardhist;
 }
 
     }
     return forwardhist;
 }
 

-void wxWebViewWebKit::LoadHistoryItem(wxSharedPtr<wxWebHistoryItem> item)
+void wxWebViewWebKit::LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item)

 {
 {

-    WebKitWebHistoryItem* gtkitem = m_historyMap[item];
+    WebKitWebHistoryItem* gtkitem = item->m_histItem;

     if(gtkitem)
     {
         WebKitWebBackForwardList* history;
         history = webkit_web_view_get_back_forward_list(WEBKIT_WEB_VIEW(web_view));
     if(gtkitem)
     {
         WebKitWebBackForwardList* history;
         history = webkit_web_view_get_back_forward_list(WEBKIT_WEB_VIEW(web_view));

-        webkit_web_back_forward_list_go_to_item(history, gtkitem);
+        webkit_web_view_go_to_back_forward_item(WEBKIT_WEB_VIEW(web_view), 
+                                                WEBKIT_WEB_HISTORY_ITEM(gtkitem));

     }
 }
 
     }
 }
 

-bool wxWebViewWebKit::CanCut()
+bool wxWebViewWebKit::CanCut() const

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

-bool wxWebViewWebKit::CanCopy()
+bool wxWebViewWebKit::CanCopy() const

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

-bool wxWebViewWebKit::CanPaste()
+bool wxWebViewWebKit::CanPaste() const

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


@@ -523,12 +627,12 @@ void wxWebViewWebKit::Paste()
     webkit_web_view_paste_clipboard(WEBKIT_WEB_VIEW(web_view));
 }
 
     webkit_web_view_paste_clipboard(WEBKIT_WEB_VIEW(web_view));
 }
 

-bool wxWebViewWebKit::CanUndo()
+bool wxWebViewWebKit::CanUndo() const

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

-bool wxWebViewWebKit::CanRedo()
+bool wxWebViewWebKit::CanRedo() const

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


@@ -543,7 +647,7 @@ void wxWebViewWebKit::Redo()
     webkit_web_view_redo(WEBKIT_WEB_VIEW(web_view));
 }
 
     webkit_web_view_redo(WEBKIT_WEB_VIEW(web_view));
 }
 

-wxString wxWebViewWebKit::GetCurrentURL()
+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)


@@ -552,14 +656,14 @@ wxString wxWebViewWebKit::GetCurrentURL()
 }
 
 
 }
 
 

-wxString wxWebViewWebKit::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 wxWebViewWebKit::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));


@@ -572,7 +676,7 @@ wxString wxWebViewWebKit::GetPageSource()
 }
 
 
 }
 
 

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

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


@@ -680,7 +784,7 @@ void wxWebViewWebKit::Print()
 }
 
 
 }
 
 

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

 {
     return m_busy;
 
 {
     return m_busy;
 


@@ -711,7 +815,7 @@ void wxWebViewWebKit::SetEditable(bool enable)
     webkit_web_view_set_editable(WEBKIT_WEB_VIEW(web_view), enable);
 }
 
     webkit_web_view_set_editable(WEBKIT_WEB_VIEW(web_view), enable);
 }
 

-bool wxWebViewWebKit::IsEditable()
+bool wxWebViewWebKit::IsEditable() const

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


@@ -721,7 +825,7 @@ void wxWebViewWebKit::DeleteSelection()
     webkit_web_view_delete_selection(WEBKIT_WEB_VIEW(web_view));
 }
 
     webkit_web_view_delete_selection(WEBKIT_WEB_VIEW(web_view));
 }
 

-bool wxWebViewWebKit::HasSelection()
+bool wxWebViewWebKit::HasSelection() const

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


@@ -731,7 +835,7 @@ void wxWebViewWebKit::SelectAll()
     webkit_web_view_select_all(WEBKIT_WEB_VIEW(web_view));
 }
 
     webkit_web_view_select_all(WEBKIT_WEB_VIEW(web_view));
 }
 

-wxString wxWebViewWebKit::GetSelectedText()
+wxString wxWebViewWebKit::GetSelectedText() const

 {
     WebKitDOMDocument* doc; 
     WebKitDOMDOMWindow* win;
 {
     WebKitDOMDocument* doc; 
     WebKitDOMDOMWindow* win;


@@ -747,7 +851,7 @@ wxString wxWebViewWebKit::GetSelectedText()
                     wxConvUTF8);
 }
 
                     wxConvUTF8);
 }
 

-wxString wxWebViewWebKit::GetSelectedSource()
+wxString wxWebViewWebKit::GetSelectedSource() const

 {
     WebKitDOMDocument* doc; 
     WebKitDOMDOMWindow* win;
 {
     WebKitDOMDocument* doc; 
     WebKitDOMDOMWindow* win;


@@ -785,7 +889,7 @@ void wxWebViewWebKit::ClearSelection()
 
 }
 
 
 }
 

-wxString wxWebViewWebKit::GetPageText()
+wxString wxWebViewWebKit::GetPageText() const

 {
     WebKitDOMDocument* doc; 
     WebKitDOMHTMLElement* body;
 {
     WebKitDOMDocument* doc; 
     WebKitDOMHTMLElement* body;


@@ -802,6 +906,11 @@ void wxWebViewWebKit::RunScript(const wxString& javascript)
                                    javascript.mb_str(wxConvUTF8));
 }
 
                                    javascript.mb_str(wxConvUTF8));
 }
 

+void wxWebViewWebKit::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler)
+{
+    m_handlerList.push_back(handler);
+}
+

 // static
 wxVisualAttributes
 wxWebViewWebKit::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 // static
 wxVisualAttributes
 wxWebViewWebKit::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))