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

Const correct the wxWebView api.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-08-17 10:26:09 +00:00
parent 49f07becce
commit e669ddde23
8 changed files with 151 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,60 +63,60 @@ public:
void ZoomIn();
void ZoomOut();
void SetWebkitZoom(float level);
float GetWebkitZoom();
float GetWebkitZoom() const;
virtual void Stop();
virtual void LoadUrl(const wxString& url);
virtual void GoBack();
virtual void GoForward();
virtual void Reload(wxWebViewReloadFlags flags = wxWEB_VIEW_RELOAD_DEFAULT);
virtual bool CanGoBack();
virtual bool CanGoForward();
virtual bool CanGoBack() const;
virtual bool CanGoForward() const;
virtual void ClearHistory();
virtual void EnableHistory(bool enable = true);
virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetBackwardHistory();
virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetForwardHistory();
virtual void LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item);
virtual wxString GetCurrentURL();
virtual wxString GetCurrentTitle();
virtual wxString GetPageSource();
virtual wxString GetPageText();
virtual wxString GetCurrentURL() const;
virtual wxString GetCurrentTitle() const;
virtual wxString GetPageSource() const;
virtual wxString GetPageText() const;
//We do not want to hide the other overloads
using wxWebView::SetPage;
virtual void SetPage(const wxString& html, const wxString& baseUrl);
virtual void Print();
virtual bool IsBusy();
virtual bool IsBusy() const;
void SetZoomType(wxWebViewZoomType);
wxWebViewZoomType GetZoomType() const;
bool CanSetZoomType(wxWebViewZoomType) const;
virtual wxWebViewZoom GetZoom();
virtual wxWebViewZoom GetZoom() const;
virtual void SetZoom(wxWebViewZoom);
//Clipboard functions
virtual bool CanCut();
virtual bool CanCopy();
virtual bool CanPaste();
virtual bool CanCut() const;
virtual bool CanCopy() const;
virtual bool CanPaste() const;
virtual void Cut();
virtual void Copy();
virtual void Paste();
//Undo / redo functionality
virtual bool CanUndo();
virtual bool CanRedo();
virtual bool CanUndo() const;
virtual bool CanRedo() const;
virtual void Undo();
virtual void Redo();
//Editing functions
virtual void SetEditable(bool enable = true);
virtual bool IsEditable();
virtual bool IsEditable() const;
//Selection
virtual void DeleteSelection();
virtual bool HasSelection();
virtual bool HasSelection() const;
virtual void SelectAll();
virtual wxString GetSelectedText();
virtual wxString GetSelectedSource();
virtual wxString GetSelectedText() const;
virtual wxString GetSelectedSource() const;
virtual void ClearSelection();
virtual void RunScript(const wxString& javascript);

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

@@ -54,8 +54,8 @@ public:
virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetBackwardHistory();
virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetForwardHistory();
virtual bool CanGoForward();
virtual bool CanGoBack();
virtual bool CanGoForward() const;
virtual bool CanGoBack() const;
virtual void GoBack();
virtual void GoForward();
virtual void ClearHistory();
@@ -63,12 +63,12 @@ public:
virtual void Stop();
virtual void Reload(wxWebViewReloadFlags flags = wxWEB_VIEW_RELOAD_DEFAULT);
virtual wxString GetPageSource();
virtual wxString GetPageText();
virtual wxString GetPageSource() const;
virtual wxString GetPageText() const;
virtual bool IsBusy();
virtual wxString GetCurrentURL();
virtual wxString GetCurrentTitle();
virtual bool IsBusy() const;
virtual wxString GetCurrentURL() const;
virtual wxString GetCurrentTitle() const;
virtual void SetZoomType(wxWebViewZoomType);
virtual wxWebViewZoomType GetZoomType() const;
@@ -78,33 +78,33 @@ public:
virtual void SetPage(const wxString& html, const wxString& baseUrl);
virtual wxWebViewZoom GetZoom();
virtual wxWebViewZoom GetZoom() const;
virtual void SetZoom(wxWebViewZoom zoom);
//Clipboard functions
virtual bool CanCut();
virtual bool CanCopy();
virtual bool CanPaste();
virtual bool CanCut() const;
virtual bool CanCopy() const;
virtual bool CanPaste() const;
virtual void Cut();
virtual void Copy();
virtual void Paste();
//Undo / redo functionality
virtual bool CanUndo();
virtual bool CanRedo();
virtual bool CanUndo() const;
virtual bool CanRedo() const;
virtual void Undo();
virtual void Redo();
//Editing functions
virtual void SetEditable(bool enable = true);
virtual bool IsEditable();
virtual bool IsEditable() const;
//Selection
virtual void SelectAll();
virtual bool HasSelection();
virtual bool HasSelection() const;
virtual void DeleteSelection();
virtual wxString GetSelectedText();
virtual wxString GetSelectedSource();
virtual wxString GetSelectedText() const;
virtual wxString GetSelectedSource() const;
virtual void ClearSelection();
virtual void RunScript(const wxString& javascript);
@@ -118,10 +118,10 @@ public:
bool IsOfflineMode();
void SetOfflineMode(bool offline);
wxWebViewZoom GetIETextZoom();
wxWebViewZoom GetIETextZoom() const;
void SetIETextZoom(wxWebViewZoom level);
wxWebViewZoom GetIEOpticalZoom();
wxWebViewZoom GetIEOpticalZoom() const;
void SetIEOpticalZoom(wxWebViewZoom level);
void onActiveXEvent(wxActiveXEvent& evt);
@@ -153,9 +153,9 @@ private:
bool m_historyEnabled;
//Generic helper functions for IHtmlDocument commands
bool CanExecCommand(wxString command);
bool CanExecCommand(wxString command) const;
void ExecCommand(wxString command);
IHTMLDocument2* GetDocument();
IHTMLDocument2* GetDocument() const;
wxDECLARE_DYNAMIC_CLASS(wxWebViewIE);
};

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

@@ -51,14 +51,14 @@ public:
const wxString& name = wxWebViewNameStr);
virtual ~wxWebViewWebKit();
virtual bool CanGoBack();
virtual bool CanGoForward();
virtual bool CanGoBack() const;
virtual bool CanGoForward() const;
virtual void GoBack();
virtual void GoForward();
virtual void Reload(wxWebViewReloadFlags flags = wxWEB_VIEW_RELOAD_DEFAULT);
virtual void Stop();
virtual wxString GetPageSource();
virtual wxString GetPageText();
virtual wxString GetPageSource() const;
virtual wxString GetPageText() const;
//We do not want to hide the other overloads
using wxWebView::SetPage;
@@ -67,16 +67,16 @@ public:
virtual void Print();
virtual void LoadUrl(const wxString& url);
virtual wxString GetCurrentURL();
virtual wxString GetCurrentTitle();
virtual wxWebViewZoom GetZoom();
virtual wxString GetCurrentURL() const;
virtual wxString GetCurrentTitle() const;
virtual wxWebViewZoom GetZoom() const;
virtual void SetZoom(wxWebViewZoom zoom);
virtual void SetZoomType(wxWebViewZoomType zoomType);
virtual wxWebViewZoomType GetZoomType() const;
virtual bool CanSetZoomType(wxWebViewZoomType type) const;
virtual bool IsBusy() { return m_busy; }
virtual bool IsBusy() const { return m_busy; }
//History functions
virtual void ClearHistory();
@@ -86,29 +86,29 @@ public:
virtual void LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item);
//Undo / redo functionality
virtual bool CanUndo();
virtual bool CanRedo();
virtual bool CanUndo() const;
virtual bool CanRedo() const;
virtual void Undo();
virtual void Redo();
//Clipboard functions
virtual bool CanCut() { return false; }
virtual bool CanCopy() { return false; }
virtual bool CanPaste() { return false; }
virtual bool CanCut() const { return false; }
virtual bool CanCopy() const { return false; }
virtual bool CanPaste() const { return false; }
virtual void Cut();
virtual void Copy();
virtual void Paste();
//Editing functions
virtual void SetEditable(bool enable = true);
virtual bool IsEditable();
virtual bool IsEditable() const;
//Selection
virtual void DeleteSelection();
virtual bool HasSelection();
virtual bool HasSelection() const;
virtual void SelectAll();
virtual wxString GetSelectedText();
virtual wxString GetSelectedSource();
virtual wxString GetSelectedText() const;
virtual wxString GetSelectedSource() const;
virtual void ClearSelection();
void RunScript(const wxString& javascript);
@@ -117,17 +117,17 @@ public:
virtual void RegisterHandler(wxSharedPtr<wxWebViewHandler> handler);
// ---- methods not from the parent (common) interface
bool CanGetPageSource();
bool CanGetPageSource() const;
void SetScrollPos(int pos);
int GetScrollPos();
bool CanIncreaseTextSize();
bool CanIncreaseTextSize() const;
void IncreaseTextSize();
bool CanDecreaseTextSize();
bool CanDecreaseTextSize() const;
void DecreaseTextSize();
float GetWebkitZoom();
float GetWebkitZoom() const;
void SetWebkitZoom(float zoom);
// don't hide base class virtuals

34
include/wx/webview.h
View File

@@ -165,12 +165,12 @@ public:
/** Get whether it is possible to navigate back in the history of
* visited pages
*/
virtual bool CanGoBack() = 0;
virtual bool CanGoBack() const = 0;
/** Get whether it is possible to navigate forward in the history of
* visited pages
*/
virtual bool CanGoForward() = 0;
virtual bool CanGoForward() const = 0;
/** Navigate back in the history of visited pages.
* Only valid if CanGoBack() returned true.
@@ -214,13 +214,13 @@ public:
/**
* Get the URL of the currently displayed document
*/
virtual wxString GetCurrentURL() = 0;
virtual wxString GetCurrentURL() const = 0;
/**
* Get the title of the current web page, or its URL/path if title is not
* available
*/
virtual wxString GetCurrentTitle() = 0;
virtual wxString GetCurrentTitle() const = 0;
// TODO: handle choosing a frame when calling GetPageSource()?
/**
@@ -228,14 +228,14 @@ public:
* @return the HTML source code, or an empty string if no page is currently
* shown
*/
virtual wxString GetPageSource() = 0;
virtual wxString GetPageText() = 0;
virtual wxString GetPageSource() const = 0;
virtual wxString GetPageText() const = 0;
/**
* Get the zoom factor of the page
* @return How much the HTML document is zoomed (scaleed)
*/
virtual wxWebViewZoom GetZoom() = 0;
virtual wxWebViewZoom GetZoom() const = 0;
/**
* Set the zoom factor of the page
@@ -290,13 +290,13 @@ public:
}
virtual void SetEditable(bool enable = true) = 0;
virtual bool IsEditable() = 0;
virtual bool IsEditable() const = 0;
virtual void SelectAll() = 0;
virtual bool HasSelection() = 0;
virtual bool HasSelection() const = 0;
virtual void DeleteSelection() = 0;
virtual wxString GetSelectedText() = 0;
virtual wxString GetSelectedSource() = 0;
virtual wxString GetSelectedText() const = 0;
virtual wxString GetSelectedSource() const = 0;
virtual void ClearSelection() = 0;
virtual void RunScript(const wxString& javascript) = 0;
@@ -325,19 +325,19 @@ public:
/**
* Returns whether the web control is currently busy (e.g. loading a page)
*/
virtual bool IsBusy() = 0;
virtual bool IsBusy() const = 0;
//Clipboard functions
virtual bool CanCut() = 0;
virtual bool CanCopy() = 0;
virtual bool CanPaste() = 0;
virtual bool CanCut() const = 0;
virtual bool CanCopy() const = 0;
virtual bool CanPaste() const = 0;
virtual void Cut() = 0;
virtual void Copy() = 0;
virtual void Paste() = 0;
//Undo / redo functionality
virtual bool CanUndo() = 0;
virtual bool CanRedo() = 0;
virtual bool CanUndo() const = 0;
virtual bool CanRedo() const = 0;
virtual void Undo() = 0;
virtual void Redo() = 0;