fix building with WXWIN_COMPATIBILITY_2_8 == 0

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

diff --git a/src/osx/webview_webkit.mm b/src/osx/webview_webkit.mm
index 1609dfd59a388f83fd47f00e2939adb153256882..a311bb3d3489d984e12095dda8f93bc4dd0e95b7 100644 (file)
--- a/src/osx/webview_webkit.mm
+++ b/src/osx/webview_webkit.mm
@@ -5,7 +5,6 @@
 // Author:      Jethro Grassie / Kevin Ollivier / Marianne Gagnon
 // Modified by:
 // Created:     2004-4-16
 // Author:      Jethro Grassie / Kevin Ollivier / Marianne Gagnon
 // Modified by:
 // Created:     2004-4-16

-// RCS-ID:      $Id$

 // Copyright:   (c) Jethro Grassie / Kevin Ollivier / Marianne Gagnon
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Jethro Grassie / Kevin Ollivier / Marianne Gagnon
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -645,10 +644,11 @@ void wxWebViewWebKit::SetScrollPos(int pos)
 
 wxString wxWebViewWebKit::GetSelectedText() const
 {
 
 wxString wxWebViewWebKit::GetSelectedText() const
 {

-    NSString* selection = [[m_webView selectedDOMRange] markupString];
-    if (!selection) return wxEmptyString;
+    DOMRange* dr = [m_webView selectedDOMRange];
+    if ( !dr )
+        return wxString();

 
 

-    return wxStringWithNSString(selection);
+    return wxStringWithNSString([dr toString]);

 }
 
 void wxWebViewWebKit::RunScript(const wxString& javascript)
 }
 
 void wxWebViewWebKit::RunScript(const wxString& javascript)


@@ -905,13 +905,11 @@ void wxWebViewWebKit::SelectAll()
 
 wxString wxWebViewWebKit::GetSelectedSource() const
 {
 
 wxString wxWebViewWebKit::GetSelectedSource() const
 {

-    wxString script = ("var range = window.getSelection().getRangeAt(0);"
-                       "var element = document.createElement('div');"
-                       "element.appendChild(range.cloneContents());"
-                       "return element.innerHTML;");
-    NSString *result = [m_webView stringByEvaluatingJavaScriptFromString:
-                                  wxNSStringWithWxString(script)];
-    return wxStringWithNSString(result);
+    DOMRange* dr = [m_webView selectedDOMRange];
+    if ( !dr )
+        return wxString();
+
+    return wxStringWithNSString([dr markupString]);

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