Mark overriden virtual methods with override

Also update signatures of two CEF overrides.
This commit is contained in:
Tobias Taschner 2018-02-05 10:27:51 +01:00
parent f1bb68f3fc
commit 08434378d7
No known key found for this signature in database
GPG key ID: AE6ECD71294F87FD
2 changed files with 77 additions and 71 deletions

View file

@ -48,72 +48,72 @@ public:
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
const wxString& name = wxWebViewNameStr);
const wxString& name = wxWebViewNameStr) wxOVERRIDE;
virtual void LoadURL(const wxString& url);
virtual void LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item);
virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetBackwardHistory();
virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetForwardHistory();
virtual void LoadURL(const wxString& url) wxOVERRIDE;
virtual void LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item) wxOVERRIDE;
virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetBackwardHistory() wxOVERRIDE;
virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetForwardHistory() wxOVERRIDE;
virtual bool CanGoForward() const;
virtual bool CanGoBack() const;
virtual void GoBack();
virtual void GoForward();
virtual void ClearHistory();
virtual void EnableHistory(bool enable = true);
virtual void Stop();
virtual void Reload(wxWebViewReloadFlags flags = wxWEBVIEW_RELOAD_DEFAULT);
virtual bool CanGoForward() const wxOVERRIDE;
virtual bool CanGoBack() const wxOVERRIDE;
virtual void GoBack() wxOVERRIDE;
virtual void GoForward() wxOVERRIDE;
virtual void ClearHistory() wxOVERRIDE;
virtual void EnableHistory(bool enable = true) wxOVERRIDE;
virtual void Stop() wxOVERRIDE;
virtual void Reload(wxWebViewReloadFlags flags = wxWEBVIEW_RELOAD_DEFAULT) wxOVERRIDE;
virtual wxString GetPageSource() const;
virtual wxString GetPageText() const;
virtual wxString GetPageSource() const wxOVERRIDE;
virtual wxString GetPageText() const wxOVERRIDE;
virtual bool IsBusy() const;
virtual wxString GetCurrentURL() const;
virtual wxString GetCurrentTitle() const;
virtual bool IsBusy() const wxOVERRIDE;
virtual wxString GetCurrentURL() const wxOVERRIDE;
virtual wxString GetCurrentTitle() const wxOVERRIDE;
virtual void SetZoomType(wxWebViewZoomType type);
virtual wxWebViewZoomType GetZoomType() const;
virtual bool CanSetZoomType(wxWebViewZoomType type) const;
virtual void SetZoomType(wxWebViewZoomType type) wxOVERRIDE;
virtual wxWebViewZoomType GetZoomType() const wxOVERRIDE;
virtual bool CanSetZoomType(wxWebViewZoomType type) const wxOVERRIDE;
virtual void Print();
virtual void Print() wxOVERRIDE;
virtual wxWebViewZoom GetZoom() const;
virtual void SetZoom(wxWebViewZoom zoom);
virtual wxWebViewZoom GetZoom() const wxOVERRIDE;
virtual void SetZoom(wxWebViewZoom zoom) wxOVERRIDE;
virtual void* GetNativeBackend() const;
virtual void* GetNativeBackend() const wxOVERRIDE;
virtual long Find(const wxString& WXUNUSED(text), int WXUNUSED(flags) = wxWEBVIEW_FIND_DEFAULT) { return wxNOT_FOUND; }
virtual long Find(const wxString& WXUNUSED(text), int WXUNUSED(flags) = wxWEBVIEW_FIND_DEFAULT) wxOVERRIDE { return wxNOT_FOUND; }
//Clipboard functions
virtual bool CanCut() const { return true; }
virtual bool CanCopy() const { return true; }
virtual bool CanPaste() const { return true; }
virtual void Cut();
virtual void Copy();
virtual void Paste();
virtual bool CanCut() const wxOVERRIDE { return true; }
virtual bool CanCopy() const wxOVERRIDE { return true; }
virtual bool CanPaste() const wxOVERRIDE { return true; }
virtual void Cut() wxOVERRIDE;
virtual void Copy() wxOVERRIDE;
virtual void Paste() wxOVERRIDE;
//Undo / redo functionality
virtual bool CanUndo() const { return true; }
virtual bool CanRedo() const { return true; }
virtual void Undo();
virtual void Redo();
virtual bool CanUndo() const wxOVERRIDE { return true; }
virtual bool CanRedo() const wxOVERRIDE { return true; }
virtual void Undo() wxOVERRIDE;
virtual void Redo() wxOVERRIDE;
//Editing functions
virtual void SetEditable(bool enable = true);
virtual bool IsEditable() const { return false; }
virtual void SetEditable(bool enable = true) wxOVERRIDE;
virtual bool IsEditable() const wxOVERRIDE { return false; }
//Selection
virtual void SelectAll();
virtual bool HasSelection() const { return false; }
virtual void DeleteSelection();
virtual wxString GetSelectedText() const { return ""; }
virtual wxString GetSelectedSource() const { return ""; }
virtual void ClearSelection();
virtual void SelectAll() wxOVERRIDE;
virtual bool HasSelection() const wxOVERRIDE { return false; }
virtual void DeleteSelection() wxOVERRIDE;
virtual wxString GetSelectedText() const wxOVERRIDE { return ""; }
virtual wxString GetSelectedSource() const wxOVERRIDE { return ""; }
virtual void ClearSelection() wxOVERRIDE;
virtual bool RunScript(const wxString& javascript, wxString* output = NULL) wxOVERRIDE;
//Virtual Filesystem Support
virtual void RegisterHandler(wxSharedPtr<wxWebViewHandler> handler);
virtual void RegisterHandler(wxSharedPtr<wxWebViewHandler> handler) wxOVERRIDE;
#ifdef __WXMSW__
static bool StartUp(int &code, const wxString &path = "");
@ -126,7 +126,7 @@ public:
static void DoCEFWork();
protected:
virtual void DoSetPage(const wxString& html, const wxString& baseUrl);
virtual void DoSetPage(const wxString& html, const wxString& baseUrl) wxOVERRIDE;
private:
//History related variables, we currently use our own implementation

View file

@ -53,63 +53,66 @@ public:
ClientHandler() : m_loadErrorCode(-1) {}
virtual ~ClientHandler() {}
virtual CefRefPtr<CefContextMenuHandler> GetContextMenuHandler() { return this; }
virtual CefRefPtr<CefLifeSpanHandler> GetLifeSpanHandler() { return this; }
virtual CefRefPtr<CefLoadHandler> GetLoadHandler() { return this; }
virtual CefRefPtr<CefDisplayHandler> GetDisplayHandler() { return this; }
virtual CefRefPtr<CefContextMenuHandler> GetContextMenuHandler() wxOVERRIDE { return this; }
virtual CefRefPtr<CefLifeSpanHandler> GetLifeSpanHandler() wxOVERRIDE { return this; }
virtual CefRefPtr<CefLoadHandler> GetLoadHandler() wxOVERRIDE { return this; }
virtual CefRefPtr<CefDisplayHandler> GetDisplayHandler() wxOVERRIDE { return this; }
// CefDisplayHandler methods
virtual void OnLoadingStateChange(CefRefPtr<CefBrowser> browser,
bool isLoading, bool canGoBack,
bool canGoForward);
bool canGoForward) wxOVERRIDE;
virtual void OnAddressChange(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
const CefString& url);
const CefString& url) wxOVERRIDE;
virtual void OnTitleChange(CefRefPtr<CefBrowser> browser,
const CefString& title);
const CefString& title) wxOVERRIDE;
virtual bool OnConsoleMessage(CefRefPtr<CefBrowser> browser,
const CefString& message,
const CefString& source,
int line);
int line) wxOVERRIDE;
// CefContextMenuHandler methods
virtual void OnBeforeContextMenu(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
CefRefPtr<CefContextMenuParams> params,
CefRefPtr<CefMenuModel> model);
CefRefPtr<CefMenuModel> model) wxOVERRIDE;
virtual bool OnContextMenuCommand(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
CefRefPtr<CefContextMenuParams> params,
int command_id,
CefContextMenuHandler::EventFlags event_flags);
CefContextMenuHandler::EventFlags event_flags) wxOVERRIDE;
virtual void OnContextMenuDismissed(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame);
CefRefPtr<CefFrame> frame) wxOVERRIDE;
// CefLifeSpanHandler methods
virtual bool OnBeforePopup(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
const CefString& target_url,
const CefString& target_frame_name,
WindowOpenDisposition target_disposition,
bool user_gesture,
const CefPopupFeatures& popupFeatures,
CefWindowInfo& windowInfo,
CefRefPtr<CefClient>& client,
CefBrowserSettings& settings,
bool* no_javascript_access);
virtual void OnAfterCreated(CefRefPtr<CefBrowser> browser);
virtual bool DoClose(CefRefPtr<CefBrowser> browser);
virtual void OnBeforeClose(CefRefPtr<CefBrowser> browser);
bool* no_javascript_access) wxOVERRIDE;
virtual void OnAfterCreated(CefRefPtr<CefBrowser> browser) wxOVERRIDE;
virtual bool DoClose(CefRefPtr<CefBrowser> browser) wxOVERRIDE;
virtual void OnBeforeClose(CefRefPtr<CefBrowser> browser) wxOVERRIDE;
// CefLoadHandler methods
virtual void OnLoadStart(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame);
CefRefPtr<CefFrame> frame,
TransitionType transition_type) wxOVERRIDE;
virtual void OnLoadEnd(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
int httpStatusCode);
int httpStatusCode) wxOVERRIDE;
virtual void OnLoadError(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
ErrorCode errorCode,
const CefString& errorText,
const CefString& failedUrl);
const CefString& failedUrl) wxOVERRIDE;
CefRefPtr<CefBrowser> GetBrowser() { return m_browser; }
@ -132,15 +135,15 @@ public:
// CefResourceHandler methods
virtual bool ProcessRequest(CefRefPtr<CefRequest> request,
CefRefPtr<CefCallback> callback);
CefRefPtr<CefCallback> callback) wxOVERRIDE;
virtual void GetResponseHeaders(CefRefPtr<CefResponse> response,
int64& response_length,
CefString& redirectUrl);
CefString& redirectUrl) wxOVERRIDE;
virtual bool ReadResponse(void* data_out,
int bytes_to_read,
int& bytes_read,
CefRefPtr<CefCallback> callback);
virtual void Cancel() {}
CefRefPtr<CefCallback> callback) wxOVERRIDE;
virtual void Cancel() wxOVERRIDE {}
private:
wxSharedPtr<wxWebViewHandler> m_handler;
@ -161,7 +164,7 @@ public:
virtual CefRefPtr<CefResourceHandler> Create(CefRefPtr<CefBrowser> WXUNUSED(browser),
CefRefPtr<CefFrame> WXUNUSED(frame),
const CefString& WXUNUSED(scheme_name),
CefRefPtr<CefRequest> WXUNUSED(request))
CefRefPtr<CefRequest> WXUNUSED(request)) wxOVERRIDE
{
return new SchemeHandler(m_handler);
}
@ -181,7 +184,7 @@ public:
};
wxStringVisitor(wxWebViewChromium* webview, StringType type) :
m_type(type), m_webview(webview) {}
void Visit(const CefString& string)
void Visit(const CefString& string) wxOVERRIDE
{
switch(m_type)
{
@ -673,6 +676,8 @@ bool ClientHandler::OnBeforePopup(CefRefPtr<CefBrowser> WXUNUSED(browser),
CefRefPtr<CefFrame> WXUNUSED(frame),
const CefString& target_url,
const CefString& target_frame_name,
WindowOpenDisposition WXUNUSED(target_disposition),
bool WXUNUSED(user_gesture),
const CefPopupFeatures& WXUNUSED(popupFeatures),
CefWindowInfo& WXUNUSED(windowInfo),
CefRefPtr<CefClient>& WXUNUSED(client),
@ -713,7 +718,8 @@ void ClientHandler::OnBeforeClose(CefRefPtr<CefBrowser> browser)
// CefLoadHandler methods
void ClientHandler::OnLoadStart(CefRefPtr<CefBrowser> WXUNUSED(browser),
CefRefPtr<CefFrame> frame)
CefRefPtr<CefFrame> frame,
TransitionType WXUNUSED(transition_type))
{
wxString url = frame->GetURL().ToString();
wxString target = frame->GetName().ToString();