Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant InternalLoadURL method.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-08-05 18:58:38 +00:00
parent 4c552a824c
commit 895e112c7c
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/osx/webview_webkit.h
View File

@@ -51,8 +51,6 @@ public:
const wxString& name = wxWebViewNameStr); const wxString& name = wxWebViewNameStr);
virtual ~wxWebViewWebKit(); virtual ~wxWebViewWebKit();
void InternalLoadURL(const wxString &url);
virtual bool CanGoBack(); virtual bool CanGoBack();
virtual bool CanGoForward(); virtual bool CanGoForward();
virtual void GoBack(); virtual void GoBack();

14
src/osx/webview_webkit.mm
View File

@@ -440,7 +440,7 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
[m_webView setPolicyDelegate:myPolicyDelegate]; [m_webView setPolicyDelegate:myPolicyDelegate];
InternalLoadURL(strURL); LoadUrl(strURL);
return true; return true;
} }
@@ -462,15 +462,6 @@ wxWebViewWebKit::~wxWebViewWebKit()
// public methods // 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() bool wxWebViewWebKit::CanGoBack()
{ {
if ( !m_webView ) if ( !m_webView )
@@ -803,7 +794,8 @@ void wxWebViewWebKit::MacVisibilityChanged(){
void wxWebViewWebKit::LoadUrl(const wxString& url) void wxWebViewWebKit::LoadUrl(const wxString& url)
{ {
InternalLoadURL(url); [[m_webView mainFrame] loadRequest:[NSURLRequest requestWithURL:
[NSURL URLWithString:wxNSStringWithWxString(url)]]];
} }
wxString wxWebViewWebKit::GetCurrentURL() wxString wxWebViewWebKit::GetCurrentURL()