Refactor wxFileName existence checking code.

[wxWidgets.git] / src / osx / webview_webkit.mm

diff --git a/src/osx/webview_webkit.mm b/src/osx/webview_webkit.mm
index 2cf09e46686cf0fe64d15ea160c66b5f6332688a..74e23a63ccc7843c29b22d3f9286671be0b4d070 100644 (file)
--- a/src/osx/webview_webkit.mm
+++ b/src/osx/webview_webkit.mm
@@ -14,8 +14,8 @@
 
 #include "wx/osx/webview_webkit.h"
 
-#if wxUSE_WEBVIEW_WEBKIT && (defined(__WXOSX_COCOA__) \
-                         ||  defined(__WXOSX_CARBON__))
+#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && (defined(__WXOSX_COCOA__) \
+                                          ||  defined(__WXOSX_CARBON__))
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
@@ -389,7 +389,7 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
     //Register our own class for custom scheme handling
     [NSURLProtocol registerClass:[WebViewCustomProtocol class]];
 
-    LoadUrl(strURL);
+    LoadURL(strURL);
     return true;
 }
 
@@ -411,7 +411,7 @@ wxWebViewWebKit::~wxWebViewWebKit()
 // public methods
 // ----------------------------------------------------------------------------
 
-bool wxWebViewWebKit::CanGoBack()
+bool wxWebViewWebKit::CanGoBack() const
 {
     if ( !m_webView )
         return false;
@@ -419,7 +419,7 @@ bool wxWebViewWebKit::CanGoBack()
     return [m_webView canGoBack];
 }
 
-bool wxWebViewWebKit::CanGoForward()
+bool wxWebViewWebKit::CanGoForward() const
 {
     if ( !m_webView )
         return false;
@@ -469,7 +469,7 @@ void wxWebViewWebKit::Stop()
     [[m_webView mainFrame] stopLoading];
 }
 
-bool wxWebViewWebKit::CanGetPageSource()
+bool wxWebViewWebKit::CanGetPageSource() const
 {
     if ( !m_webView )
         return false;
@@ -478,7 +478,7 @@ bool wxWebViewWebKit::CanGetPageSource()
     return ( [[dataSource representation] canProvideDocumentSource] );
 }
 
-wxString wxWebViewWebKit::GetPageSource()
+wxString wxWebViewWebKit::GetPageSource() const
 {
 
     if (CanGetPageSource())
@@ -501,7 +501,7 @@ wxString wxWebViewWebKit::GetPageSource()
     return wxEmptyString;
 }
 
-bool wxWebViewWebKit::CanIncreaseTextSize()
+bool wxWebViewWebKit::CanIncreaseTextSize() const
 {
     if ( !m_webView )
         return false;
@@ -521,7 +521,7 @@ void wxWebViewWebKit::IncreaseTextSize()
         [m_webView makeTextLarger:(WebView*)m_webView];
 }
 
-bool wxWebViewWebKit::CanDecreaseTextSize()
+bool wxWebViewWebKit::CanDecreaseTextSize() const
 {
     if ( !m_webView )
         return false;
@@ -573,7 +573,7 @@ void wxWebViewWebKit::SetEditable(bool enable)
     [m_webView setEditable:enable ];
 }
 
-bool wxWebViewWebKit::IsEditable()
+bool wxWebViewWebKit::IsEditable() const
 {
     if ( !m_webView )
         return false;
@@ -629,7 +629,7 @@ void wxWebViewWebKit::SetScrollPos(int pos)
             (NSString*)wxNSStringWithWxString( javascript )];
 }
 
-wxString wxWebViewWebKit::GetSelectedText()
+wxString wxWebViewWebKit::GetSelectedText() const
 {
     NSString* selection = [[m_webView selectedDOMRange] markupString];
     if (!selection) return wxEmptyString;
@@ -735,23 +735,23 @@ void wxWebViewWebKit::MacVisibilityChanged(){
 #endif
 }
 
-void wxWebViewWebKit::LoadUrl(const wxString& url)
+void wxWebViewWebKit::LoadURL(const wxString& url)
 {
     [[m_webView mainFrame] loadRequest:[NSURLRequest requestWithURL:
             [NSURL URLWithString:wxNSStringWithWxString(url)]]];
 }
 
-wxString wxWebViewWebKit::GetCurrentURL()
+wxString wxWebViewWebKit::GetCurrentURL() const
 {
     return wxStringWithNSString([m_webView mainFrameURL]);
 }
 
-wxString wxWebViewWebKit::GetCurrentTitle()
+wxString wxWebViewWebKit::GetCurrentTitle() const
 {
     return wxStringWithNSString([m_webView mainFrameTitle]);
 }
 
-float wxWebViewWebKit::GetWebkitZoom()
+float wxWebViewWebKit::GetWebkitZoom() const
 {
     return [m_webView textSizeMultiplier];
 }
@@ -761,7 +761,7 @@ void wxWebViewWebKit::SetWebkitZoom(float zoom)
     [m_webView setTextSizeMultiplier:zoom];
 }
 
-wxWebViewZoom wxWebViewWebKit::GetZoom()
+wxWebViewZoom wxWebViewWebKit::GetZoom() const
 {
     float zoom = GetWebkitZoom();
 
@@ -865,7 +865,7 @@ void wxWebViewWebKit::DeleteSelection()
     [(WebView*)m_webView deleteSelection];
 }
 
-bool wxWebViewWebKit::HasSelection()
+bool wxWebViewWebKit::HasSelection() const
 {
     DOMRange* range = [m_webView selectedDOMRange];
     if(!range)
@@ -889,7 +889,7 @@ void wxWebViewWebKit::SelectAll()
     RunScript("window.getSelection().selectAllChildren(document.body);");
 }
 
-wxString wxWebViewWebKit::GetSelectedSource()
+wxString wxWebViewWebKit::GetSelectedSource() const
 {
     wxString script = ("var range = window.getSelection().getRangeAt(0);"
                        "var element = document.createElement('div');"
@@ -900,7 +900,7 @@ wxString wxWebViewWebKit::GetSelectedSource()
     return wxStringWithNSString([result stringValue]);
 }
 
-wxString wxWebViewWebKit::GetPageText()
+wxString wxWebViewWebKit::GetPageText() const
 {
     id result = [[m_webView windowScriptObject]
                  evaluateWebScript:@"document.body.textContent"];
@@ -921,9 +921,9 @@ void wxWebViewWebKit::ClearHistory()
     [m_webView setMaintainsBackForwardList:YES];
 }
 
-wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewWebKit::GetBackwardHistory()
+wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetBackwardHistory()
 {
-    wxVector<wxSharedPtr<wxWebHistoryItem> > backhist;
+    wxVector<wxSharedPtr<wxWebViewHistoryItem> > backhist;
     WebBackForwardList* history = [m_webView backForwardList];
     int count = [history backListCount];
     for(int i = -count; i < 0; i++)
@@ -931,17 +931,17 @@ wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewWebKit::GetBackwardHistory()
         WebHistoryItem* item = [history itemAtIndex:i];
         wxString url = wxStringWithNSString([item URLString]);
         wxString title = wxStringWithNSString([item title]);
-        wxWebHistoryItem* wxitem = new wxWebHistoryItem(url, title);
+        wxWebViewHistoryItem* wxitem = new wxWebViewHistoryItem(url, title);
         wxitem->m_histItem = item;
-        wxSharedPtr<wxWebHistoryItem> itemptr(wxitem);
+        wxSharedPtr<wxWebViewHistoryItem> itemptr(wxitem);
         backhist.push_back(itemptr);
     }
     return backhist;
 }
 
-wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewWebKit::GetForwardHistory()
+wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetForwardHistory()
 {
-    wxVector<wxSharedPtr<wxWebHistoryItem> > forwardhist;
+    wxVector<wxSharedPtr<wxWebViewHistoryItem> > forwardhist;
     WebBackForwardList* history = [m_webView backForwardList];
     int count = [history forwardListCount];
     for(int i = 1; i <= count; i++)
@@ -949,25 +949,25 @@ wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewWebKit::GetForwardHistory()
         WebHistoryItem* item = [history itemAtIndex:i];
         wxString url = wxStringWithNSString([item URLString]);
         wxString title = wxStringWithNSString([item title]);
-        wxWebHistoryItem* wxitem = new wxWebHistoryItem(url, title);
+        wxWebViewHistoryItem* wxitem = new wxWebViewHistoryItem(url, title);
         wxitem->m_histItem = item;
-        wxSharedPtr<wxWebHistoryItem> itemptr(wxitem);
+        wxSharedPtr<wxWebViewHistoryItem> itemptr(wxitem);
         forwardhist.push_back(itemptr);
     }
     return forwardhist;
 }
 
-void wxWebViewWebKit::LoadHistoryItem(wxSharedPtr<wxWebHistoryItem> item)
+void wxWebViewWebKit::LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item)
 {
     [m_webView goToBackForwardItem:item->m_histItem];
 }
 
-bool wxWebViewWebKit::CanUndo()
+bool wxWebViewWebKit::CanUndo() const
 {
     return [[m_webView undoManager] canUndo];
 }
 
-bool wxWebViewWebKit::CanRedo()
+bool wxWebViewWebKit::CanRedo() const
 {
     return [[m_webView undoManager] canRedo];
 }
@@ -1018,13 +1018,13 @@ void wxWebViewWebKit::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler)
     if (webKitWindow && frame == [sender mainFrame]){
         NSString *url = [[[[frame dataSource] request] URL] absoluteString];
         wxString target = wxStringWithNSString([frame name]);
-        wxWebViewNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
-                                           webKitWindow->GetId(),
-                                           wxStringWithNSString( url ),
-                                           target, false);
+        wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
+                             webKitWindow->GetId(),
+                             wxStringWithNSString( url ),
+                             target);
 
         if (webKitWindow && webKitWindow->GetEventHandler())
-            webKitWindow->GetEventHandler()->ProcessEvent(thisEvent);
+            webKitWindow->GetEventHandler()->ProcessEvent(event);
     }
 }
 
@@ -1036,13 +1036,13 @@ void wxWebViewWebKit::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler)
         NSString *url = [[[[frame dataSource] request] URL] absoluteString];
 
         wxString target = wxStringWithNSString([frame name]);
-        wxWebViewNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_LOADED,
-                                           webKitWindow->GetId(),
-                                           wxStringWithNSString( url ),
-                                           target, false);
+        wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_LOADED,
+                             webKitWindow->GetId(),
+                             wxStringWithNSString( url ),
+                             target);
 
         if (webKitWindow && webKitWindow->GetEventHandler())
-            webKitWindow->GetEventHandler()->ProcessEvent(thisEvent);
+            webKitWindow->GetEventHandler()->ProcessEvent(event);
     }
 }
 
@@ -1062,7 +1062,9 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
 
             case NSURLErrorResourceUnavailable:
             case NSURLErrorHTTPTooManyRedirects:
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
             case NSURLErrorDataLengthExceedsMaximum:
+#endif
             case NSURLErrorBadURL:
             case NSURLErrorFileIsDirectory:
                 *out = wxWEB_NAV_ERR_REQUEST;
@@ -1084,16 +1086,20 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
                 *out = wxWEB_NAV_ERR_USER_CANCELLED;
                 break;
 
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5                
             case NSURLErrorCannotDecodeRawData:
             case NSURLErrorCannotDecodeContentData:
-            case NSURLErrorBadServerResponse:
             case NSURLErrorCannotParseResponse:
+#endif
+            case NSURLErrorBadServerResponse:
                 *out = wxWEB_NAV_ERR_REQUEST;
                 break;
 
             case NSURLErrorUserAuthenticationRequired:
             case NSURLErrorSecureConnectionFailed:
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
             case NSURLErrorClientCertificateRequired:
+#endif
                 *out = wxWEB_NAV_ERR_AUTH;
                 break;
 
@@ -1130,16 +1136,16 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
 
         wxWebViewNavigationError type;
         wxString description = nsErrorToWxHtmlError(error, &type);
-               wxWebViewNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_ERROR,
-                                                  webKitWindow->GetId(),
-                                           wxStringWithNSString( url ),
-                                           wxEmptyString, false);
-               thisEvent.SetString(description);
-               thisEvent.SetInt(type);
+               wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_ERROR,
+                                    webKitWindow->GetId(),
+                             wxStringWithNSString( url ),
+                             wxEmptyString);
+               event.SetString(description);
+               event.SetInt(type);
 
                if (webKitWindow && webKitWindow->GetEventHandler())
                {
-                       webKitWindow->GetEventHandler()->ProcessEvent(thisEvent);
+                       webKitWindow->GetEventHandler()->ProcessEvent(event);
                }
     }
 }
@@ -1156,15 +1162,15 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
 
                wxWebViewNavigationError type;
         wxString description = nsErrorToWxHtmlError(error, &type);
-               wxWebViewNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_ERROR,
-                                                  webKitWindow->GetId(),
-                                           wxStringWithNSString( url ),
-                                           wxEmptyString, false);
-               thisEvent.SetString(description);
-               thisEvent.SetInt(type);
+               wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_ERROR,
+                                    webKitWindow->GetId(),
+                             wxStringWithNSString( url ),
+                             wxEmptyString);
+               event.SetString(description);
+               event.SetInt(type);
 
                if (webKitWindow && webKitWindow->GetEventHandler())
-                       webKitWindow->GetEventHandler()->ProcessEvent(thisEvent);
+                       webKitWindow->GetEventHandler()->ProcessEvent(event);
     }
 }
 
@@ -1172,15 +1178,15 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
                                          forFrame:(WebFrame *)frame
 {
     wxString target = wxStringWithNSString([frame name]);
-    wxWebViewNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED,
-                                       webKitWindow->GetId(),
-                                       webKitWindow->GetCurrentURL(),
-                                       target, true);
+    wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED,
+                         webKitWindow->GetId(),
+                         webKitWindow->GetCurrentURL(),
+                         target);
                                    
-    thisEvent.SetString(wxStringWithNSString(title));
+    event.SetString(wxStringWithNSString(title));
 
     if (webKitWindow && webKitWindow->GetEventHandler())
-        webKitWindow->GetEventHandler()->ProcessEvent(thisEvent);
+        webKitWindow->GetEventHandler()->ProcessEvent(event);
 }
 @end
 
@@ -1204,14 +1210,14 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
     webKitWindow->m_busy = true;
     NSString *url = [[request URL] absoluteString];
     wxString target = wxStringWithNSString([frame name]);
-    wxWebViewNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_NAVIGATING,
-                                       webKitWindow->GetId(),
-                                       wxStringWithNSString( url ), target, true);
+    wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATING,
+                         webKitWindow->GetId(),
+                         wxStringWithNSString( url ), target);
 
     if (webKitWindow && webKitWindow->GetEventHandler())
-        webKitWindow->GetEventHandler()->ProcessEvent(thisEvent);
+        webKitWindow->GetEventHandler()->ProcessEvent(event);
 
-    if (thisEvent.IsVetoed())
+    if (!event.IsAllowed())
     {
         webKitWindow->m_busy = false;
         [listener ignore];
@@ -1231,12 +1237,12 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
     wxUnusedVar(actionInformation);
 
     NSString *url = [[request URL] absoluteString];
-    wxWebViewNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_NEWWINDOW,
-                                       webKitWindow->GetId(),
-                                       wxStringWithNSString( url ), "", true);
+    wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NEWWINDOW,
+                         webKitWindow->GetId(),
+                         wxStringWithNSString( url ), "");
 
     if (webKitWindow && webKitWindow->GetEventHandler())
-        webKitWindow->GetEventHandler()->ProcessEvent(thisEvent);
+        webKitWindow->GetEventHandler()->ProcessEvent(event);
 
     [listener ignore];
 }
@@ -1309,4 +1315,4 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
 
 @end
 
-#endif //wxUSE_WEBVIEW_WEBKIT
+#endif //wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT