Remove redundant InternalLoadURL method.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/osx/webview_webkit.h b/include/wx/osx/webview_webkit.h
index 34f34f104ba7d731003c0bbbbd1db17091adfac3..29131c291210edb4e4c8b01ec92aa3bbed2523a4 100644 (file)
--- 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();
 
                 const wxString& name = wxWebViewNameStr);
     virtual ~wxWebViewWebKit();
 

-    void InternalLoadURL(const wxString &url);
-

     virtual bool CanGoBack();
     virtual bool CanGoForward();
     virtual void GoBack();
     virtual bool CanGoBack();
     virtual bool CanGoForward();
     virtual void GoBack();

diff --git a/src/osx/webview_webkit.mm b/src/osx/webview_webkit.mm
index 7f988de14466f8d73f2b7aeb108b857d4e286819..541903645014d6e17fdbba3fc7b1ca794af2ee0f 100644 (file)
--- 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];
 
 
     [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()
 {
     if ( !m_webView )
 bool wxWebViewWebKit::CanGoBack()
 {
     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()