From: Steve Lamerton Date: Wed, 17 Aug 2011 10:55:59 +0000 (+0000) Subject: Rename LoadUrl to LoadURL. This corrects the capitalisation as it is an acronym,... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4d0dddc7adc82a29ea2fad2fc4e3781592f19d10?ds=inline 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 --- diff --git a/include/wx/gtk/webview_webkit.h b/include/wx/gtk/webview_webkit.h index 3bd95f94ed..63e45346fe 100644 --- a/include/wx/gtk/webview_webkit.h +++ b/include/wx/gtk/webview_webkit.h @@ -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); diff --git a/include/wx/msw/webview_ie.h b/include/wx/msw/webview_ie.h index d6cc296e49..270493c0f4 100644 --- a/include/wx/msw/webview_ie.h +++ b/include/wx/msw/webview_ie.h @@ -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 item); virtual wxVector > GetBackwardHistory(); virtual wxVector > GetForwardHistory(); diff --git a/include/wx/osx/webview_webkit.h b/include/wx/osx/webview_webkit.h index 491d0d723c..7ece424031 100644 --- a/include/wx/osx/webview_webkit.h +++ b/include/wx/osx/webview_webkit.h @@ -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; diff --git a/include/wx/webview.h b/include/wx/webview.h index bede4d2ef9..e58cf881f9 100644 --- a/include/wx/webview.h +++ b/include/wx/webview.h @@ -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 handler) = 0; virtual void Reload(wxWebViewReloadFlags flags = wxWEB_VIEW_RELOAD_DEFAULT) = 0; diff --git a/interface/wx/webview.h b/interface/wx/webview.h index c44532af0b..1b266bb013 100644 --- a/interface/wx/webview.h +++ b/interface/wx/webview.h @@ -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 diff --git a/samples/web/web.cpp b/samples/web/web.cpp index 035dba21b0..7c87795e60 100644 --- a/samples/web/web.cpp +++ b/samples/web/web.cpp @@ -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(); } diff --git a/src/gtk/webview_webkit.cpp b/src/gtk/webview_webkit.cpp index 8fb93faada..5ac7a88fda 100644 --- a/src/gtk/webview_webkit.cpp +++ b/src/gtk/webview_webkit.cpp @@ -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)); } diff --git a/src/msw/webview_ie.cpp b/src/msw/webview_ie.cpp index 06d57d9a05..57b75b296c 100644 --- a/src/msw/webview_ie.cpp +++ b/src/msw/webview_ie.cpp @@ -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 item) wxASSERT_MSG(pos != static_cast(m_historyList.size()), "invalid history item"); m_historyLoadingFromList = true; - LoadUrl(item->GetUrl()); + LoadURL(item->GetUrl()); m_historyPosition = pos; } diff --git a/src/osx/webview_webkit.mm b/src/osx/webview_webkit.mm index c513eaa1a9..745f0194e9 100644 --- a/src/osx/webview_webkit.mm +++ b/src/osx/webview_webkit.mm @@ -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)]]];