From 97ba4d81a8632ed8e02946d1f3edf8c4baf8d46e Mon Sep 17 00:00:00 2001 From: Steve Lamerton Date: Wed, 13 Jul 2011 15:30:25 +0000 Subject: [PATCH] Rename GetSelectedHTML to GetSelectedSource, this brings it into line with GetPageSource, and also with its intended use. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/webview_webkit.h | 2 +- include/wx/msw/webview_ie.h | 2 +- include/wx/osx/webview_webkit.h | 2 +- include/wx/webview.h | 2 +- interface/wx/webview.h | 4 ++-- src/gtk/webview_webkit.cpp | 2 +- src/msw/webview_ie.cpp | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/wx/gtk/webview_webkit.h b/include/wx/gtk/webview_webkit.h index a98d3a3fa3..d1c717e3a9 100644 --- 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 wxString GetSelectedHTML(); + virtual wxString GetSelectedSource(); /** 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 0968683fb5..9e0132187e 100644 --- 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 wxString GetSelectedHTML(); + virtual wxString GetSelectedSource(); // ---- IE-specific methods diff --git a/include/wx/osx/webview_webkit.h b/include/wx/osx/webview_webkit.h index db43f35a3e..dcab0e31a0 100644 --- 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 wxString GetSelectedHTML() { return ""; } + virtual wxString GetSelectedSource() { return ""; } // ---- 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 5514cf10a1..1d448e9e9c 100644 --- 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 wxString GetSelectedHTML() = 0; + virtual wxString GetSelectedSource() = 0; // TODO: // void EnableJavascript(bool enabled); // maybe? diff --git a/interface/wx/webview.h b/interface/wx/webview.h index 0fb9ca6148..3f521c6e69 100644 --- a/interface/wx/webview.h +++ b/interface/wx/webview.h @@ -394,9 +394,9 @@ public: 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. diff --git a/src/gtk/webview_webkit.cpp b/src/gtk/webview_webkit.cpp index 8359ecd301..f81872e412 100644 --- a/src/gtk/webview_webkit.cpp +++ b/src/gtk/webview_webkit.cpp @@ -743,7 +743,7 @@ wxString wxWebViewWebKit::GetSelectedText() wxConvUTF8); } -wxString wxWebViewWebKit::GetSelectedHTML() +wxString wxWebViewWebKit::GetSelectedSource() { WebKitDOMDocument* doc; WebKitDOMDOMWindow* win; diff --git a/src/msw/webview_ie.cpp b/src/msw/webview_ie.cpp index b0ead6e81c..9cbb0b74ca 100644 --- a/src/msw/webview_ie.cpp +++ b/src/msw/webview_ie.cpp @@ -614,7 +614,7 @@ wxString wxWebViewIE::GetSelectedText() return selected; } -wxString wxWebViewIE::GetSelectedHTML() +wxString wxWebViewIE::GetSelectedSource() { IHTMLDocument2* document = GetDocument(); IHTMLSelectionObject* selection; -- 2.45.2