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

Add more wxOVERRIDE to avoid clang warnings

Browse Source 
This fixes several thousands of -Winconsistent-missing-override warnings
given by Xcode 10 when building the library.
This commit is contained in:
Vadim Zeitlin
2019-04-17 19:05:31 +02:00
parent 22369e97fc
commit b53c516564
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/osx/bitmap.h
View File

@@ -149,8 +149,8 @@ public:
bool CreateScaled(int logwidth, int logheight, int depth, double logicalScale) wxOVERRIDE; bool CreateScaled(int logwidth, int logheight, int depth, double logicalScale) wxOVERRIDE;
// virtual bool Create( WXHICON icon) ; // virtual bool Create( WXHICON icon) ;
virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE); 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; virtual bool SaveFile(const wxString& name, wxBitmapType type, const wxPalette *cmap = NULL) const wxOVERRIDE;
const wxBitmapRefData *GetBitmapData() const const wxBitmapRefData *GetBitmapData() const
{ return (const wxBitmapRefData *)m_refData; } { return (const wxBitmapRefData *)m_refData; }

4
include/wx/osx/core/private/strconv_cf.h
View File

@@ -320,8 +320,8 @@ public:
m_encoding = encoding ; 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 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; 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); } virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConv_cf(*this); }

2
include/wx/osx/filedlg.h
View File

@@ -83,7 +83,7 @@ protected:
// not supported for file dialog, RR // not supported for file dialog, RR
virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y), virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(width), int WXUNUSED(height),
int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {} int WXUNUSED(sizeFlags) = wxSIZE_AUTO) wxOVERRIDE {}
void SetupExtraControls(WXWindow nativeWindow); void SetupExtraControls(WXWindow nativeWindow);

4
include/wx/osx/menuitem.h
View File

@@ -39,8 +39,8 @@ public:
// override base class virtuals // override base class virtuals
virtual void SetItemLabel(const wxString& strName) wxOVERRIDE; virtual void SetItemLabel(const wxString& strName) wxOVERRIDE;
virtual void Enable(bool bDoEnable = true); virtual void Enable(bool bDoEnable = true) wxOVERRIDE;
virtual void Check(bool bDoCheck = true); virtual void Check(bool bDoCheck = true) wxOVERRIDE;
virtual void SetBitmap(const wxBitmap& bitmap) ; virtual void SetBitmap(const wxBitmap& bitmap) ;
virtual const wxBitmap& GetBitmap() const { return m_bitmap; } virtual const wxBitmap& GetBitmap() const { return m_bitmap; }

2
include/wx/osx/msgdlg.h
View File

@@ -36,7 +36,7 @@ protected:
// not supported for message dialog // not supported for message dialog
virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y), virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(width), int WXUNUSED(height),
int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {} int WXUNUSED(sizeFlags) = wxSIZE_AUTO) wxOVERRIDE {}
#if wxOSX_USE_COCOA #if wxOSX_USE_COCOA
void* ConstructNSAlert(); void* ConstructNSAlert();

2
include/wx/osx/textentry.h
View File

@@ -76,7 +76,7 @@ public:
virtual void SetInsertionPoint(long pos) wxOVERRIDE; virtual void SetInsertionPoint(long pos) wxOVERRIDE;
virtual void SetInsertionPointEnd() wxOVERRIDE; virtual void SetInsertionPointEnd() wxOVERRIDE;
virtual long GetInsertionPoint() const 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 SetSelection(long from, long to) wxOVERRIDE;
virtual void SetEditable(bool editable) wxOVERRIDE; virtual void SetEditable(bool editable) wxOVERRIDE;