Add doc for wxGraphicsContext.Create(), which is a lightweight context with no target...

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

diff --git a/src/gtk/webview_webkit.cpp b/src/gtk/webview_webkit.cpp
index 60d04e3c3e8d69f553aca2996dd52f7f1fe714ff..3331a7402643ad5c8fffb94290ef0d72fadc4031 100644 (file)
--- a/src/gtk/webview_webkit.cpp
+++ b/src/gtk/webview_webkit.cpp
@@ -18,6 +18,7 @@
 #include "wx/gtk/private.h"
 #include "wx/filesys.h"
 #include "wx/base64.h"
 #include "wx/gtk/private.h"
 #include "wx/filesys.h"
 #include "wx/base64.h"

+#include "wx/log.h"

 #include <webkit/webkit.h>
 
 // ----------------------------------------------------------------------------
 #include <webkit/webkit.h>
 
 // ----------------------------------------------------------------------------


@@ -28,12 +29,10 @@ extern "C"
 {
 
 static void
 {
 
 static void

-wxgtk_webview_webkit_load_status(GtkWidget* widget, 
+wxgtk_webview_webkit_load_status(GtkWidget* widget,

                                  GParamSpec*,
                                  wxWebViewWebKit *webKitCtrl)
 {
                                  GParamSpec*,
                                  wxWebViewWebKit *webKitCtrl)
 {

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

     wxString url = webKitCtrl->GetCurrentURL();
 
     WebKitLoadStatus status;
     wxString url = webKitCtrl->GetCurrentURL();
 
     WebKitLoadStatus status;


@@ -60,7 +59,7 @@ wxgtk_webview_webkit_load_status(GtkWidget* widget,
         }
 
         webKitCtrl->m_busy = false;
         }
 
         webKitCtrl->m_busy = false;

-        wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_LOADED,
+        wxWebViewEvent event(wxEVT_WEBVIEW_LOADED,

                              webKitCtrl->GetId(),
                              url, target);
 
                              webKitCtrl->GetId(),
                              url, target);
 


@@ -70,7 +69,7 @@ wxgtk_webview_webkit_load_status(GtkWidget* widget,
     else if (status ==  WEBKIT_LOAD_COMMITTED)
     {
         webKitCtrl->m_busy = true;
     else if (status ==  WEBKIT_LOAD_COMMITTED)
     {
         webKitCtrl->m_busy = true;

-        wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
+        wxWebViewEvent event(wxEVT_WEBVIEW_NAVIGATED,

                              webKitCtrl->GetId(),
                              url, target);
 
                              webKitCtrl->GetId(),
                              url, target);
 


@@ -90,7 +89,7 @@ wxgtk_webview_webkit_navigation(WebKitWebView *,
     if(webKitCtrl->m_guard)
     {
         webKitCtrl->m_guard = false;
     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 
+        //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);
         //the resource request callback
         webKitCtrl->m_vfsurl = webkit_network_request_get_uri(request);
         webkit_web_policy_decision_use(policy_decision);


@@ -102,7 +101,7 @@ wxgtk_webview_webkit_navigation(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);

-    wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATING,
+    wxWebViewEvent event(wxEVT_WEBVIEW_NAVIGATING,

                          webKitCtrl->GetId(),
                          wxString( uri, wxConvUTF8 ),
                          target);
                          webKitCtrl->GetId(),
                          wxString( uri, wxConvUTF8 ),
                          target);


@@ -130,7 +129,7 @@ wxgtk_webview_webkit_navigation(WebKitWebView *,
                 handler = (*it);
             }
         }
                 handler = (*it);
             }
         }

-        //If we found a handler we can then use it to load the file directly 
+        //If we found a handler we can then use it to load the file directly

         //ourselves
         if(handler)
         {
         //ourselves
         if(handler)
         {


@@ -156,7 +155,7 @@ wxgtk_webview_webkit_error(WebKitWebView*,
                            wxWebViewWebKit* webKitWindow)
 {
     webKitWindow->m_busy = false;
                            wxWebViewWebKit* webKitWindow)
 {
     webKitWindow->m_busy = false;

-    wxWebViewNavigationError type = wxWEB_NAV_ERR_OTHER;
+    wxWebViewNavigationError type = wxWEBVIEW_NAV_ERR_OTHER;

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


@@ -166,12 +165,12 @@ wxgtk_webview_webkit_error(WebKitWebView*,
         switch (error->code)
         {
             case SOUP_STATUS_CANCELLED:
         switch (error->code)
         {
             case SOUP_STATUS_CANCELLED:

-                type = wxWEB_NAV_ERR_USER_CANCELLED;
+                type = wxWEBVIEW_NAV_ERR_USER_CANCELLED;

                 break;
 
             case SOUP_STATUS_CANT_RESOLVE:
             case SOUP_STATUS_NOT_FOUND:
                 break;
 
             case SOUP_STATUS_CANT_RESOLVE:
             case SOUP_STATUS_NOT_FOUND:

-                type = wxWEB_NAV_ERR_NOT_FOUND;
+                type = wxWEBVIEW_NAV_ERR_NOT_FOUND;

                 break;
 
             case SOUP_STATUS_CANT_RESOLVE_PROXY:
                 break;
 
             case SOUP_STATUS_CANT_RESOLVE_PROXY:


@@ -179,54 +178,54 @@ wxgtk_webview_webkit_error(WebKitWebView*,
             case SOUP_STATUS_CANT_CONNECT_PROXY:
             case SOUP_STATUS_SSL_FAILED:
             case SOUP_STATUS_IO_ERROR:
             case SOUP_STATUS_CANT_CONNECT_PROXY:
             case SOUP_STATUS_SSL_FAILED:
             case SOUP_STATUS_IO_ERROR:

-                type = wxWEB_NAV_ERR_CONNECTION;
+                type = wxWEBVIEW_NAV_ERR_CONNECTION;

                 break;
 
             case SOUP_STATUS_MALFORMED:
             //case SOUP_STATUS_TOO_MANY_REDIRECTS:
                 break;
 
             case SOUP_STATUS_MALFORMED:
             //case SOUP_STATUS_TOO_MANY_REDIRECTS:

-                type = wxWEB_NAV_ERR_REQUEST;
+                type = wxWEBVIEW_NAV_ERR_REQUEST;

                 break;
 
             //case SOUP_STATUS_NO_CONTENT:
             //case SOUP_STATUS_RESET_CONTENT:
 
             case SOUP_STATUS_BAD_REQUEST:
                 break;
 
             //case SOUP_STATUS_NO_CONTENT:
             //case SOUP_STATUS_RESET_CONTENT:
 
             case SOUP_STATUS_BAD_REQUEST:

-                type = wxWEB_NAV_ERR_REQUEST;
+                type = wxWEBVIEW_NAV_ERR_REQUEST;

                 break;
 
             case SOUP_STATUS_UNAUTHORIZED:
             case SOUP_STATUS_FORBIDDEN:
                 break;
 
             case SOUP_STATUS_UNAUTHORIZED:
             case SOUP_STATUS_FORBIDDEN:

-                type = wxWEB_NAV_ERR_AUTH;
+                type = wxWEBVIEW_NAV_ERR_AUTH;

                 break;
 
             case SOUP_STATUS_METHOD_NOT_ALLOWED:
             case SOUP_STATUS_NOT_ACCEPTABLE:
                 break;
 
             case SOUP_STATUS_METHOD_NOT_ALLOWED:
             case SOUP_STATUS_NOT_ACCEPTABLE:

-                type = wxWEB_NAV_ERR_SECURITY;
+                type = wxWEBVIEW_NAV_ERR_SECURITY;

                 break;
 
             case SOUP_STATUS_PROXY_AUTHENTICATION_REQUIRED:
                 break;
 
             case SOUP_STATUS_PROXY_AUTHENTICATION_REQUIRED:

-                type = wxWEB_NAV_ERR_AUTH;
+                type = wxWEBVIEW_NAV_ERR_AUTH;

                 break;
 
             case SOUP_STATUS_REQUEST_TIMEOUT:
                 break;
 
             case SOUP_STATUS_REQUEST_TIMEOUT:

-                type = wxWEB_NAV_ERR_CONNECTION;
+                type = wxWEBVIEW_NAV_ERR_CONNECTION;

                 break;
 
             //case SOUP_STATUS_PAYMENT_REQUIRED:
             case SOUP_STATUS_REQUEST_ENTITY_TOO_LARGE:
             case SOUP_STATUS_REQUEST_URI_TOO_LONG:
             case SOUP_STATUS_UNSUPPORTED_MEDIA_TYPE:
                 break;
 
             //case SOUP_STATUS_PAYMENT_REQUIRED:
             case SOUP_STATUS_REQUEST_ENTITY_TOO_LARGE:
             case SOUP_STATUS_REQUEST_URI_TOO_LONG:
             case SOUP_STATUS_UNSUPPORTED_MEDIA_TYPE:

-                type = wxWEB_NAV_ERR_REQUEST;
+                type = wxWEBVIEW_NAV_ERR_REQUEST;

                 break;
 
             case SOUP_STATUS_BAD_GATEWAY:
             case SOUP_STATUS_SERVICE_UNAVAILABLE:
             case SOUP_STATUS_GATEWAY_TIMEOUT:
                 break;
 
             case SOUP_STATUS_BAD_GATEWAY:
             case SOUP_STATUS_SERVICE_UNAVAILABLE:
             case SOUP_STATUS_GATEWAY_TIMEOUT:

-                type = wxWEB_NAV_ERR_CONNECTION;
+                type = wxWEBVIEW_NAV_ERR_CONNECTION;

                 break;
 
             case SOUP_STATUS_HTTP_VERSION_NOT_SUPPORTED:
                 break;
 
             case SOUP_STATUS_HTTP_VERSION_NOT_SUPPORTED:

-                type = wxWEB_NAV_ERR_REQUEST;
+                type = wxWEBVIEW_NAV_ERR_REQUEST;

                 break;
             //case SOUP_STATUS_INSUFFICIENT_STORAGE:
             //case SOUP_STATUS_NOT_EXTENDED:
                 break;
             //case SOUP_STATUS_INSUFFICIENT_STORAGE:
             //case SOUP_STATUS_NOT_EXTENDED:


@@ -241,15 +240,15 @@ wxgtk_webview_webkit_error(WebKitWebView*,
             //WEBKIT_NETWORK_ERROR_TRANSPORT:
 
             case WEBKIT_NETWORK_ERROR_UNKNOWN_PROTOCOL:
             //WEBKIT_NETWORK_ERROR_TRANSPORT:
 
             case WEBKIT_NETWORK_ERROR_UNKNOWN_PROTOCOL:

-                type = wxWEB_NAV_ERR_REQUEST;
+                type = wxWEBVIEW_NAV_ERR_REQUEST;

                 break;
 
             case WEBKIT_NETWORK_ERROR_CANCELLED:
                 break;
 
             case WEBKIT_NETWORK_ERROR_CANCELLED:

-                type = wxWEB_NAV_ERR_USER_CANCELLED;
+                type = wxWEBVIEW_NAV_ERR_USER_CANCELLED;

                 break;
 
             case WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST:
                 break;
 
             case WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST:

-                type = wxWEB_NAV_ERR_NOT_FOUND;
+                type = wxWEBVIEW_NAV_ERR_NOT_FOUND;

                 break;
         }
     }
                 break;
         }
     }


@@ -263,7 +262,7 @@ wxgtk_webview_webkit_error(WebKitWebView*,
             //case WEBKIT_POLICY_ERROR_CANNOT_SHOW_URL:
             //case WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE:
             case WEBKIT_POLICY_ERROR_CANNOT_USE_RESTRICTED_PORT:
             //case WEBKIT_POLICY_ERROR_CANNOT_SHOW_URL:
             //case WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE:
             case WEBKIT_POLICY_ERROR_CANNOT_USE_RESTRICTED_PORT:

-                type = wxWEB_NAV_ERR_SECURITY;
+                type = wxWEBVIEW_NAV_ERR_SECURITY;

                 break;
         }
     }
                 break;
         }
     }


@@ -275,7 +274,7 @@ wxgtk_webview_webkit_error(WebKitWebView*,
     }
     */
 
     }
     */
 

-    wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_ERROR,
+    wxWebViewEvent event(wxEVT_WEBVIEW_ERROR,

                          webKitWindow->GetId(),
                          uri, "");
     event.SetString(description);
                          webKitWindow->GetId(),
                          uri, "");
     event.SetString(description);


@@ -300,7 +299,7 @@ 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);

-    wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NEWWINDOW,
+    wxWebViewEvent event(wxEVT_WEBVIEW_NEWWINDOW,

                                        webKitCtrl->GetId(),
                                        wxString( uri, wxConvUTF8 ),
                                        target);
                                        webKitCtrl->GetId(),
                                        wxString( uri, wxConvUTF8 ),
                                        target);


@@ -319,7 +318,7 @@ wxgtk_webview_webkit_title_changed(WebKitWebView*,
                                    gchar *title,
                                    wxWebViewWebKit *webKitCtrl)
 {
                                    gchar *title,
                                    wxWebViewWebKit *webKitCtrl)
 {

-    wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED,
+    wxWebViewEvent event(wxEVT_WEBVIEW_TITLE_CHANGED,

                          webKitCtrl->GetId(),
                          webKitCtrl->GetCurrentURL(),
                          "");
                          webKitCtrl->GetId(),
                          webKitCtrl->GetCurrentURL(),
                          "");


@@ -339,10 +338,10 @@ wxgtk_webview_webkit_resource_req(WebKitWebView *,
                                   wxWebViewWebKit *webKitCtrl)
 {
     wxString uri = webkit_network_request_get_uri(request);
                                   wxWebViewWebKit *webKitCtrl)
 {
     wxString uri = webkit_network_request_get_uri(request);

-    
+

     wxSharedPtr<wxWebViewHandler> handler;
     wxVector<wxSharedPtr<wxWebViewHandler> > hanlders = webKitCtrl->GetHandlers();
     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)
     //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)


@@ -352,7 +351,7 @@ wxgtk_webview_webkit_resource_req(WebKitWebView *,
             handler = (*it);
         }
     }
             handler = (*it);
         }
     }

-    //If we found a handler we can then use it to load the file directly 
+    //If we found a handler we can then use it to load the file directly

     //ourselves
     if(handler)
     {
     //ourselves
     if(handler)
     {


@@ -375,10 +374,27 @@ wxgtk_webview_webkit_resource_req(WebKitWebView *,
             //Then we can redirect the call
             webkit_network_request_set_uri(request, path.utf8_str());
         }
             //Then we can redirect the call
             webkit_network_request_set_uri(request, path.utf8_str());
         }

-        
+

     }
 }
 
     }
 }
 

+#if WEBKIT_CHECK_VERSION(1, 10, 0)
+
+static gboolean
+wxgtk_webview_webkit_context_menu(WebKitWebView *,
+                                  GtkWidget *,
+                                  WebKitHitTestResult *,
+                                  gboolean,
+                                  wxWebViewWebKit *webKitCtrl)
+{
+    if(webKitCtrl->IsContextMenuEnabled())
+        return FALSE;
+    else
+        return TRUE;
+}
+
+#endif
+

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


@@ -387,6 +403,11 @@ wxgtk_webview_webkit_resource_req(WebKitWebView *,
 
 wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewWebKit, wxWebView);
 
 
 wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewWebKit, wxWebView);
 

+wxWebViewWebKit::wxWebViewWebKit()
+{
+    m_web_view = NULL;
+}
+

 bool wxWebViewWebKit::Create(wxWindow *parent,
                       wxWindowID id,
                       const wxString &url,
 bool wxWebViewWebKit::Create(wxWindow *parent,
                       wxWindowID id,
                       const wxString &url,


@@ -395,9 +416,13 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
                       long style,
                       const wxString& name)
 {
                       long style,
                       const wxString& name)
 {

-    m_ready = false;

     m_busy = false;
     m_guard = false;
     m_busy = false;
     m_guard = false;

+    FindClear();
+
+    // We currently unconditionally impose scrolling in both directions as it's
+    // necessary to show arbitrary pages.
+    style |= wxHSCROLL | wxVSCROLL;

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


@@ -406,21 +431,14 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
         return false;
     }
 
         return false;
     }
 

-    m_widget = gtk_scrolled_window_new(NULL, NULL);
-    g_object_ref(m_widget);

     m_web_view = WEBKIT_WEB_VIEW(webkit_web_view_new());
     m_web_view = WEBKIT_WEB_VIEW(webkit_web_view_new());

+    GTKCreateScrolledWindowWith(GTK_WIDGET(m_web_view));
+    g_object_ref(m_widget);

 
 

-    /* Place the WebKitWebView in the GtkScrolledWindow */
-    gtk_container_add(GTK_CONTAINER(m_widget), GTK_WIDGET(m_web_view));
-    gtk_widget_show(GTK_WIDGET(m_web_view));
-
-    g_signal_connect_after(m_web_view, "notify::load-status",
-                           G_CALLBACK(wxgtk_webview_webkit_load_status),
-                           this);

     g_signal_connect_after(m_web_view, "navigation-policy-decision-requested",
                            G_CALLBACK(wxgtk_webview_webkit_navigation),
                            this);
     g_signal_connect_after(m_web_view, "navigation-policy-decision-requested",
                            G_CALLBACK(wxgtk_webview_webkit_navigation),
                            this);

-    g_signal_connect_after(m_web_view, "load-error", 
+    g_signal_connect_after(m_web_view, "load-error",

                            G_CALLBACK(wxgtk_webview_webkit_error),
                            this);
 
                            G_CALLBACK(wxgtk_webview_webkit_error),
                            this);
 


@@ -432,6 +450,11 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
 
     g_signal_connect_after(m_web_view, "resource-request-starting",
                            G_CALLBACK(wxgtk_webview_webkit_resource_req), this);
 
     g_signal_connect_after(m_web_view, "resource-request-starting",
                            G_CALLBACK(wxgtk_webview_webkit_resource_req), this);

+      
+#if WEBKIT_CHECK_VERSION(1, 10, 0)    
+     g_signal_connect_after(m_web_view, "context-menu",
+                           G_CALLBACK(wxgtk_webview_webkit_context_menu), this);
+#endif

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


@@ -445,17 +468,26 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
     history = webkit_web_view_get_back_forward_list(m_web_view);
     m_historyLimit = webkit_web_back_forward_list_get_limit(history);
 
     history = webkit_web_view_get_back_forward_list(m_web_view);
     m_historyLimit = webkit_web_back_forward_list_get_limit(history);
 

-    m_ready = true;
+    // last to avoid getting signal too early
+    g_signal_connect_after(m_web_view, "notify::load-status",
+                           G_CALLBACK(wxgtk_webview_webkit_load_status),
+                           this);

 
     return true;
 }
 
 
     return true;
 }
 

+wxWebViewWebKit::~wxWebViewWebKit()
+{
+    if (m_web_view)
+        GTKDisconnect(m_web_view);
+}
+

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

-    gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable);
+    gtk_widget_set_sensitive(gtk_bin_get_child(GTK_BIN(m_widget)), enable);

 
     //if (enable)
     //    GTKFixSensitivity();
 
     //if (enable)
     //    GTKFixSensitivity();


@@ -497,7 +529,7 @@ void wxWebViewWebKit::Stop()
 
 void wxWebViewWebKit::Reload(wxWebViewReloadFlags flags)
 {
 
 void wxWebViewWebKit::Reload(wxWebViewReloadFlags flags)
 {

-    if (flags & wxWEB_VIEW_RELOAD_NO_CACHE)
+    if (flags & wxWEBVIEW_RELOAD_NO_CACHE)

     {
         webkit_web_view_reload_bypass_cache(m_web_view);
     }
     {
         webkit_web_view_reload_bypass_cache(m_web_view);
     }


@@ -558,10 +590,10 @@ void wxWebViewWebKit::EnableHistory(bool enable)
 
 wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetBackwardHistory()
 {
 
 wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetBackwardHistory()
 {

-    wxVector<wxSharedPtr<wxWebViewHistoryItem> > backhist; 
+    wxVector<wxSharedPtr<wxWebViewHistoryItem> > backhist;

     WebKitWebBackForwardList* history;
     history = webkit_web_view_get_back_forward_list(m_web_view);
     WebKitWebBackForwardList* history;
     history = webkit_web_view_get_back_forward_list(m_web_view);

-    GList* list = webkit_web_back_forward_list_get_back_list_with_limit(history, 
+    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--)
                                                                         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--)


@@ -579,10 +611,10 @@ wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetBackwardHistory
 
 wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetForwardHistory()
 {
 
 wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetForwardHistory()
 {

-    wxVector<wxSharedPtr<wxWebViewHistoryItem> > forwardhist; 
+    wxVector<wxSharedPtr<wxWebViewHistoryItem> > forwardhist;

     WebKitWebBackForwardList* history;
     history = webkit_web_view_get_back_forward_list(m_web_view);
     WebKitWebBackForwardList* history;
     history = webkit_web_view_get_back_forward_list(m_web_view);

-    GList* list = webkit_web_back_forward_list_get_forward_list_with_limit(history, 
+    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++)
     {
                                                                            m_historyLimit);
     for(guint i = 0; i < g_list_length(list); i++)
     {


@@ -602,7 +634,7 @@ void wxWebViewWebKit::LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item)
     WebKitWebHistoryItem* gtkitem = (WebKitWebHistoryItem*)item->m_histItem;
     if(gtkitem)
     {
     WebKitWebHistoryItem* gtkitem = (WebKitWebHistoryItem*)item->m_histItem;
     if(gtkitem)
     {

-        webkit_web_view_go_to_back_forward_item(m_web_view, 
+        webkit_web_view_go_to_back_forward_item(m_web_view,

                                                 WEBKIT_WEB_HISTORY_ITEM(gtkitem));
     }
 }
                                                 WEBKIT_WEB_HISTORY_ITEM(gtkitem));
     }
 }


@@ -690,28 +722,28 @@ wxWebViewZoom wxWebViewWebKit::GetZoom() const
     // arbitrary way to map float zoom to our common zoom enum
     if (zoom <= 0.65)
     {
     // arbitrary way to map float zoom to our common zoom enum
     if (zoom <= 0.65)
     {

-        return wxWEB_VIEW_ZOOM_TINY;
+        return wxWEBVIEW_ZOOM_TINY;

     }
     else if (zoom > 0.65 && zoom <= 0.90)
     {
     }
     else if (zoom > 0.65 && zoom <= 0.90)
     {

-        return wxWEB_VIEW_ZOOM_SMALL;
+        return wxWEBVIEW_ZOOM_SMALL;

     }
     else if (zoom > 0.90 && zoom <= 1.15)
     {
     }
     else if (zoom > 0.90 && zoom <= 1.15)
     {

-        return wxWEB_VIEW_ZOOM_MEDIUM;
+        return wxWEBVIEW_ZOOM_MEDIUM;

     }
     else if (zoom > 1.15 && zoom <= 1.45)
     {
     }
     else if (zoom > 1.15 && zoom <= 1.45)
     {

-        return wxWEB_VIEW_ZOOM_LARGE;
+        return wxWEBVIEW_ZOOM_LARGE;

     }
     else if (zoom > 1.45)
     {
     }
     else if (zoom > 1.45)
     {

-        return wxWEB_VIEW_ZOOM_LARGEST;
+        return wxWEBVIEW_ZOOM_LARGEST;

     }
 
     // to shut up compilers, this can never be reached logically
     wxASSERT(false);
     }
 
     // to shut up compilers, this can never be reached logically
     wxASSERT(false);

-    return wxWEB_VIEW_ZOOM_MEDIUM;
+    return wxWEBVIEW_ZOOM_MEDIUM;

 }
 
 
 }
 
 


@@ -720,23 +752,23 @@ 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)
     {

-        case wxWEB_VIEW_ZOOM_TINY:
+        case wxWEBVIEW_ZOOM_TINY:

             SetWebkitZoom(0.6f);
             break;
 
             SetWebkitZoom(0.6f);
             break;
 

-        case wxWEB_VIEW_ZOOM_SMALL:
+        case wxWEBVIEW_ZOOM_SMALL:

             SetWebkitZoom(0.8f);
             break;
 
             SetWebkitZoom(0.8f);
             break;
 

-        case wxWEB_VIEW_ZOOM_MEDIUM:
+        case wxWEBVIEW_ZOOM_MEDIUM:

             SetWebkitZoom(1.0f);
             break;
 
             SetWebkitZoom(1.0f);
             break;
 

-        case wxWEB_VIEW_ZOOM_LARGE:
+        case wxWEBVIEW_ZOOM_LARGE:

             SetWebkitZoom(1.3);
             break;
 
             SetWebkitZoom(1.3);
             break;
 

-        case wxWEB_VIEW_ZOOM_LARGEST:
+        case wxWEBVIEW_ZOOM_LARGEST:

             SetWebkitZoom(1.6);
             break;
 
             SetWebkitZoom(1.6);
             break;
 


@@ -748,7 +780,7 @@ void wxWebViewWebKit::SetZoom(wxWebViewZoom zoom)
 void wxWebViewWebKit::SetZoomType(wxWebViewZoomType type)
 {
     webkit_web_view_set_full_content_zoom(m_web_view,
 void wxWebViewWebKit::SetZoomType(wxWebViewZoomType type)
 {
     webkit_web_view_set_full_content_zoom(m_web_view,

-                                          (type == wxWEB_VIEW_ZOOM_TYPE_LAYOUT ?
+                                          (type == wxWEBVIEW_ZOOM_TYPE_LAYOUT ?

                                           TRUE : FALSE));
 }
 
                                           TRUE : FALSE));
 }
 


@@ -756,8 +788,8 @@ wxWebViewZoomType wxWebViewWebKit::GetZoomType() const
 {
     gboolean fczoom = webkit_web_view_get_full_content_zoom(m_web_view);
 
 {
     gboolean fczoom = webkit_web_view_get_full_content_zoom(m_web_view);
 

-    if (fczoom) return wxWEB_VIEW_ZOOM_TYPE_LAYOUT;
-    else        return wxWEB_VIEW_ZOOM_TYPE_TEXT;
+    if (fczoom) return wxWEBVIEW_ZOOM_TYPE_LAYOUT;
+    else        return wxWEBVIEW_ZOOM_TYPE_TEXT;

 }
 
 bool wxWebViewWebKit::CanSetZoomType(wxWebViewZoomType) const
 }
 
 bool wxWebViewWebKit::CanSetZoomType(wxWebViewZoomType) const


@@ -766,7 +798,7 @@ bool wxWebViewWebKit::CanSetZoomType(wxWebViewZoomType) const
     return true;
 }
 
     return true;
 }
 

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

 {
     webkit_web_view_load_string (m_web_view,
                                  html.mb_str(wxConvUTF8),
 {
     webkit_web_view_load_string (m_web_view,
                                  html.mb_str(wxConvUTF8),


@@ -842,7 +874,7 @@ void wxWebViewWebKit::SelectAll()
 
 wxString wxWebViewWebKit::GetSelectedText() const
 {
 
 wxString wxWebViewWebKit::GetSelectedText() const
 {

-    WebKitDOMDocument* doc; 
+    WebKitDOMDocument* doc;

     WebKitDOMDOMWindow* win;
     WebKitDOMDOMSelection* sel;
     WebKitDOMRange* range;
     WebKitDOMDOMWindow* win;
     WebKitDOMDOMSelection* sel;
     WebKitDOMRange* range;


@@ -850,15 +882,15 @@ wxString wxWebViewWebKit::GetSelectedText() const
     doc = webkit_web_view_get_dom_document(m_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));
     doc = webkit_web_view_get_dom_document(m_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), 
+    range = webkit_dom_dom_selection_get_range_at(WEBKIT_DOM_DOM_SELECTION(sel),

                                                   0, NULL);
                                                   0, NULL);

-    return wxString(webkit_dom_range_get_text(WEBKIT_DOM_RANGE(range)), 
+    return wxString(webkit_dom_range_get_text(WEBKIT_DOM_RANGE(range)),

                     wxConvUTF8);
 }
 
 wxString wxWebViewWebKit::GetSelectedSource() const
 {
                     wxConvUTF8);
 }
 
 wxString wxWebViewWebKit::GetSelectedSource() const
 {

-    WebKitDOMDocument* doc; 
+    WebKitDOMDocument* doc;

     WebKitDOMDOMWindow* win;
     WebKitDOMDOMSelection* sel;
     WebKitDOMRange* range;
     WebKitDOMDOMWindow* win;
     WebKitDOMDOMSelection* sel;
     WebKitDOMRange* range;


@@ -869,7 +901,7 @@ wxString wxWebViewWebKit::GetSelectedSource() const
     doc = webkit_web_view_get_dom_document(m_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));
     doc = webkit_web_view_get_dom_document(m_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), 
+    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);
 
                                                   0, NULL);
     div = webkit_dom_document_create_element(WEBKIT_DOM_DOCUMENT(doc), "div", NULL);
 


@@ -877,13 +909,13 @@ wxString wxWebViewWebKit::GetSelectedSource() const
     webkit_dom_node_append_child(&div->parent_instance, &clone->parent_instance, NULL);
     html = (WebKitDOMHTMLElement*)div;
 
     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)), 
+    return wxString(webkit_dom_html_element_get_inner_html(WEBKIT_DOM_HTML_ELEMENT(html)),

                     wxConvUTF8);
 }
 
 void wxWebViewWebKit::ClearSelection()
 {
                     wxConvUTF8);
 }
 
 void wxWebViewWebKit::ClearSelection()
 {

-    WebKitDOMDocument* doc; 
+    WebKitDOMDocument* doc;

     WebKitDOMDOMWindow* win;
     WebKitDOMDOMSelection* sel;
 
     WebKitDOMDOMWindow* win;
     WebKitDOMDOMSelection* sel;
 


@@ -896,18 +928,18 @@ void wxWebViewWebKit::ClearSelection()
 
 wxString wxWebViewWebKit::GetPageText() const
 {
 
 wxString wxWebViewWebKit::GetPageText() const
 {

-    WebKitDOMDocument* doc; 
+    WebKitDOMDocument* doc;

     WebKitDOMHTMLElement* body;
 
     doc = webkit_web_view_get_dom_document(m_web_view);
     body = webkit_dom_document_get_body(WEBKIT_DOM_DOCUMENT(doc));
     WebKitDOMHTMLElement* body;
 
     doc = webkit_web_view_get_dom_document(m_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)), 
+    return wxString(webkit_dom_html_element_get_inner_text(WEBKIT_DOM_HTML_ELEMENT(body)),

                     wxConvUTF8);
 }
 
 void wxWebViewWebKit::RunScript(const wxString& javascript)
 {
                     wxConvUTF8);
 }
 
 void wxWebViewWebKit::RunScript(const wxString& javascript)
 {

-    webkit_web_view_execute_script(m_web_view, 
+    webkit_web_view_execute_script(m_web_view,

                                    javascript.mb_str(wxConvUTF8));
 }
 
                                    javascript.mb_str(wxConvUTF8));
 }
 


@@ -916,11 +948,94 @@ void wxWebViewWebKit::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler)
     m_handlerList.push_back(handler);
 }
 
     m_handlerList.push_back(handler);
 }
 

+void wxWebViewWebKit::EnableContextMenu(bool enable)
+{
+#if !WEBKIT_CHECK_VERSION(1, 10, 0) //If we are using an older version
+    g_object_set(webkit_web_view_get_settings(m_web_view), 
+                 "enable-default-context-menu", enable, NULL);
+#endif
+    wxWebView::EnableContextMenu(enable);
+}
+
+long wxWebViewWebKit::Find(const wxString& text, int flags)
+{
+    bool newSearch = false;
+    if(text != m_findText || 
+       (flags & wxWEBVIEW_FIND_MATCH_CASE) != (m_findFlags & wxWEBVIEW_FIND_MATCH_CASE))
+    {
+        newSearch = true;
+        //If it is a new search we need to clear existing highlights
+        webkit_web_view_unmark_text_matches(m_web_view);
+        webkit_web_view_set_highlight_text_matches(m_web_view, false);
+    }
+
+    m_findFlags = flags;
+    m_findText = text;
+
+    //If the search string is empty then we clear any selection and highlight
+    if(text == "")
+    {
+        webkit_web_view_unmark_text_matches(m_web_view);
+        webkit_web_view_set_highlight_text_matches(m_web_view, false);
+        ClearSelection();
+        return wxNOT_FOUND;
+    }
+
+    bool wrap = false, matchCase = false, forward = true;
+    if(flags & wxWEBVIEW_FIND_WRAP)
+        wrap = true;
+    if(flags & wxWEBVIEW_FIND_MATCH_CASE)
+        matchCase = true;
+    if(flags & wxWEBVIEW_FIND_BACKWARDS)
+        forward = false;
+
+    if(newSearch)
+    {
+        //Initially we mark the matches to know how many we have
+        m_findCount = webkit_web_view_mark_text_matches(m_web_view, wxGTK_CONV(text), matchCase, 0);
+        //In this case we return early to match IE behaviour
+        m_findPosition = -1;
+        return m_findCount;
+    }
+    else
+    {
+        if(forward)
+            m_findPosition++;
+        else
+            m_findPosition--;
+        if(m_findPosition < 0)
+            m_findPosition += m_findCount;
+        if(m_findPosition > m_findCount)
+            m_findPosition -= m_findCount;
+    }
+
+    //Highlight them if needed
+    bool highlight = flags & wxWEBVIEW_FIND_HIGHLIGHT_RESULT ? true : false;
+    webkit_web_view_set_highlight_text_matches(m_web_view, highlight);     
+
+    if(!webkit_web_view_search_text(m_web_view, wxGTK_CONV(text), matchCase, forward, wrap))
+    {
+        m_findPosition = -1;
+        ClearSelection();
+        return wxNOT_FOUND;
+    }
+    wxLogMessage(wxString::Format("Returning %d", m_findPosition));
+    return newSearch ? m_findCount : m_findPosition;
+}
+
+void wxWebViewWebKit::FindClear()
+{
+    m_findCount = 0;
+    m_findFlags = 0;
+    m_findText = "";
+    m_findPosition = -1;
+}
+

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

-     return GetDefaultAttributesFromGTKWidget(webkit_web_view_new);
+     return GetDefaultAttributesFromGTKWidget(webkit_web_view_new());

 }
 
 
 }