X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8d206c073dc910c8991ca84d7fb616dae8f1e774..e4e83f385a58f00b1f97315ebd80f380d16ae472:/include/wx/chkconf.h diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index e4d8d71527..f7969c189f 100644 --- a/include/wx/chkconf.h +++ b/include/wx/chkconf.h @@ -972,16 +972,16 @@ check consistency of the settings */ -#if WXWIN_COMPATIBILITY_2_4 -# if !WXWIN_COMPATIBILITY_2_6 +#if WXWIN_COMPATIBILITY_2_6 +# if !WXWIN_COMPATIBILITY_2_8 # ifdef wxABORT_ON_CONFIG_ERROR -# error "2.4.X compatibility requires 2.6.X compatibility" +# error "2.6.X compatibility requires 2.8.X compatibility" # else -# undef WXWIN_COMPATIBILITY_2_6 -# define WXWIN_COMPATIBILITY_2_6 1 +# undef WXWIN_COMPATIBILITY_2_8 +# define WXWIN_COMPATIBILITY_2_8 1 # endif # endif -#endif /* WXWIN_COMPATIBILITY_2_4 */ +#endif /* WXWIN_COMPATIBILITY_2_6 */ #if wxUSE_ARCHIVE_STREAMS # if !wxUSE_DATETIME @@ -1804,15 +1804,6 @@ # endif #endif /* wxUSE_CLIPBOARD */ -#if wxUSE_WX_RESOURCES && !wxUSE_PROLOGIO -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxr resources require PrologIO" -# else -# undef wxUSE_PROLOGIO -# define wxUSE_PROLOGIO 1 -# endif -#endif /* wxUSE_WX_RESOURCES */ - #if wxUSE_XRC && !wxUSE_XML # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_XRC requires wxUSE_XML"