From 2bde0f4b9e08516db6a17a3f61b7ed168dea96a9 Mon Sep 17 00:00:00 2001 From: Tim S Date: Sun, 5 Mar 2017 21:37:53 -0500 Subject: [PATCH] Edited when setting wxUSE_CHECKLISTBOX to 0 under MSW port. --- include/wx/msw/chkconf.h | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h index 43a03c166b..4703575eac 100644 --- a/include/wx/msw/chkconf.h +++ b/include/wx/msw/chkconf.h @@ -183,11 +183,6 @@ #define wxUSE_SECRETSTORE 0 #endif -#if !wxUSE_OWNER_DRAWN && !defined(__WXUNIVERSAL__) && defined(__WXMSW__) -# undef wxUSE_CHECKLISTBOX -# define wxUSE_CHECKLISTBOX 0 -#endif - #if wxUSE_SPINCTRL # if !wxUSE_SPINBTN # ifdef wxABORT_ON_CONFIG_ERROR @@ -199,6 +194,16 @@ # endif #endif +/* wxMSW-specific checks: notice that this file is also used with wxUniv + and can even be used with wxGTK, when building it under Windows. + */ +#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) +# if !wxUSE_OWNER_DRAWN +# undef wxUSE_CHECKLISTBOX +# define wxUSE_CHECKLISTBOX 0 +# endif +#endif + /* Compiler-specific checks. */