Rename GetSelectedHTML to GetSelectedSource, this brings it into line with GetPageSou...

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

diff --git a/include/wx/gtk/webview_webkit.h b/include/wx/gtk/webview_webkit.h
index a98d3a3fa3a6da6b4c896de7781d0dec3c633ca5..d1c717e3a9ddd076822d5f77e8939ad6414211c4 100644 (file)
--- a/include/wx/gtk/webview_webkit.h
+++ b/include/wx/gtk/webview_webkit.h
@@ -145,7 +145,7 @@ public:
     virtual bool HasSelection();
     virtual void SelectAll();
     virtual wxString GetSelectedText();
     virtual bool HasSelection();
     virtual void SelectAll();
     virtual wxString GetSelectedText();

-    virtual wxString GetSelectedHTML();
+    virtual wxString GetSelectedSource();

 
     /** FIXME: hack to work around signals being received too early */
     bool m_ready;
 
     /** FIXME: hack to work around signals being received too early */
     bool m_ready;

diff --git a/include/wx/msw/webview_ie.h b/include/wx/msw/webview_ie.h
index 0968683fb51d2f20b7aa9d9e13f5f5732d20fc0e..9e0132187ef7ec97bb823320764bf8b0b114f63a 100644 (file)
--- a/include/wx/msw/webview_ie.h
+++ b/include/wx/msw/webview_ie.h
@@ -102,7 +102,7 @@ public:
     virtual bool HasSelection();
     virtual void DeleteSelection();
     virtual wxString GetSelectedText();
     virtual bool HasSelection();
     virtual void DeleteSelection();
     virtual wxString GetSelectedText();

-    virtual wxString GetSelectedHTML();
+    virtual wxString GetSelectedSource();

 
 
     // ---- IE-specific methods
 
 
     // ---- IE-specific methods

diff --git a/include/wx/osx/webview_webkit.h b/include/wx/osx/webview_webkit.h
index db43f35a3ee3b0f6768945003a2bc45345476157..dcab0e31a0b5ea9d40de7914bafaf34ddde0a2cc 100644 (file)
--- a/include/wx/osx/webview_webkit.h
+++ b/include/wx/osx/webview_webkit.h
@@ -107,7 +107,7 @@ public:
     virtual bool HasSelection() { return false };
     virtual void SelectAll() {};
     virtual wxString GetSelectedText();
     virtual bool HasSelection() { return false };
     virtual void SelectAll() {};
     virtual wxString GetSelectedText();

-    virtual wxString GetSelectedHTML() { return ""; }
+    virtual wxString GetSelectedSource() { return ""; }

 
     // ---- methods not from the parent (common) interface
     wxString RunScript(const wxString& javascript);
 
     // ---- methods not from the parent (common) interface
     wxString RunScript(const wxString& javascript);

diff --git a/include/wx/webview.h b/include/wx/webview.h
index 5514cf10a1fa9b5ef640b99285bdff0ef6637db8..1d448e9e9cd2a4eb65116e99985c724a7e58cf71 100644 (file)
--- a/include/wx/webview.h
+++ b/include/wx/webview.h
@@ -288,7 +288,7 @@ public:
     virtual bool HasSelection() = 0;
     virtual void DeleteSelection() = 0;
     virtual wxString GetSelectedText() = 0;
     virtual bool HasSelection() = 0;
     virtual void DeleteSelection() = 0;
     virtual wxString GetSelectedText() = 0;

-    virtual wxString GetSelectedHTML() = 0;
+    virtual wxString GetSelectedSource() = 0;

 
     // TODO:
     //     void EnableJavascript(bool enabled);             // maybe?
 
     // TODO:
     //     void EnableJavascript(bool enabled);             // maybe?

diff --git a/interface/wx/webview.h b/interface/wx/webview.h
index 0fb9ca61485c83c43f828f33a2d13a2d115fbd98..3f521c6e69d2b13c0f062b03063dbcf7177324c0 100644 (file)
--- a/interface/wx/webview.h
+++ b/interface/wx/webview.h
@@ -394,9 +394,9 @@ public:
     virtual void DeleteSelection() = 0;
     
     /**
     virtual void DeleteSelection() = 0;
     
     /**

-        Returns the currently selected HTML, if any.
+        Returns the currently selected source, if any.

     */
     */

-    virtual wxString GetSelectedHTML() = 0;
+    virtual wxString GetSelectedSource() = 0;

     
     /**
         Returns the currently selected text, if any.
     
     /**
         Returns the currently selected text, if any.

diff --git a/src/gtk/webview_webkit.cpp b/src/gtk/webview_webkit.cpp
index 8359ecd301a0ec384c9b80130294c6802d7b1c33..f81872e41205976b3040823dc304ff98c62fbac1 100644 (file)
--- a/src/gtk/webview_webkit.cpp
+++ b/src/gtk/webview_webkit.cpp
@@ -743,7 +743,7 @@ wxString wxWebViewWebKit::GetSelectedText()
                     wxConvUTF8);
 }
 
                     wxConvUTF8);
 }
 

-wxString wxWebViewWebKit::GetSelectedHTML()
+wxString wxWebViewWebKit::GetSelectedSource()

 {
     WebKitDOMDocument* doc; 
     WebKitDOMDOMWindow* win;
 {
     WebKitDOMDocument* doc; 
     WebKitDOMDOMWindow* win;

diff --git a/src/msw/webview_ie.cpp b/src/msw/webview_ie.cpp
index b0ead6e81c1e37367576e974ddf672b239ef4301..9cbb0b74ca8c555911e8d1cc7c1bec7f07391cd0 100644 (file)
--- a/src/msw/webview_ie.cpp
+++ b/src/msw/webview_ie.cpp
@@ -614,7 +614,7 @@ wxString wxWebViewIE::GetSelectedText()
     return selected;
 }
 
     return selected;
 }
 

-wxString wxWebViewIE::GetSelectedHTML()
+wxString wxWebViewIE::GetSelectedSource()

 {
     IHTMLDocument2* document = GetDocument();
     IHTMLSelectionObject* selection;
 {
     IHTMLDocument2* document = GetDocument();
     IHTMLSelectionObject* selection;