Skip to content

Commit

Permalink
Suppress clang warning [-Winconsistent-missing-override] in DECLARE_H…
Browse files Browse the repository at this point in the history
…ELP_PROVISION().
  • Loading branch information
minoki committed Nov 6, 2015
1 parent 450d9ce commit d399d54
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions include/wx/richtext/richtextuicustomization.h
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,13 @@ class WXDLLIMPEXP_RICHTEXT wxRichTextHelpInfo
/// 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: \
Expand Down

0 comments on commit d399d54

Please sign in to comment.