use wxOVERRIDE in wxMSW sources
This commit is contained in:
Paul Cornett
@@ -60,73 +60,73 @@ 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);
|
||||
virtual wxWebViewZoomType GetZoomType() const;
|
||||
virtual bool CanSetZoomType(wxWebViewZoomType) const;
|
||||
virtual void SetZoomType(wxWebViewZoomType) wxOVERRIDE;
|
||||
virtual wxWebViewZoomType GetZoomType() const wxOVERRIDE;
|
||||
virtual bool CanSetZoomType(wxWebViewZoomType) 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;
|
||||
|
||||
//Clipboard functions
|
||||
virtual bool CanCut() const;
|
||||
virtual bool CanCopy() const;
|
||||
virtual bool CanPaste() const;
|
||||
virtual void Cut();
|
||||
virtual void Copy();
|
||||
virtual void Paste();
|
||||
virtual bool CanCut() const wxOVERRIDE;
|
||||
virtual bool CanCopy() const wxOVERRIDE;
|
||||
virtual bool CanPaste() const wxOVERRIDE;
|
||||
virtual void Cut() wxOVERRIDE;
|
||||
virtual void Copy() wxOVERRIDE;
|
||||
virtual void Paste() wxOVERRIDE;
|
||||
|
||||
//Undo / redo functionality
|
||||
virtual bool CanUndo() const;
|
||||
virtual bool CanRedo() const;
|
||||
virtual void Undo();
|
||||
virtual void Redo();
|
||||
virtual bool CanUndo() const wxOVERRIDE;
|
||||
virtual bool CanRedo() const wxOVERRIDE;
|
||||
virtual void Undo() wxOVERRIDE;
|
||||
virtual void Redo() wxOVERRIDE;
|
||||
|
||||
//Find function
|
||||
virtual long Find(const wxString& text, int flags = wxWEBVIEW_FIND_DEFAULT);
|
||||
virtual long Find(const wxString& text, int flags = wxWEBVIEW_FIND_DEFAULT) wxOVERRIDE;
|
||||
|
||||
//Editing functions
|
||||
virtual void SetEditable(bool enable = true);
|
||||
virtual bool IsEditable() const;
|
||||
virtual void SetEditable(bool enable = true) wxOVERRIDE;
|
||||
virtual bool IsEditable() const wxOVERRIDE;
|
||||
|
||||
//Selection
|
||||
virtual void SelectAll();
|
||||
virtual bool HasSelection() const;
|
||||
virtual void DeleteSelection();
|
||||
virtual wxString GetSelectedText() const;
|
||||
virtual wxString GetSelectedSource() const;
|
||||
virtual void ClearSelection();
|
||||
virtual void SelectAll() wxOVERRIDE;
|
||||
virtual bool HasSelection() const wxOVERRIDE;
|
||||
virtual void DeleteSelection() wxOVERRIDE;
|
||||
virtual wxString GetSelectedText() const wxOVERRIDE;
|
||||
virtual wxString GetSelectedSource() const wxOVERRIDE;
|
||||
virtual void ClearSelection() wxOVERRIDE;
|
||||
|
||||
virtual void RunScript(const wxString& javascript);
|
||||
virtual void RunScript(const wxString& javascript) wxOVERRIDE;
|
||||
|
||||
//Virtual Filesystem Support
|
||||
virtual void RegisterHandler(wxSharedPtr<wxWebViewHandler> handler);
|
||||
virtual void RegisterHandler(wxSharedPtr<wxWebViewHandler> handler) wxOVERRIDE;
|
||||
|
||||
virtual void* GetNativeBackend() const { return m_webBrowser; }
|
||||
virtual void* GetNativeBackend() const wxOVERRIDE { return m_webBrowser; }
|
||||
|
||||
// ---- IE-specific methods
|
||||
|
||||
@@ -146,7 +146,7 @@ public:
|
||||
wxDECLARE_EVENT_TABLE();
|
||||
|
||||
protected:
|
||||
virtual void DoSetPage(const wxString& html, const wxString& baseUrl);
|
||||
virtual void DoSetPage(const wxString& html, const wxString& baseUrl) wxOVERRIDE;
|
||||
|
||||
private:
|
||||
wxIEContainer* m_container;
|
||||
@@ -197,14 +197,14 @@ private:
|
||||
class WXDLLIMPEXP_WEBVIEW wxWebViewFactoryIE : public wxWebViewFactory
|
||||
{
|
||||
public:
|
||||
virtual wxWebView* Create() { return new wxWebViewIE; }
|
||||
virtual wxWebView* Create() wxOVERRIDE { return new wxWebViewIE; }
|
||||
virtual wxWebView* Create(wxWindow* parent,
|
||||
wxWindowID id,
|
||||
const wxString& url = wxWebViewDefaultURLStr,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = 0,
|
||||
const wxString& name = wxWebViewNameStr)
|
||||
const wxString& name = wxWebViewNameStr) wxOVERRIDE
|
||||
{ return new wxWebViewIE(parent, id, url, pos, size, style, name); }
|
||||
};
|
||||
|
||||
@@ -227,28 +227,28 @@ public:
|
||||
|
||||
//IInternetProtocolRoot
|
||||
HRESULT STDMETHODCALLTYPE Abort(HRESULT WXUNUSED(hrReason),
|
||||
DWORD WXUNUSED(dwOptions))
|
||||
DWORD WXUNUSED(dwOptions)) wxOVERRIDE
|
||||
{ return E_NOTIMPL; }
|
||||
HRESULT STDMETHODCALLTYPE Continue(wxPROTOCOLDATA *WXUNUSED(pProtocolData))
|
||||
HRESULT STDMETHODCALLTYPE Continue(wxPROTOCOLDATA *WXUNUSED(pProtocolData)) wxOVERRIDE
|
||||
{ return S_OK; }
|
||||
HRESULT STDMETHODCALLTYPE Resume() { return S_OK; }
|
||||
HRESULT STDMETHODCALLTYPE Resume() wxOVERRIDE { return S_OK; }
|
||||
HRESULT STDMETHODCALLTYPE Start(LPCWSTR szUrl,
|
||||
wxIInternetProtocolSink *pOIProtSink,
|
||||
wxIInternetBindInfo *pOIBindInfo,
|
||||
DWORD grfPI,
|
||||
HANDLE_PTR dwReserved);
|
||||
HRESULT STDMETHODCALLTYPE Suspend() { return S_OK; }
|
||||
HRESULT STDMETHODCALLTYPE Terminate(DWORD WXUNUSED(dwOptions)) { return S_OK; }
|
||||
HANDLE_PTR dwReserved) wxOVERRIDE;
|
||||
HRESULT STDMETHODCALLTYPE Suspend() wxOVERRIDE { return S_OK; }
|
||||
HRESULT STDMETHODCALLTYPE Terminate(DWORD WXUNUSED(dwOptions)) wxOVERRIDE { return S_OK; }
|
||||
|
||||
//IInternetProtocol
|
||||
HRESULT STDMETHODCALLTYPE LockRequest(DWORD WXUNUSED(dwOptions))
|
||||
HRESULT STDMETHODCALLTYPE LockRequest(DWORD WXUNUSED(dwOptions)) wxOVERRIDE
|
||||
{ return S_OK; }
|
||||
HRESULT STDMETHODCALLTYPE Read(void *pv, ULONG cb, ULONG *pcbRead);
|
||||
HRESULT STDMETHODCALLTYPE Read(void *pv, ULONG cb, ULONG *pcbRead) wxOVERRIDE;
|
||||
HRESULT STDMETHODCALLTYPE Seek(LARGE_INTEGER WXUNUSED(dlibMove),
|
||||
DWORD WXUNUSED(dwOrigin),
|
||||
ULARGE_INTEGER* WXUNUSED(plibNewPosition))
|
||||
ULARGE_INTEGER* WXUNUSED(plibNewPosition)) wxOVERRIDE
|
||||
{ return E_FAIL; }
|
||||
HRESULT STDMETHODCALLTYPE UnlockRequest() { return S_OK; }
|
||||
HRESULT STDMETHODCALLTYPE UnlockRequest() wxOVERRIDE { return S_OK; }
|
||||
};
|
||||
|
||||
class ClassFactory : public IClassFactory
|
||||
@@ -262,8 +262,8 @@ public:
|
||||
|
||||
//IClassFactory
|
||||
HRESULT STDMETHODCALLTYPE CreateInstance(IUnknown* pUnkOuter,
|
||||
REFIID riid, void** ppvObject);
|
||||
HRESULT STDMETHODCALLTYPE LockServer(BOOL fLock);
|
||||
REFIID riid, void** ppvObject) wxOVERRIDE;
|
||||
HRESULT STDMETHODCALLTYPE LockServer(BOOL fLock) wxOVERRIDE;
|
||||
|
||||
//IUnknown
|
||||
DECLARE_IUNKNOWN_METHODS;
|
||||
@@ -277,7 +277,7 @@ class wxIEContainer : public wxActiveXContainer
|
||||
public:
|
||||
wxIEContainer(wxWindow *parent, REFIID iid, IUnknown *pUnk, DocHostUIHandler* uiHandler = NULL);
|
||||
virtual ~wxIEContainer();
|
||||
virtual bool QueryClientSiteInterface(REFIID iid, void **_interface, const char *&desc);
|
||||
virtual bool QueryClientSiteInterface(REFIID iid, void **_interface, const char *&desc) wxOVERRIDE;
|
||||
private:
|
||||
DocHostUIHandler* m_uiHandler;
|
||||
};
|
||||
@@ -290,48 +290,48 @@ public:
|
||||
|
||||
virtual HRESULT wxSTDCALL ShowContextMenu(DWORD dwID, POINT *ppt,
|
||||
IUnknown *pcmdtReserved,
|
||||
IDispatch *pdispReserved);
|
||||
IDispatch *pdispReserved) wxOVERRIDE;
|
||||
|
||||
virtual HRESULT wxSTDCALL GetHostInfo(DOCHOSTUIINFO *pInfo);
|
||||
virtual HRESULT wxSTDCALL GetHostInfo(DOCHOSTUIINFO *pInfo) wxOVERRIDE;
|
||||
|
||||
virtual HRESULT wxSTDCALL ShowUI(DWORD dwID,
|
||||
IOleInPlaceActiveObject *pActiveObject,
|
||||
IOleCommandTarget *pCommandTarget,
|
||||
IOleInPlaceFrame *pFrame,
|
||||
IOleInPlaceUIWindow *pDoc);
|
||||
IOleInPlaceUIWindow *pDoc) wxOVERRIDE;
|
||||
|
||||
virtual HRESULT wxSTDCALL HideUI(void);
|
||||
virtual HRESULT wxSTDCALL HideUI(void) wxOVERRIDE;
|
||||
|
||||
virtual HRESULT wxSTDCALL UpdateUI(void);
|
||||
virtual HRESULT wxSTDCALL UpdateUI(void) wxOVERRIDE;
|
||||
|
||||
virtual HRESULT wxSTDCALL EnableModeless(BOOL fEnable);
|
||||
virtual HRESULT wxSTDCALL EnableModeless(BOOL fEnable) wxOVERRIDE;
|
||||
|
||||
virtual HRESULT wxSTDCALL OnDocWindowActivate(BOOL fActivate);
|
||||
virtual HRESULT wxSTDCALL OnDocWindowActivate(BOOL fActivate) wxOVERRIDE;
|
||||
|
||||
virtual HRESULT wxSTDCALL OnFrameWindowActivate(BOOL fActivate);
|
||||
virtual HRESULT wxSTDCALL OnFrameWindowActivate(BOOL fActivate) wxOVERRIDE;
|
||||
|
||||
virtual HRESULT wxSTDCALL ResizeBorder(LPCRECT prcBorder,
|
||||
IOleInPlaceUIWindow *pUIWindow,
|
||||
BOOL fRameWindow);
|
||||
BOOL fRameWindow) wxOVERRIDE;
|
||||
|
||||
virtual HRESULT wxSTDCALL TranslateAccelerator(LPMSG lpMsg,
|
||||
const GUID *pguidCmdGroup,
|
||||
DWORD nCmdID);
|
||||
DWORD nCmdID) wxOVERRIDE;
|
||||
|
||||
virtual HRESULT wxSTDCALL GetOptionKeyPath(LPOLESTR *pchKey,
|
||||
DWORD dw);
|
||||
DWORD dw) wxOVERRIDE;
|
||||
|
||||
virtual HRESULT wxSTDCALL GetDropTarget(IDropTarget *pDropTarget,
|
||||
IDropTarget **ppDropTarget);
|
||||
IDropTarget **ppDropTarget) wxOVERRIDE;
|
||||
|
||||
virtual HRESULT wxSTDCALL GetExternal(IDispatch **ppDispatch);
|
||||
virtual HRESULT wxSTDCALL GetExternal(IDispatch **ppDispatch) wxOVERRIDE;
|
||||
|
||||
virtual HRESULT wxSTDCALL TranslateUrl(DWORD dwTranslate,
|
||||
OLECHAR *pchURLIn,
|
||||
OLECHAR **ppchURLOut);
|
||||
OLECHAR **ppchURLOut) wxOVERRIDE;
|
||||
|
||||
virtual HRESULT wxSTDCALL FilterDataObject(IDataObject *pDO,
|
||||
IDataObject **ppDORet);
|
||||
IDataObject **ppDORet) wxOVERRIDE;
|
||||
//IUnknown
|
||||
DECLARE_IUNKNOWN_METHODS;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user