From 93b9126fe50e8d808a8ba94790af4a2e436f8bbe Mon Sep 17 00:00:00 2001 From: Artur Wieczorek Date: Sun, 5 Apr 2015 10:16:42 +0200 Subject: [PATCH] Check for wxUSE_STC dependency on wxUSE_STOPWATCH. wxStyledTextCtrl requires wxStopWatch, so check that wxUSE_STOPWATCH is set if wxUSE_MEDIACTRL is. See #16939. --- include/wx/chkconf.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index 92a58b075d..963d156446 100644 --- a/include/wx/chkconf.h +++ b/include/wx/chkconf.h @@ -2258,6 +2258,17 @@ # endif #endif /* wxUSE_MEDIACTRL */ +#if wxUSE_STC +# if !wxUSE_STOPWATCH +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxStyledTextCtrl requires wxUSE_STOPWATCH" +# else +# undef wxUSE_STC +# define wxUSE_STC 0 +# endif +# endif +#endif /* wxUSE_STC */ + #endif /* wxUSE_GUI */ #endif /* _WX_CHKCONF_H_ */