From d399d544f1bae126c7cedb22a15c330ae27cdd82 Mon Sep 17 00:00:00 2001 From: ARATA Mizuki Date: Mon, 21 Sep 2015 23:41:56 +0900 Subject: [PATCH] Suppress clang warning [-Winconsistent-missing-override] in DECLARE_HELP_PROVISION(). --- include/wx/richtext/richtextuicustomization.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/wx/richtext/richtextuicustomization.h b/include/wx/richtext/richtextuicustomization.h index 92c42d7b1f..d9fadfc808 100644 --- a/include/wx/richtext/richtextuicustomization.h +++ b/include/wx/richtext/richtextuicustomization.h @@ -103,11 +103,13 @@ protected: /// of the formatting dialog. #define DECLARE_HELP_PROVISION() \ + wxCLANG_WARNING_SUPPRESS(inconsistent-missing-override) \ virtual long GetHelpId() const { return sm_helpInfo.GetHelpId(); } \ virtual void SetHelpId(long id) { sm_helpInfo.SetHelpId(id); } \ virtual wxRichTextUICustomization* GetUICustomization() const { return sm_helpInfo.GetUICustomization(); } \ virtual void SetUICustomization(wxRichTextUICustomization* customization) { sm_helpInfo.SetUICustomization(customization); } \ virtual bool ShowHelp(wxWindow* win) { return sm_helpInfo.ShowHelp(win); } \ + wxCLANG_WARNING_RESTORE(inconsistent-missing-override) \ public: \ static wxRichTextHelpInfo& GetHelpInfo() { return sm_helpInfo; }\ protected: \