From 6898abf8d616f7ef014bd1d8785e796213bc3096 Mon Sep 17 00:00:00 2001 From: Artur Wieczorek Date: Fri, 12 Jul 2019 19:18:24 +0200 Subject: [PATCH] Fix build with wxUSE_VARIANT==0 wxPropertyGrid and wxRichTextCtlr depend on wxVariant. --- include/wx/chkconf.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index 82bb132b8a..f6f71e20ba 100644 --- a/include/wx/chkconf.h +++ b/include/wx/chkconf.h @@ -2373,8 +2373,27 @@ # define wxUSE_LONLONG 1 # endif # endif +# if !wxUSE_VARIANT +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxRichTextCtrl requires wxUSE_VARIANT" +# else +# undef wxUSE_VARIANT +# define wxUSE_VARIANT 1 +# endif +# endif #endif /* wxUSE_RICHTEXT */ +#if wxUSE_PROPGRID +# if !wxUSE_VARIANT +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxPropertyGrid requires wxUSE_VARIANT" +# else +# undef wxUSE_VARIANT +# define wxUSE_VARIANT 1 +# endif +# endif +#endif /* wxUSE_PROPGRID */ + #endif /* wxUSE_GUI */ #endif /* _WX_CHKCONF_H_ */