Rename LoadUrl to LoadURL. This corrects the capitalisation as it is an acronym, and brings it into line with GetCurrentURL.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-08-17 10:55:59 +00:00
parent 9af5122202
commit 4d0dddc7ad
9 changed files with 14 additions and 14 deletions

View File

@@ -61,7 +61,7 @@ public:
}
virtual void Stop();
virtual void LoadUrl(const wxString& url);
virtual void LoadURL(const wxString& url);
virtual void GoBack();
virtual void GoForward();
virtual void Reload(wxWebViewReloadFlags flags = wxWEB_VIEW_RELOAD_DEFAULT);

View File

@@ -49,7 +49,7 @@ public:
long style = 0,
const wxString& name = wxWebViewNameStr);
virtual void LoadUrl(const wxString& url);
virtual void LoadURL(const wxString& url);
virtual void LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item);
virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetBackwardHistory();
virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetForwardHistory();

View File

@@ -66,7 +66,7 @@ public:
virtual void Print();
virtual void LoadUrl(const wxString& url);
virtual void LoadURL(const wxString& url);
virtual wxString GetCurrentURL() const;
virtual wxString GetCurrentTitle() const;
virtual wxWebViewZoom GetZoom() const;

View File

@@ -113,7 +113,7 @@ public:
virtual wxString GetPageText() const = 0;
virtual bool IsBusy() const = 0;
virtual bool IsEditable() const = 0;
virtual void LoadUrl(const wxString& url) = 0;
virtual void LoadURL(const wxString& url) = 0;
virtual void Print() = 0;
virtual void RegisterHandler(wxSharedPtr<wxWebViewHandler> handler) = 0;
virtual void Reload(wxWebViewReloadFlags flags = wxWEB_VIEW_RELOAD_DEFAULT) = 0;

View File

@@ -331,7 +331,7 @@ public:
to know whether loading the URL was successful, register to receive
navigation error events.
*/
virtual void LoadUrl(const wxString& url) = 0;
virtual void LoadURL(const wxString& url) = 0;
/**
Opens a print dialog so that the user may print the currently

View File

@@ -423,7 +423,7 @@ void WebFrame::UpdateState()
*/
void WebFrame::OnUrl(wxCommandEvent& WXUNUSED(evt))
{
m_browser->LoadUrl( m_url->GetValue() );
m_browser->LoadURL( m_url->GetValue() );
UpdateState();
}
@@ -513,7 +513,7 @@ void WebFrame::OnLoadScheme(wxCommandEvent& WXUNUSED(evt))
//Under MSW we need to flip the slashes
path.Replace("\\", "/");
path = "wxfs:///" + path + ";protocol=zip/doc.htm";
m_browser->LoadUrl(path);
m_browser->LoadURL(path);
}
/**
@@ -572,7 +572,7 @@ void WebFrame::OnNewWindow(wxWebViewEvent& evt)
//If we handle new window events then just load them in this window as we
//are a single window browser
if(m_tools_handle_new_window->IsChecked())
m_browser->LoadUrl(evt.GetURL());
m_browser->LoadURL(evt.GetURL());
UpdateState();
}

View File

@@ -497,7 +497,7 @@ void wxWebViewWebKit::Reload(wxWebViewReloadFlags flags)
}
}
void wxWebViewWebKit::LoadUrl(const wxString& url)
void wxWebViewWebKit::LoadURL(const wxString& url)
{
webkit_web_view_load_uri(WEBKIT_WEB_VIEW(web_view), wxGTK_CONV(url));
}

View File

@@ -75,12 +75,12 @@ bool wxWebViewIE::Create(wxWindow* parent,
SetBackgroundStyle(wxBG_STYLE_PAINT);
SetDoubleBuffered(true);
LoadUrl(url);
LoadURL(url);
return true;
}
void wxWebViewIE::LoadUrl(const wxString& url)
void wxWebViewIE::LoadURL(const wxString& url)
{
m_ie.CallMethod("Navigate", (BSTR) url.wc_str(), NULL, NULL, NULL, NULL);
}
@@ -337,7 +337,7 @@ void wxWebViewIE::LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item)
wxASSERT_MSG(pos != static_cast<int>(m_historyList.size()),
"invalid history item");
m_historyLoadingFromList = true;
LoadUrl(item->GetUrl());
LoadURL(item->GetUrl());
m_historyPosition = pos;
}

View File

@@ -389,7 +389,7 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
//Register our own class for custom scheme handling
[NSURLProtocol registerClass:[WebViewCustomProtocol class]];
LoadUrl(strURL);
LoadURL(strURL);
return true;
}
@@ -735,7 +735,7 @@ void wxWebViewWebKit::MacVisibilityChanged(){
#endif
}
void wxWebViewWebKit::LoadUrl(const wxString& url)
void wxWebViewWebKit::LoadURL(const wxString& url)
{
[[m_webView mainFrame] loadRequest:[NSURLRequest requestWithURL:
[NSURL URLWithString:wxNSStringWithWxString(url)]]];