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 c7c3d1c7a58534d237be60b5ddecbd2758ea048b..91973b1d5f52c9b73111a33dbaacfcefc10d4538 100644 (file)
--- a/src/gtk/webview_webkit.cpp
+++ b/src/gtk/webview_webkit.cpp
@@ -44,22 +44,22 @@ wxgtk_webview_webkit_load_status(GtkWidget* widget,
     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())
-            webKitCtrl->GetEventHandler()->ProcessEvent(thisEvent);
+            webKitCtrl->GetEventHandler()->ProcessEvent(event);
     }
     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())
-            webKitCtrl->GetEventHandler()->ProcessEvent(thisEvent);
+            webKitCtrl->GetEventHandler()->ProcessEvent(event);
     }
 }
 
@@ -86,16 +86,15 @@ wxgtk_webview_webkit_navigation(WebKitWebView *,
     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())
-        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);
@@ -104,10 +103,10 @@ wxgtk_webview_webkit_navigation(WebKitWebView *,
     else
     {
         wxString wxuri = uri;
-        wxSharedPtr<wxWebHandler> handler;
-        wxVector<wxSharedPtr<wxWebHandler> > 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<wxWebHandler> >::iterator it = hanlders.begin();
+        for(wxVector<wxSharedPtr<wxWebViewHandler> >::iterator it = hanlders.begin();
             it != hanlders.end(); ++it)
         {
             if(wxuri.substr(0, (*it)->GetName().length()) == (*it)->GetName())
@@ -141,7 +140,7 @@ wxgtk_webview_webkit_error(WebKitWebView*,
                            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);
@@ -260,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())
     {
-        webKitWindow->GetEventHandler()->ProcessEvent(thisEvent);
+        webKitWindow->GetEventHandler()->ProcessEvent(event);
     }
 
     return FALSE;
@@ -287,14 +284,13 @@ wxgtk_webview_webkit_new_window(WebKitWebView*,
     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(thisEvent);
+        webKitCtrl->GetEventHandler()->ProcessEvent(event);
 
     //We always want the user to handle this themselves
     webkit_web_policy_decision_ignore(policy_decision);
@@ -307,15 +303,14 @@ wxgtk_webview_webkit_title_changed(WebKitWebView*,
                                    gchar *title,
                                    wxWebViewWebKit *webKitCtrl)
 {
-    wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED,
-                                   webKitCtrl->GetId(),
-                                   webKitCtrl->GetCurrentURL(),
-                                   "",
-                                   true);
-    thisEvent.SetString(wxString(title, wxConvUTF8));
+    wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED,
+                         webKitCtrl->GetId(),
+                         webKitCtrl->GetCurrentURL(),
+                         "");
+    event.SetString(wxString(title, wxConvUTF8));
 
     if (webKitCtrl && webKitCtrl->GetEventHandler())
-        webKitCtrl->GetEventHandler()->ProcessEvent(thisEvent);
+        webKitCtrl->GetEventHandler()->ProcessEvent(event);
 
 }
 
@@ -329,11 +324,11 @@ wxgtk_webview_webkit_resource_req(WebKitWebView *,
 {
     wxString uri = webkit_network_request_get_uri(request);
     
-    wxSharedPtr<wxWebHandler> handler;
-    wxVector<wxSharedPtr<wxWebHandler> > 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<wxWebHandler> >::iterator it = hanlders.begin();
+    for(wxVector<wxSharedPtr<wxWebViewHandler> >::iterator it = hanlders.begin();
         it != hanlders.end(); ++it)
     {
         if(uri.substr(0, (*it)->GetName().length()) == (*it)->GetName())
@@ -478,7 +473,7 @@ void wxWebViewWebKit::SetWebkitZoom(float 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));
 }
@@ -500,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));
 }
@@ -517,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));
 }
 
 
-bool wxWebViewWebKit::CanGoForward()
+bool wxWebViewWebKit::CanGoForward() const
 {
     return webkit_web_view_can_go_forward (WEBKIT_WEB_VIEW(web_view));
 }
@@ -549,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, 
@@ -560,19 +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);
-        wxWebHistoryItem* wxitem = new wxWebHistoryItem(
+        wxWebViewHistoryItem* wxitem = new wxWebViewHistoryItem(
                                    webkit_web_history_item_get_uri(gtkitem),
                                    webkit_web_history_item_get_title(gtkitem));
         wxitem->m_histItem = gtkitem;
-        wxSharedPtr<wxWebHistoryItem> item(wxitem);
+        wxSharedPtr<wxWebViewHistoryItem> item(wxitem);
         backhist.push_back(item);
     }
     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, 
@@ -580,17 +575,17 @@ wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewWebKit::GetForwardHistory()
     for(guint i = 0; i < g_list_length(list); i++)
     {
         WebKitWebHistoryItem* gtkitem = (WebKitWebHistoryItem*)g_list_nth_data(list, i);
-        wxWebHistoryItem* wxitem = new wxWebHistoryItem(
+        wxWebViewHistoryItem* wxitem = new wxWebViewHistoryItem(
                                    webkit_web_history_item_get_uri(gtkitem),
                                    webkit_web_history_item_get_title(gtkitem));
         wxitem->m_histItem = gtkitem;
-        wxSharedPtr<wxWebHistoryItem> item(wxitem);
+        wxSharedPtr<wxWebViewHistoryItem> item(wxitem);
         forwardhist.push_back(item);
     }
     return forwardhist;
 }
 
-void wxWebViewWebKit::LoadHistoryItem(wxSharedPtr<wxWebHistoryItem> item)
+void wxWebViewWebKit::LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item)
 {
     WebKitWebHistoryItem* gtkitem = item->m_histItem;
     if(gtkitem)
@@ -602,17 +597,17 @@ void wxWebViewWebKit::LoadHistoryItem(wxSharedPtr<wxWebHistoryItem> item)
     }
 }
 
-bool wxWebViewWebKit::CanCut()
+bool wxWebViewWebKit::CanCut() const
 {
     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));
 }
 
-bool wxWebViewWebKit::CanPaste()
+bool wxWebViewWebKit::CanPaste() const
 {
     return webkit_web_view_can_paste_clipboard(WEBKIT_WEB_VIEW(web_view));
 }
@@ -632,12 +627,12 @@ void wxWebViewWebKit::Paste()
     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));
 }
 
-bool wxWebViewWebKit::CanRedo()
+bool wxWebViewWebKit::CanRedo() const
 {
     return webkit_web_view_can_redo(WEBKIT_WEB_VIEW(web_view));
 }
@@ -652,7 +647,7 @@ void wxWebViewWebKit::Redo()
     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)
@@ -661,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)));
 }
 
 
-wxString wxWebViewWebKit::GetPageSource()
+wxString wxWebViewWebKit::GetPageSource() const
 {
     WebKitWebFrame* frame = webkit_web_view_get_main_frame(
         WEBKIT_WEB_VIEW(web_view));
@@ -681,7 +676,7 @@ wxString wxWebViewWebKit::GetPageSource()
 }
 
 
-wxWebViewZoom wxWebViewWebKit::GetZoom()
+wxWebViewZoom wxWebViewWebKit::GetZoom() const
 {
     float zoom = GetWebkitZoom();
 
@@ -789,7 +784,7 @@ void wxWebViewWebKit::Print()
 }
 
 
-bool wxWebViewWebKit::IsBusy()
+bool wxWebViewWebKit::IsBusy() const
 {
     return m_busy;
 
@@ -820,7 +815,7 @@ void wxWebViewWebKit::SetEditable(bool 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));
 }
@@ -830,7 +825,7 @@ void wxWebViewWebKit::DeleteSelection()
     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));
 }
@@ -840,7 +835,7 @@ void wxWebViewWebKit::SelectAll()
     webkit_web_view_select_all(WEBKIT_WEB_VIEW(web_view));
 }
 
-wxString wxWebViewWebKit::GetSelectedText()
+wxString wxWebViewWebKit::GetSelectedText() const
 {
     WebKitDOMDocument* doc; 
     WebKitDOMDOMWindow* win;
@@ -856,7 +851,7 @@ wxString wxWebViewWebKit::GetSelectedText()
                     wxConvUTF8);
 }
 
-wxString wxWebViewWebKit::GetSelectedSource()
+wxString wxWebViewWebKit::GetSelectedSource() const
 {
     WebKitDOMDocument* doc; 
     WebKitDOMDOMWindow* win;
@@ -894,7 +889,7 @@ void wxWebViewWebKit::ClearSelection()
 
 }
 
-wxString wxWebViewWebKit::GetPageText()
+wxString wxWebViewWebKit::GetPageText() const
 {
     WebKitDOMDocument* doc; 
     WebKitDOMHTMLElement* body;
@@ -911,7 +906,7 @@ void wxWebViewWebKit::RunScript(const wxString& javascript)
                                    javascript.mb_str(wxConvUTF8));
 }
 
-void wxWebViewWebKit::RegisterHandler(wxSharedPtr<wxWebHandler> handler)
+void wxWebViewWebKit::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler)
 {
     m_handlerList.push_back(handler);
 }