X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b3dfbbc91088ab32c3aae4294a3c726fadfc5ccd..584ad2a32fec156c6049145d7ece9a33213aea28:/include/wx/msw/chkconf.h diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h index badd90155d..1dd47b8ea1 100644 --- a/include/wx/msw/chkconf.h +++ b/include/wx/msw/chkconf.h @@ -9,6 +9,8 @@ * Licence: wxWindows licence */ +/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */ + #ifndef _WX_MSW_CHKCONF_H_ #define _WX_MSW_CHKCONF_H_ @@ -16,8 +18,17 @@ * disable the settings which don't work for some compilers */ +/* + * If using PostScript-in-MSW in Univ, must enable PostScript + */ + +#if defined(__WXUNIVERSAL__) && wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW && !wxUSE_POSTSCRIPT +#undef wxUSE_POSTSCRIPT +#define wxUSE_POSTSCRIPT 1 +#endif + #ifndef wxUSE_NORLANDER_HEADERS -#if (defined(__WATCOMC__) && (__WATCOMC__ >= 1200)) || ((defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))) +#if (defined(__WATCOMC__) && (__WATCOMC__ >= 1200)) || defined(__WINE__) || ((defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))) # define wxUSE_NORLANDER_HEADERS 1 #else # define wxUSE_NORLANDER_HEADERS 0