Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved wxUSE_CRASHREPORT checks to wx/msw/chkconf.h; added it to setup.h.in so that it gets defined (always as 0 as mingw32 doesn't support it anyhow) for configure builds too

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-07-20 16:22:50 +00:00
parent cb147822d0
commit 07b1232d2c
3 changed files with 102 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/wx/chkconf.h
View File

@@ -76,16 +76,6 @@
# endif # endif
#endif /* !defined(wxUSE_CONSOLE_EVENTLOOP) */ #endif /* !defined(wxUSE_CONSOLE_EVENTLOOP) */
#ifndef wxUSE_CRASHREPORT
/* this one is special: as currently it is Windows-only, don't force it
to be defined on other platforms */
# if defined(wxABORT_ON_CONFIG_ERROR) && defined(__WXMSW__)
# error "wxUSE_CRASHREPORT must be defined."
# else
# define wxUSE_CRASHREPORT 0
# endif
#endif /* !defined(wxUSE_CRASHREPORT) */
#ifndef wxUSE_DYNLIB_CLASS #ifndef wxUSE_DYNLIB_CLASS
# ifdef wxABORT_ON_CONFIG_ERROR # ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_DYNLIB_CLASS must be defined." # error "wxUSE_DYNLIB_CLASS must be defined."
@@ -1032,15 +1022,6 @@
# endif # endif
#endif /* wxUSE_ARCHIVE_STREAMS */ #endif /* wxUSE_ARCHIVE_STREAMS */
#if wxUSE_CRASHREPORT && !wxUSE_ON_FATAL_EXCEPTION
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_CRASHREPORT requires wxUSE_ON_FATAL_EXCEPTION"
# else
# undef wxUSE_CRASHREPORT
# define wxUSE_CRASHREPORT 0
# endif
#endif /* wxUSE_CRASHREPORT */
#if wxUSE_PROTOCOL_FILE || wxUSE_PROTOCOL_FTP || wxUSE_PROTOCOL_HTTP #if wxUSE_PROTOCOL_FILE || wxUSE_PROTOCOL_FTP || wxUSE_PROTOCOL_HTTP
# if !wxUSE_PROTOCOL # if !wxUSE_PROTOCOL
# ifdef wxABORT_ON_CONFIG_ERROR # ifdef wxABORT_ON_CONFIG_ERROR

192
include/wx/msw/chkconf.h
View File

@@ -15,6 +15,22 @@
#define _WX_MSW_CHKCONF_H_ #define _WX_MSW_CHKCONF_H_
/* ensure that MSW-specific settings are defined */ /* ensure that MSW-specific settings are defined */
#ifndef wxUSE_ACTIVEX
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_ACTIVEX must be defined."
# else
# define wxUSE_ACTIVEX 0
# endif
#endif /* !defined(wxUSE_ACTIVEX) */
#ifndef wxUSE_CRASHREPORT
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_CRASHREPORT must be defined."
# else
# define wxUSE_CRASHREPORT 0
# endif
#endif /* !defined(wxUSE_CRASHREPORT) */
#ifndef wxUSE_DC_CACHEING #ifndef wxUSE_DC_CACHEING
# ifdef wxABORT_ON_CONFIG_ERROR # ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_DC_CACHEING must be defined" # error "wxUSE_DC_CACHEING must be defined"
@@ -23,27 +39,61 @@
# endif # endif
#endif /* wxUSE_DC_CACHEING */ #endif /* wxUSE_DC_CACHEING */
#ifndef wxUSE_DIALUP_MANAGER
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_DIALUP_MANAGER must be defined."
# else
# define wxUSE_DIALUP_MANAGER 0
# endif
#endif /* !defined(wxUSE_DIALUP_MANAGER) */
/* #ifndef wxUSE_MS_HTML_HELP
* disable the settings which don't work for some compilers # ifdef wxABORT_ON_CONFIG_ERROR
*/ # error "wxUSE_MS_HTML_HELP must be defined."
# else
# define wxUSE_MS_HTML_HELP 0
# endif
#endif /* !defined(wxUSE_MS_HTML_HELP) */
/* #ifndef wxUSE_OLE
* If using PostScript-in-MSW in Univ, must enable PostScript # ifdef wxABORT_ON_CONFIG_ERROR
*/ # error "wxUSE_OLE must be defined."
#if defined(__WXUNIVERSAL__) && wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW && !wxUSE_POSTSCRIPT # else
# undef wxUSE_POSTSCRIPT # define wxUSE_OLE 0
# define wxUSE_POSTSCRIPT 1 # endif
#endif #endif /* !defined(wxUSE_OLE) */
#ifndef wxUSE_NORLANDER_HEADERS #ifndef wxUSE_OLE_AUTOMATION
# if ( wxCHECK_WATCOM_VERSION(1,0) || defined(__WINE__) ) || \ # ifdef wxABORT_ON_CONFIG_ERROR
((defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))) # error "wxUSE_OLE_AUTOMATION must be defined."
# define wxUSE_NORLANDER_HEADERS 1 # else
# else # define wxUSE_OLE_AUTOMATION 0
# define wxUSE_NORLANDER_HEADERS 0 # endif
# endif #endif /* !defined(wxUSE_OLE_AUTOMATION) */
#endif
#ifndef wxUSE_UNICODE_MSLU
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_UNICODE_MSLU must be defined."
# else
# define wxUSE_UNICODE_MSLU 0
# endif
#endif /* wxUSE_UNICODE_MSLU */
#ifndef wxUSE_UXTHEME
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_UXTHEME must be defined."
# else
# define wxUSE_UXTHEME 0
# endif
#endif /* wxUSE_UXTHEME */
#ifndef wxUSE_UXTHEME_AUTO
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_UXTHEME_AUTO must be defined."
# else
# define wxUSE_UXTHEME_AUTO 0
# endif
#endif /* wxUSE_UXTHEME_AUTO */
/* /*
* We don't want to give an error if wxUSE_UNICODE_MSLU is enabled but * We don't want to give an error if wxUSE_UNICODE_MSLU is enabled but
@@ -57,13 +107,18 @@
# define wxUSE_UNICODE_MSLU 0 # define wxUSE_UNICODE_MSLU 0
#endif #endif
/* /*
* Don't use MSLU if compiling with Wine * disable the settings which don't work for some compilers
*/ */
#if wxUSE_UNICODE_MSLU && defined(__WINE__) #ifndef wxUSE_NORLANDER_HEADERS
# undef wxUSE_UNICODE_MSLU # if ( wxCHECK_WATCOM_VERSION(1,0) || defined(__WINE__) ) || \
# define wxUSE_UNICODE_MSLU 0 ((defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95))))
# define wxUSE_NORLANDER_HEADERS 1
# else
# define wxUSE_NORLANDER_HEADERS 0
# endif
#endif #endif
/* /*
@@ -189,86 +244,34 @@
#endif #endif
/* check that MSW-specific options are defined too */
#ifndef wxUSE_ACTIVEX
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_ACTIVEX must be defined."
# else
# define wxUSE_ACTIVEX 0
# endif
#endif /* !defined(wxUSE_ACTIVEX) */
#ifndef wxUSE_DIALUP_MANAGER
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_DIALUP_MANAGER must be defined."
# else
# define wxUSE_DIALUP_MANAGER 0
# endif
#endif /* !defined(wxUSE_DIALUP_MANAGER) */
#ifndef wxUSE_MS_HTML_HELP
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_MS_HTML_HELP must be defined."
# else
# define wxUSE_MS_HTML_HELP 0
# endif
#endif /* !defined(wxUSE_MS_HTML_HELP) */
#ifndef wxUSE_OLE
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_OLE must be defined."
# else
# define wxUSE_OLE 0
# endif
#endif /* !defined(wxUSE_OLE) */
#ifndef wxUSE_OLE_AUTOMATION
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_OLE_AUTOMATION must be defined."
# else
# define wxUSE_OLE_AUTOMATION 0
# endif
#endif /* !defined(wxUSE_OLE_AUTOMATION) */
#ifndef wxUSE_UNICODE_MSLU
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_UNICODE_MSLU must be defined."
# else
# define wxUSE_UNICODE_MSLU 0
# endif
#endif /* wxUSE_UNICODE_MSLU */
#ifndef wxUSE_UXTHEME
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_UXTHEME must be defined."
# else
# define wxUSE_UXTHEME 0
# endif
#endif /* wxUSE_UXTHEME */
#ifndef wxUSE_UXTHEME_AUTO
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_UXTHEME_AUTO must be defined."
# else
# define wxUSE_UXTHEME_AUTO 0
# endif
#endif /* wxUSE_UXTHEME_AUTO */
/* /*
un/redefine the options which we can't compile (after checking that they're un/redefine the options which we can't compile (after checking that they're
defined defined
*/ */
#ifdef __WINE__ #ifdef __WINE__
/* apparently it doesn't compile under Wine, remove it/when it does */ # if wxUSE_ACTIVEX
#if wxUSE_ACTIVEX # undef wxUSE_ACTIVEX
#undef wxUSE_ACTIVEX # define wxUSE_ACTIVEX 0
#define wxUSE_ACTIVEX 0 # endif /* wxUSE_ACTIVEX */
#endif /* wxUSE_ACTIVEX */
# if wxUSE_UNICODE_MSLU
# undef wxUSE_UNICODE_MSLU
# define wxUSE_UNICODE_MSLU 0
# endif /* wxUSE_UNICODE_MSLU */
#endif /* __WINE__ */ #endif /* __WINE__ */
/* check settings consistency for MSW-specific ones */ /* check settings consistency for MSW-specific ones */
#if wxUSE_CRASHREPORT && !wxUSE_ON_FATAL_EXCEPTION
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_CRASHREPORT requires wxUSE_ON_FATAL_EXCEPTION"
# else
# undef wxUSE_CRASHREPORT
# define wxUSE_CRASHREPORT 0
# endif
#endif /* wxUSE_CRASHREPORT */
#if !wxUSE_VARIANT #if !wxUSE_VARIANT
# if wxUSE_ACTIVEX # if wxUSE_ACTIVEX
# ifdef wxABORT_ON_CONFIG_ERROR # ifdef wxABORT_ON_CONFIG_ERROR
@@ -375,4 +378,9 @@
# endif # endif
#endif /* !wxUSE_ACTIVEX */ #endif /* !wxUSE_ACTIVEX */
#if defined(__WXUNIVERSAL__) && wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW && !wxUSE_POSTSCRIPT
# undef wxUSE_POSTSCRIPT
# define wxUSE_POSTSCRIPT 1
#endif
#endif /* _WX_MSW_CHKCONF_H_ */ #endif /* _WX_MSW_CHKCONF_H_ */

2
setup.h.in
View File

@@ -578,7 +578,9 @@
#define wxUSE_UTF8_LOCALE_ONLY 0 #define wxUSE_UTF8_LOCALE_ONLY 0
/* wxMSW-only options */
#define wxUSE_DC_CACHEING 0 #define wxUSE_DC_CACHEING 0
#define wxUSE_CRASHREPORT 0
#define wxUSE_GADGETS 0 #define wxUSE_GADGETS 0