diff --git a/include/wx/osx/bitmap.h b/include/wx/osx/bitmap.h index cf7896dc55..85f6a87e04 100644 --- a/include/wx/osx/bitmap.h +++ b/include/wx/osx/bitmap.h @@ -149,8 +149,8 @@ public: bool CreateScaled(int logwidth, int logheight, int depth, double logicalScale) wxOVERRIDE; // virtual bool Create( WXHICON icon) ; - virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE); - virtual bool SaveFile(const wxString& name, wxBitmapType type, const wxPalette *cmap = NULL) const; + virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE) wxOVERRIDE; + virtual bool SaveFile(const wxString& name, wxBitmapType type, const wxPalette *cmap = NULL) const wxOVERRIDE; const wxBitmapRefData *GetBitmapData() const { return (const wxBitmapRefData *)m_refData; } diff --git a/include/wx/osx/core/private/strconv_cf.h b/include/wx/osx/core/private/strconv_cf.h index a05ce7d8dc..d9b3eda989 100644 --- a/include/wx/osx/core/private/strconv_cf.h +++ b/include/wx/osx/core/private/strconv_cf.h @@ -320,8 +320,8 @@ public: m_encoding = encoding ; } - virtual size_t ToWChar(wchar_t * dst, size_t dstSize, const char * src, size_t srcSize = wxNO_LEN) const; - virtual size_t FromWChar(char *dst, size_t dstSize, const wchar_t *src, size_t srcSize = wxNO_LEN) const; + virtual size_t ToWChar(wchar_t * dst, size_t dstSize, const char * src, size_t srcSize = wxNO_LEN) const wxOVERRIDE; + virtual size_t FromWChar(char *dst, size_t dstSize, const wchar_t *src, size_t srcSize = wxNO_LEN) const wxOVERRIDE; virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConv_cf(*this); } diff --git a/include/wx/osx/filedlg.h b/include/wx/osx/filedlg.h index 381f8cc5f4..892bad58f6 100644 --- a/include/wx/osx/filedlg.h +++ b/include/wx/osx/filedlg.h @@ -83,7 +83,7 @@ protected: // not supported for file dialog, RR virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height), - int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {} + int WXUNUSED(sizeFlags) = wxSIZE_AUTO) wxOVERRIDE {} void SetupExtraControls(WXWindow nativeWindow); diff --git a/include/wx/osx/menuitem.h b/include/wx/osx/menuitem.h index bb2cb8d75b..803739b647 100644 --- a/include/wx/osx/menuitem.h +++ b/include/wx/osx/menuitem.h @@ -39,8 +39,8 @@ public: // override base class virtuals virtual void SetItemLabel(const wxString& strName) wxOVERRIDE; - virtual void Enable(bool bDoEnable = true); - virtual void Check(bool bDoCheck = true); + virtual void Enable(bool bDoEnable = true) wxOVERRIDE; + virtual void Check(bool bDoCheck = true) wxOVERRIDE; virtual void SetBitmap(const wxBitmap& bitmap) ; virtual const wxBitmap& GetBitmap() const { return m_bitmap; } diff --git a/include/wx/osx/msgdlg.h b/include/wx/osx/msgdlg.h index 81034fa5b1..61fa9d1422 100644 --- a/include/wx/osx/msgdlg.h +++ b/include/wx/osx/msgdlg.h @@ -36,7 +36,7 @@ protected: // not supported for message dialog virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height), - int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {} + int WXUNUSED(sizeFlags) = wxSIZE_AUTO) wxOVERRIDE {} #if wxOSX_USE_COCOA void* ConstructNSAlert(); diff --git a/include/wx/osx/textentry.h b/include/wx/osx/textentry.h index fe6350224a..4a563a29db 100644 --- a/include/wx/osx/textentry.h +++ b/include/wx/osx/textentry.h @@ -76,7 +76,7 @@ public: virtual void SetInsertionPoint(long pos) wxOVERRIDE; virtual void SetInsertionPointEnd() wxOVERRIDE; virtual long GetInsertionPoint() const wxOVERRIDE; - virtual wxTextPos GetLastPosition() const; + virtual wxTextPos GetLastPosition() const wxOVERRIDE; virtual void SetSelection(long from, long to) wxOVERRIDE; virtual void SetEditable(bool editable) wxOVERRIDE;