Rename LoadUrl to LoadURL. This corrects the capitalisation as it is an acronym,...

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 3bd95f94edabf722f46159f8fcf91a1ae540f6a7..63e45346feae7febf2cf8d3028de20b434e9aee3 100644 (file)
--- a/include/wx/gtk/webview_webkit.h
+++ b/include/wx/gtk/webview_webkit.h
@@ -61,7 +61,7 @@ public:
     }
 
     virtual void Stop();
     }
 
     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);
     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 d6cc296e49e1de31ee7385bef9864cd8a29c7016..270493c0f4d1e82019b54da72e31aa50546f10a8 100644 (file)
--- 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);
 
            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();
     virtual void LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item);
     virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetBackwardHistory();
     virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetForwardHistory();

diff --git a/include/wx/osx/webview_webkit.h b/include/wx/osx/webview_webkit.h
index 491d0d723c357166758c937bdb86927d84348a4f..7ece4240316d3c9a4dc805e6ac901d7832d7c795 100644 (file)
--- a/include/wx/osx/webview_webkit.h
+++ b/include/wx/osx/webview_webkit.h
@@ -66,7 +66,7 @@ public:
 
     virtual void Print();
 
 
     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;
     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 bede4d2ef9b4307b464bc4fac2ac14ffdb08fb70..e58cf881f9f07257f9b6cb737ec8b2a771a7841d 100644 (file)
--- 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 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;
     virtual void Print() = 0;
     virtual void RegisterHandler(wxSharedPtr<wxWebViewHandler> 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 c44532af0b52738be7d7df114d932c34fbbd0e65..1b266bb013c799a8a17746ed3aa8325349520734 100644 (file)
--- 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.
     */
             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
 
     /**
         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 035dba21b08d7c8f6657a8e8236bcadd99732ef0..7c87795e60a2f3131c34975971f13c4a4737ee93 100644 (file)
--- a/samples/web/web.cpp
+++ b/samples/web/web.cpp
@@ -423,7 +423,7 @@ void WebFrame::UpdateState()
   */
 void WebFrame::OnUrl(wxCommandEvent& WXUNUSED(evt))
 {
   */
 void WebFrame::OnUrl(wxCommandEvent& WXUNUSED(evt))
 {

-    m_browser->LoadUrl( m_url->GetValue() );
+    m_browser->LoadURL( m_url->GetValue() );

     UpdateState();
 }
 
     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";
     //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())
     //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();
 }
 
     UpdateState();
 }

diff --git a/src/gtk/webview_webkit.cpp b/src/gtk/webview_webkit.cpp
index 8fb93faadaf50acb494c9018f81234a40d1e6992..5ac7a88fda62a464c567f157ecf82187747b67ba 100644 (file)
--- 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));
 }
 {
     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 06d57d9a05805f7cdd4b43553d0f36a5654014da..57b75b296c5512d7d6f7f8e5727b5e74b5240c1d 100644 (file)
--- 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);
 
     SetBackgroundStyle(wxBG_STYLE_PAINT);
     SetDoubleBuffered(true);

-    LoadUrl(url);
+    LoadURL(url);

     return true;
 }
 
 
     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);
 }
 {
     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;
     wxASSERT_MSG(pos != static_cast<int>(m_historyList.size()),
                  "invalid history item");
     m_historyLoadingFromList = true;

-    LoadUrl(item->GetUrl());
+    LoadURL(item->GetUrl());

     m_historyPosition = pos;
 }
 
     m_historyPosition = pos;
 }
 

diff --git a/src/osx/webview_webkit.mm b/src/osx/webview_webkit.mm
index c513eaa1a991fa85a8604e93c40f64d1e7fb43f8..745f0194e9f08be910458c227b4169a86c44dd1d 100644 (file)
--- 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]];
 
     //Register our own class for custom scheme handling
     [NSURLProtocol registerClass:[WebViewCustomProtocol class]];
 

-    LoadUrl(strURL);
+    LoadURL(strURL);

     return true;
 }
 
     return true;
 }
 


@@ -735,7 +735,7 @@ void wxWebViewWebKit::MacVisibilityChanged(){
 #endif
 }
 
 #endif
 }
 

-void wxWebViewWebKit::LoadUrl(const wxString& url)
+void wxWebViewWebKit::LoadURL(const wxString& url)

 {
     [[m_webView mainFrame] loadRequest:[NSURLRequest requestWithURL:
             [NSURL URLWithString:wxNSStringWithWxString(url)]]];
 {
     [[m_webView mainFrame] loadRequest:[NSURLRequest requestWithURL:
             [NSURL URLWithString:wxNSStringWithWxString(url)]]];