projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
the wxFormatString hack used in wxFileTypeInfo variadic ctors doesn't work anymore...
[wxWidgets.git]
/
include
/
wx
/
msw
/
chkconf.h
diff --git
a/include/wx/msw/chkconf.h
b/include/wx/msw/chkconf.h
index b5f92e375c676d50c5edfdba509d1e25f1e64eb7..59d5dbc43304925213eb5ab5048150dc914e830a 100644
(file)
--- a/
include/wx/msw/chkconf.h
+++ b/
include/wx/msw/chkconf.h
@@
-55,6
+55,14
@@
# endif
#endif /* !defined(wxUSE_MS_HTML_HELP) */
# endif
#endif /* !defined(wxUSE_MS_HTML_HELP) */
+#ifndef wxUSE_INICONF
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_INICONF must be defined."
+# else
+# define wxUSE_INICONF 0
+# endif
+#endif /* !defined(wxUSE_INICONF) */
+
#ifndef wxUSE_OLE
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_OLE must be defined."
#ifndef wxUSE_OLE
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_OLE must be defined."
@@
-87,14
+95,6
@@
# endif
#endif /* wxUSE_UXTHEME */
# 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
* wxUSE_UNICODE is not as this would make it impossible to simply set the
/*
* We don't want to give an error if wxUSE_UNICODE_MSLU is enabled but
* wxUSE_UNICODE is not as this would make it impossible to simply set the