From a1863a397c7ef76b79fa6e48ee34ea9c784ebb24 Mon Sep 17 00:00:00 2001 From: Dimitri Schoolwerth Date: Sat, 7 Nov 2015 21:47:00 +0400 Subject: [PATCH] Fix wxOSX/Carbon build after wxDataViewRenderer changes Since 361c6357b4db2ce54d2b70675a01654f89619378 wxDataViewRenderer's SetAttr and SetEnabled became pure virtual class methods which aren't implemented for wxOSX/Carbon. Fix by defining the same empty stubs for these methods as were previously present in the base class. --- include/wx/osx/dvrenderer.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/wx/osx/dvrenderer.h b/include/wx/osx/dvrenderer.h index 9b9bc76857..ce7cec14e8 100644 --- a/include/wx/osx/dvrenderer.h +++ b/include/wx/osx/dvrenderer.h @@ -86,7 +86,11 @@ public: protected: virtual void SetAttr(const wxDataViewItemAttr& attr) wxOVERRIDE; virtual void SetEnabled(bool enabled) wxOVERRIDE; -#endif // Cocoa +#else +protected: + void SetAttr(const wxDataViewItemAttr& WXUNUSED(attr)) wxOVERRIDE { }; + void SetEnabled(bool WXUNUSED(enabled)) wxOVERRIDE { }; +#endif private: // contains the alignment flags