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

Add wxOVERRIDE and use it in common and wxOSX code.

Browse Source 
Make overriding virtual methods more explicit and enable additional checks
provided by C++11 compilers when "override" is used.

Closes #16100.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-03-20 13:26:28 +00:00
parent 34e4f66d6a
commit 33ad33d447
140 changed files with 865 additions and 718 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/strconv.cpp
View File

@@ -2132,16 +2132,16 @@ public:
// implement base class virtual methods
virtual size_t ToWChar(wchar_t *dst, size_t dstLen,
const char *src, size_t srcLen = wxNO_LEN) const;
const char *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE;
virtual size_t FromWChar(char *dst, size_t dstLen,
const wchar_t *src, size_t srcLen = wxNO_LEN) const;
virtual size_t GetMBNulLen() const;
const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE;
virtual size_t GetMBNulLen() const wxOVERRIDE;
#if wxUSE_UNICODE_UTF8
virtual bool IsUTF8() const;
#endif
virtual wxMBConv *Clone() const
virtual wxMBConv *Clone() const wxOVERRIDE
{
wxMBConv_iconv *p = new wxMBConv_iconv(m_name);
p->m_minMBCharWidth = m_minMBCharWidth;
@@ -2897,7 +2897,7 @@ public:
Init();
}
size_t MB2WC(wchar_t *buf, const char *psz, size_t WXUNUSED(n)) const
size_t MB2WC(wchar_t *buf, const char *psz, size_t WXUNUSED(n)) const wxOVERRIDE
{
size_t inbuf = strlen(psz);
if (buf)
@@ -2908,7 +2908,7 @@ public:
return inbuf;
}
size_t WC2MB(char *buf, const wchar_t *psz, size_t WXUNUSED(n)) const
size_t WC2MB(char *buf, const wchar_t *psz, size_t WXUNUSED(n)) const wxOVERRIDE
{
const size_t inbuf = wxWcslen(psz);
if (buf)
@@ -2920,7 +2920,7 @@ public:
return inbuf;
}
virtual size_t GetMBNulLen() const
virtual size_t GetMBNulLen() const wxOVERRIDE
{
switch ( m_enc )
{
@@ -2937,7 +2937,7 @@ public:
}
}
virtual wxMBConv *Clone() const { return new wxMBConv_wxwin(m_enc); }
virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConv_wxwin(m_enc); }
bool IsOk() const { return m_ok; }