From 6a504e88df1b8fbb1b27dbba3f643b64bb3a1e69 Mon Sep 17 00:00:00 2001
From: Steve Lamerton <steve.lamerton@gmail.com>
Date: Fri, 5 Aug 2011 15:37:03 +0000
Subject: [PATCH] Implement ClearHistory using the built in WebBackForwardList
rather than a shared WebHistory on OSX.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
src/osx/webview_webkit.mm | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/osx/webview_webkit.mm b/src/osx/webview_webkit.mm
index e6923c2b50..392e81b722 100644
--- a/src/osx/webview_webkit.mm
+++ b/src/osx/webview_webkit.mm
@@ -440,10 +440,6 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
[[MyPolicyDelegate alloc] initWithWxWindow: this];
[m_webView setPolicyDelegate:myPolicyDelegate];
-
- // add history
- WebHistory* history = [[WebHistory alloc] init];
- [WebHistory setOptionalSharedHistory:history];
InternalLoadURL(strURL);
return true;
@@ -958,7 +954,8 @@ void wxWebViewWebKit::EnableHistory(bool enable)
void wxWebViewWebKit::ClearHistory()
{
- [[WebHistory optionalSharedHistory] removeAllItems];
+ [m_webView setMaintainsBackForwardList:NO];
+ [m_webView setMaintainsBackForwardList:YES];
}
bool wxWebViewWebKit::CanUndo()
--
2.49.0