From 895e112c7cae99f635f17cc86336916b952c90ca Mon Sep 17 00:00:00 2001 From: Steve Lamerton Date: Fri, 5 Aug 2011 18:58:38 +0000 Subject: [PATCH] Remove redundant InternalLoadURL method. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/osx/webview_webkit.h | 2 -- src/osx/webview_webkit.mm | 14 +++----------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/include/wx/osx/webview_webkit.h b/include/wx/osx/webview_webkit.h index 34f34f104b..29131c2912 100644 --- a/include/wx/osx/webview_webkit.h +++ b/include/wx/osx/webview_webkit.h @@ -51,8 +51,6 @@ public: const wxString& name = wxWebViewNameStr); virtual ~wxWebViewWebKit(); - void InternalLoadURL(const wxString &url); - virtual bool CanGoBack(); virtual bool CanGoForward(); virtual void GoBack(); diff --git a/src/osx/webview_webkit.mm b/src/osx/webview_webkit.mm index 7f988de144..5419036450 100644 --- a/src/osx/webview_webkit.mm +++ b/src/osx/webview_webkit.mm @@ -440,7 +440,7 @@ bool wxWebViewWebKit::Create(wxWindow *parent, [m_webView setPolicyDelegate:myPolicyDelegate]; - InternalLoadURL(strURL); + LoadUrl(strURL); return true; } @@ -462,15 +462,6 @@ wxWebViewWebKit::~wxWebViewWebKit() // public methods // ---------------------------------------------------------------------------- -void wxWebViewWebKit::InternalLoadURL(const wxString &url) -{ - if( !m_webView ) - return; - - [[m_webView mainFrame] loadRequest:[NSURLRequest requestWithURL: - [NSURL URLWithString:wxNSStringWithWxString(url)]]]; -} - bool wxWebViewWebKit::CanGoBack() { if ( !m_webView ) @@ -803,7 +794,8 @@ void wxWebViewWebKit::MacVisibilityChanged(){ void wxWebViewWebKit::LoadUrl(const wxString& url) { - InternalLoadURL(url); + [[m_webView mainFrame] loadRequest:[NSURLRequest requestWithURL: + [NSURL URLWithString:wxNSStringWithWxString(url)]]]; } wxString wxWebViewWebKit::GetCurrentURL() -- 2.45.2