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

use wxOVERRIDE in wxMSW sources

Browse Source
This commit is contained in:
Paul Cornett
2016-09-23 07:59:11 -07:00
parent 9b477e46e5
commit 9b19a6e529
121 changed files with 1454 additions and 1454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/wx/msw/metafile.h
View File

@@ -30,7 +30,7 @@ public:
wxMetafileRefData();
virtual ~wxMetafileRefData();
virtual bool IsOk() const { return m_metafile != 0; }
virtual bool IsOk() const wxOVERRIDE { return m_metafile != 0; }
public:
WXHANDLE m_metafile;
@@ -69,8 +69,8 @@ public:
void SetWindowsMappingMode(int mm);
protected:
virtual wxGDIRefData *CreateGDIRefData() const;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
private:
wxDECLARE_DYNAMIC_CLASS(wxMetafile);
@@ -85,12 +85,12 @@ public:
virtual ~wxMetafileDCImpl();
virtual wxMetafile *Close();
virtual void SetMapMode(wxMappingMode mode);
virtual void SetMapMode(wxMappingMode mode) wxOVERRIDE;
virtual void DoGetTextExtent(const wxString& string,
wxCoord *x, wxCoord *y,
wxCoord *descent = NULL,
wxCoord *externalLeading = NULL,
const wxFont *theFont = NULL) const;
const wxFont *theFont = NULL) const wxOVERRIDE;
// Implementation
wxMetafile *GetMetaFile() const { return m_metaFile; }
@@ -99,7 +99,7 @@ public:
void SetWindowsMappingMode(int mm) { m_windowsMappingMode = mm; }
protected:
virtual void DoGetSize(int *width, int *height) const;
virtual void DoGetSize(int *width, int *height) const wxOVERRIDE;
int m_windowsMappingMode;
wxMetafile* m_metaFile;
@@ -174,9 +174,9 @@ public:
{ return m_metafile; }
// implement base class pure virtuals
virtual size_t GetDataSize() const;
virtual bool GetDataHere(void *buf) const;
virtual bool SetData(size_t len, const void *buf);
virtual size_t GetDataSize() const wxOVERRIDE;
virtual bool GetDataHere(void *buf) const wxOVERRIDE;
virtual bool SetData(size_t len, const void *buf) wxOVERRIDE;
protected:
wxMetafile m_metafile;