From ecbfa2c122cfe1a7a4164b804d88b696939c8dcd Mon Sep 17 00:00:00 2001 From: Artur Wieczorek Date: Sat, 21 Mar 2015 23:51:57 +0100 Subject: [PATCH] Disable wxUSE_ACTIVITYINDICATOR if wxUSE_GRAPHICS_CONTEXT==0. wxActivityIndicatorImpl requires wxGraphicsContext to compile successfully (it is used to implement anti-aliased drawing of the control). Add a check to enforce this. Closes #16921 --- include/wx/chkconf.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index c67c67cd20..ff49eac374 100644 --- a/include/wx/chkconf.h +++ b/include/wx/chkconf.h @@ -2247,6 +2247,15 @@ # endif #endif /* wxUSE_PREFERENCES_EDITOR */ +#if wxUSE_ACTIVITYINDICATOR && !wxUSE_GRAPHICS_CONTEXT +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_ACTIVITYINDICATOR requires wxGraphicsContext" +# else +# undef wxUSE_ACTIVITYINDICATOR +# define wxUSE_ACTIVITYINDICATOR 0 +# endif +#endif /* wxUSE_ACTIVITYINDICATOR */ + #endif /* wxUSE_GUI */ #endif /* _WX_CHKCONF_H_ */