Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename GetSelectedHTML to GetSelectedSource, this brings it into line with GetPageSource, and also with its intended use.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-07-13 15:30:25 +00:00
parent a9c153392c
commit 97ba4d81a8
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/gtk/webview_webkit.h
View File

@@ -145,7 +145,7 @@ public:
virtual bool HasSelection(); virtual bool HasSelection();
virtual void SelectAll(); virtual void SelectAll();
virtual wxString GetSelectedText(); virtual wxString GetSelectedText();
virtual wxString GetSelectedHTML(); virtual wxString GetSelectedSource();
/** FIXME: hack to work around signals being received too early */ /** FIXME: hack to work around signals being received too early */
bool m_ready; bool m_ready;

2
include/wx/msw/webview_ie.h
View File

@@ -102,7 +102,7 @@ public:
virtual bool HasSelection(); virtual bool HasSelection();
virtual void DeleteSelection(); virtual void DeleteSelection();
virtual wxString GetSelectedText(); virtual wxString GetSelectedText();
virtual wxString GetSelectedHTML(); virtual wxString GetSelectedSource();
// ---- IE-specific methods // ---- IE-specific methods

2
include/wx/osx/webview_webkit.h
View File

@@ -107,7 +107,7 @@ public:
virtual bool HasSelection() { return false }; virtual bool HasSelection() { return false };
virtual void SelectAll() {}; virtual void SelectAll() {};
virtual wxString GetSelectedText(); virtual wxString GetSelectedText();
virtual wxString GetSelectedHTML() { return ""; } virtual wxString GetSelectedSource() { return ""; }
// ---- methods not from the parent (common) interface // ---- methods not from the parent (common) interface
wxString RunScript(const wxString& javascript); wxString RunScript(const wxString& javascript);

2
include/wx/webview.h
View File

@@ -288,7 +288,7 @@ public:
virtual bool HasSelection() = 0; virtual bool HasSelection() = 0;
virtual void DeleteSelection() = 0; virtual void DeleteSelection() = 0;
virtual wxString GetSelectedText() = 0; virtual wxString GetSelectedText() = 0;
virtual wxString GetSelectedHTML() = 0; virtual wxString GetSelectedSource() = 0;
// TODO: // TODO:
// void EnableJavascript(bool enabled); // maybe? // void EnableJavascript(bool enabled); // maybe?

4
interface/wx/webview.h
View File

@@ -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.

2
src/gtk/webview_webkit.cpp
View File

@@ -743,7 +743,7 @@ wxString wxWebViewWebKit::GetSelectedText()
wxConvUTF8); wxConvUTF8);
} }
wxString wxWebViewWebKit::GetSelectedHTML() wxString wxWebViewWebKit::GetSelectedSource()
{ {
WebKitDOMDocument* doc; WebKitDOMDocument* doc;
WebKitDOMDOMWindow* win; WebKitDOMDOMWindow* win;

2
src/msw/webview_ie.cpp
View File

@@ -614,7 +614,7 @@ wxString wxWebViewIE::GetSelectedText()
return selected; return selected;
} }
wxString wxWebViewIE::GetSelectedHTML() wxString wxWebViewIE::GetSelectedSource()
{ {
IHTMLDocument2* document = GetDocument(); IHTMLDocument2* document = GetDocument();
IHTMLSelectionObject* selection; IHTMLSelectionObject* selection;