From 7bd30a12ade503fd135c686ecc98a6f6d5fecbeb Mon Sep 17 00:00:00 2001 From: Steve Lamerton Date: Tue, 2 Aug 2011 09:44:07 +0000 Subject: [PATCH] Implement HasSelection for the OSX WebKit backend. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/osx/webview_webkit.h | 2 +- src/osx/webview_webkit.mm | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/include/wx/osx/webview_webkit.h b/include/wx/osx/webview_webkit.h index ae985910a4..cf873771a7 100644 --- a/include/wx/osx/webview_webkit.h +++ b/include/wx/osx/webview_webkit.h @@ -111,7 +111,7 @@ public: //Selection virtual void DeleteSelection(); - virtual bool HasSelection() { return false; }; + virtual bool HasSelection(); virtual void SelectAll() {}; virtual wxString GetSelectedText(); virtual wxString GetSelectedSource() { return ""; } diff --git a/src/osx/webview_webkit.mm b/src/osx/webview_webkit.mm index 52d7e7de47..93e345dcc2 100644 --- a/src/osx/webview_webkit.mm +++ b/src/osx/webview_webkit.mm @@ -940,11 +940,24 @@ void wxWebViewWebKit::DeleteSelection() [(WebView*)m_webView deleteSelection]; } +bool wxWebViewWebKit::HasSelection() +{ + DOMRange* range = [m_webView selectedDOMRange]; + if(!range) + { + return false; + } + else + { + return true; + } +} + void wxWebViewWebKit::EnableHistory(bool enable) { if ( !m_webView ) return; - + [m_webView setMaintainsBackForwardList:enable]; } -- 2.47.2