projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor fixes to #include
[wxWidgets.git]
/
setup.h.in
diff --git
a/setup.h.in
b/setup.h.in
index f705138663bd564d97d6fb053338374e12e23d0a..5404666d87a81d5670605abf8df5494d5568a850 100644
(file)
--- a/
setup.h.in
+++ b/
setup.h.in
@@
-1,4
+1,4
@@
-/* This define (__WX_SETUP_H__) is used both to
i
nsure setup.h is included
+/* This define (__WX_SETUP_H__) is used both to
e
nsure setup.h is included
* only once and to indicate that we are building using configure. */
#ifndef __WX_SETUP_H__
#define __WX_SETUP_H__
* only once and to indicate that we are building using configure. */
#ifndef __WX_SETUP_H__
#define __WX_SETUP_H__
@@
-85,6
+85,9
@@
#undef __DATA_GENERAL__
#undef __EMX__
#undef __DATA_GENERAL__
#undef __EMX__
+/* NanoX (with wxX11) */
+#define wxUSE_NANOX 0
+
/* PowerPC Darwin & Mac OS X */
#undef __POWERPC__
/* PowerPC Darwin & Mac OS X */
#undef __POWERPC__
@@
-110,6
+113,10
@@
#define wxUSE_OWNER_DRAWN 1
#endif
#define wxUSE_OWNER_DRAWN 1
#endif
+#if defined(__WXPM__)
+#define wxUSE_OWNER_DRAWN 1
+#endif
+
/* enable rich edit under Win32 */
#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__)
#define wxUSE_RICHEDIT 1
/* enable rich edit under Win32 */
#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__)
#define wxUSE_RICHEDIT 1
@@
-501,6
+508,11
@@
* Use wxFFile class
*/
#define wxUSE_FFILE 0
* Use wxFFile class
*/
#define wxUSE_FFILE 0
+/*
+ * Use wxFSVolume class
+ */
+#define wxUSE_FSVOLUME 1
+
/*
* Use wxTextBuffer class
*/
/*
* Use wxTextBuffer class
*/
@@
-550,6
+562,13
@@
* Use intl system
*/
#define wxUSE_INTL 0
* Use intl system
*/
#define wxUSE_INTL 0
+/*
+ * Use wxProtocol and related classes
+ */
+#define wxUSE_PROTOCOL 0
+#define wxUSE_PROTOCOL_FILE 0
+#define wxUSE_PROTOCOL_FTP 0
+#define wxUSE_PROTOCOL_HTTP 0
/*
* Use streams
*/
/*
* Use streams
*/
@@
-611,6
+630,11
@@
*/
#define wxUSE_UNICODE_MSLU 0
*/
#define wxUSE_UNICODE_MSLU 0
+/*
+ * Use wxURL class
+ */
+#define wxUSE_URL 0
+
/*
* Work around a bug in GNU libc 5.x wcstombs() implementation.
*
/*
* Work around a bug in GNU libc 5.x wcstombs() implementation.
*
@@
-806,6
+830,11
@@
*/
#define wxUSE_PCX 0
*/
#define wxUSE_PCX 0
+/*
+ * IFF image format support
+ */
+#define wxUSE_IFF 0
+
/*
* PNM image format support
*/
/*
* PNM image format support
*/
@@
-816,6
+845,11
@@
*/
#define wxUSE_XPM 0
*/
#define wxUSE_XPM 0
+/*
+ * MS ICO (and CUR,ANI derivatives) image format support (on any platform)
+ */
+#define wxUSE_ICO_CUR 0
+
/*
* Disable this if your compiler can't cope
* with omission of prototype parameters.
/*
* Disable this if your compiler can't cope
* with omission of prototype parameters.
@@
-848,9
+882,6
@@
/* struct tm doesn't always have the tm_gmtoff field, define this if it does */
#undef WX_GMTOFF_IN_TM
/* struct tm doesn't always have the tm_gmtoff field, define this if it does */
#undef WX_GMTOFF_IN_TM
-/* iconv()'s 2nd argument is char ** and not const char ** */
-#undef WX_ICONV_TAKES_CHAR
-
/* Define if you have pw_gecos field in struct passwd */
#undef HAVE_PW_GECOS
/* Define if you have pw_gecos field in struct passwd */
#undef HAVE_PW_GECOS
@@
-1034,11
+1065,11
@@
/* Define if you have the <wctype.h> header file. */
#undef HAVE_WCTYPE_H
/* Define if you have the <wctype.h> header file. */
#undef HAVE_WCTYPE_H
-/* Define if you have the <iconv.h> header file. */
-#undef HAVE_ICONV
_H
+/* Define if you have the <iconv.h> header file
and iconv() symbol
. */
+#undef HAVE_ICONV
-/*
Test for GLIBC 2.2 iconv()
*/
-#undef
WX_ICONV_TAKES_CHAR
+/*
Define as "const" if the declaration of iconv() needs const.
*/
+#undef
ICONV_CONST
/* Define if you have the <langinfo.h> header file. */
#undef HAVE_LANGINFO_H
/* Define if you have the <langinfo.h> header file. */
#undef HAVE_LANGINFO_H