Reuse wxMessageOutputStderr for wxLogStderr implementation.

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

diff --git a/src/osx/webview_webkit.mm b/src/osx/webview_webkit.mm
index 0340ca7a02368b635cffc632bb06045edbac71b3..1609dfd59a388f83fd47f00e2939adb153256882 100644 (file)
--- a/src/osx/webview_webkit.mm
+++ b/src/osx/webview_webkit.mm
@@ -909,16 +909,16 @@ wxString wxWebViewWebKit::GetSelectedSource() const
                        "var element = document.createElement('div');"
                        "element.appendChild(range.cloneContents());"
                        "return element.innerHTML;");
                        "var element = document.createElement('div');"
                        "element.appendChild(range.cloneContents());"
                        "return element.innerHTML;");

-    id result = [[m_webView windowScriptObject]
-                   evaluateWebScript:wxNSStringWithWxString(script)];
-    return wxStringWithNSString([result stringValue]);
+    NSString *result = [m_webView stringByEvaluatingJavaScriptFromString:
+                                  wxNSStringWithWxString(script)];
+    return wxStringWithNSString(result);

 }
 
 wxString wxWebViewWebKit::GetPageText() const
 {
 }
 
 wxString wxWebViewWebKit::GetPageText() const
 {

-    id result = [[m_webView windowScriptObject]
-                 evaluateWebScript:@"document.body.textContent"];
-    return wxStringWithNSString([result stringValue]);
+    NSString *result = [m_webView stringByEvaluatingJavaScriptFromString:
+                                  @"document.body.textContent"];
+    return wxStringWithNSString(result);

 }
 
 void wxWebViewWebKit::EnableHistory(bool enable)
 }
 
 void wxWebViewWebKit::EnableHistory(bool enable)


@@ -1032,7 +1032,7 @@ void wxWebViewWebKit::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler)
     if (webKitWindow && frame == [sender mainFrame]){
         NSString *url = [[[[frame dataSource] request] URL] absoluteString];
         wxString target = wxStringWithNSString([frame name]);
     if (webKitWindow && frame == [sender mainFrame]){
         NSString *url = [[[[frame dataSource] request] URL] absoluteString];
         wxString target = wxStringWithNSString([frame name]);

-        wxWebViewEvent event(wxEVT_COMMAND_WEBVIEW_NAVIGATED,
+        wxWebViewEvent event(wxEVT_WEBVIEW_NAVIGATED,

                              webKitWindow->GetId(),
                              wxStringWithNSString( url ),
                              target);
                              webKitWindow->GetId(),
                              wxStringWithNSString( url ),
                              target);


@@ -1050,7 +1050,7 @@ void wxWebViewWebKit::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler)
         NSString *url = [[[[frame dataSource] request] URL] absoluteString];
 
         wxString target = wxStringWithNSString([frame name]);
         NSString *url = [[[[frame dataSource] request] URL] absoluteString];
 
         wxString target = wxStringWithNSString([frame name]);

-        wxWebViewEvent event(wxEVT_COMMAND_WEBVIEW_LOADED,
+        wxWebViewEvent event(wxEVT_WEBVIEW_LOADED,

                              webKitWindow->GetId(),
                              wxStringWithNSString( url ),
                              target);
                              webKitWindow->GetId(),
                              wxStringWithNSString( url ),
                              target);


@@ -1150,7 +1150,7 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
 
         wxWebViewNavigationError type;
         wxString description = nsErrorToWxHtmlError(error, &type);
 
         wxWebViewNavigationError type;
         wxString description = nsErrorToWxHtmlError(error, &type);

-               wxWebViewEvent event(wxEVT_COMMAND_WEBVIEW_ERROR,
+               wxWebViewEvent event(wxEVT_WEBVIEW_ERROR,

                                     webKitWindow->GetId(),
                              wxStringWithNSString( url ),
                              wxEmptyString);
                                     webKitWindow->GetId(),
                              wxStringWithNSString( url ),
                              wxEmptyString);


@@ -1176,7 +1176,7 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
 
                wxWebViewNavigationError type;
         wxString description = nsErrorToWxHtmlError(error, &type);
 
                wxWebViewNavigationError type;
         wxString description = nsErrorToWxHtmlError(error, &type);

-               wxWebViewEvent event(wxEVT_COMMAND_WEBVIEW_ERROR,
+               wxWebViewEvent event(wxEVT_WEBVIEW_ERROR,

                                     webKitWindow->GetId(),
                              wxStringWithNSString( url ),
                              wxEmptyString);
                                     webKitWindow->GetId(),
                              wxStringWithNSString( url ),
                              wxEmptyString);


@@ -1192,7 +1192,7 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
                                          forFrame:(WebFrame *)frame
 {
     wxString target = wxStringWithNSString([frame name]);
                                          forFrame:(WebFrame *)frame
 {
     wxString target = wxStringWithNSString([frame name]);

-    wxWebViewEvent event(wxEVT_COMMAND_WEBVIEW_TITLE_CHANGED,
+    wxWebViewEvent event(wxEVT_WEBVIEW_TITLE_CHANGED,

                          webKitWindow->GetId(),
                          webKitWindow->GetCurrentURL(),
                          target);
                          webKitWindow->GetId(),
                          webKitWindow->GetCurrentURL(),
                          target);


@@ -1224,7 +1224,7 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
     webKitWindow->m_busy = true;
     NSString *url = [[request URL] absoluteString];
     wxString target = wxStringWithNSString([frame name]);
     webKitWindow->m_busy = true;
     NSString *url = [[request URL] absoluteString];
     wxString target = wxStringWithNSString([frame name]);

-    wxWebViewEvent event(wxEVT_COMMAND_WEBVIEW_NAVIGATING,
+    wxWebViewEvent event(wxEVT_WEBVIEW_NAVIGATING,

                          webKitWindow->GetId(),
                          wxStringWithNSString( url ), target);
 
                          webKitWindow->GetId(),
                          wxStringWithNSString( url ), target);
 


@@ -1251,7 +1251,7 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
     wxUnusedVar(actionInformation);
 
     NSString *url = [[request URL] absoluteString];
     wxUnusedVar(actionInformation);
 
     NSString *url = [[request URL] absoluteString];

-    wxWebViewEvent event(wxEVT_COMMAND_WEBVIEW_NEWWINDOW,
+    wxWebViewEvent event(wxEVT_WEBVIEW_NEWWINDOW,

                          webKitWindow->GetId(),
                          wxStringWithNSString( url ), "");
 
                          webKitWindow->GetId(),
                          wxStringWithNSString( url ), "");
 


@@ -1291,9 +1291,23 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
     NSURLRequest *request = [self request];
        NSString* path = [[request URL] absoluteString];
 
     NSURLRequest *request = [self request];
        NSString* path = [[request URL] absoluteString];
 

+    id<NSURLProtocolClient> client = [self client];
+

     wxString wxpath = wxStringWithNSString(path);
     wxString scheme = wxStringWithNSString([[request URL] scheme]);
     wxFSFile* file = g_stringHandlerMap[scheme]->GetFile(wxpath);
     wxString wxpath = wxStringWithNSString(path);
     wxString scheme = wxStringWithNSString([[request URL] scheme]);
     wxFSFile* file = g_stringHandlerMap[scheme]->GetFile(wxpath);

+
+    if (!file)
+    {
+        NSError *error = [[NSError alloc] initWithDomain:NSURLErrorDomain
+                            code:NSURLErrorFileDoesNotExist
+                            userInfo:nil];
+
+        [client URLProtocol:self didFailWithError:error];
+
+        return;
+    }
+

     size_t length = file->GetStream()->GetLength();
 
 
     size_t length = file->GetStream()->GetLength();
 
 


@@ -1307,8 +1321,6 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
     file->GetStream()->Read(buffer, length);
     NSData *data = [[NSData alloc] initWithBytesNoCopy:buffer length:length];
 
     file->GetStream()->Read(buffer, length);
     NSData *data = [[NSData alloc] initWithBytesNoCopy:buffer length:length];
 

-    id<NSURLProtocolClient> client = [self client];
-

     //We do not support caching anything yet
        [client URLProtocol:self didReceiveResponse:response
             cacheStoragePolicy:NSURLCacheStorageNotAllowed];
     //We do not support caching anything yet
        [client URLProtocol:self didReceiveResponse:response
             cacheStoragePolicy:NSURLCacheStorageNotAllowed];