always let the multiline text control process the Enter key presses

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 09f018e62d7959d7b4bf47eddf55a79d69712b08..5404666d87a81d5670605abf8df5494d5568a850 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -1,4 +1,4 @@
-/* This define (__WX_SETUP_H__) is used both to insure setup.h is included
+/* This define (__WX_SETUP_H__) is used both to ensure 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,9 +85,15 @@
 #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__
 

+/* MS-DOS with DJGPP */
+#undef __DOS__
+

 /* Stupid hack; __WINDOWS__ clashes with wx/defs.h */
 #ifndef __WINDOWS__
 #undef __WINDOWS__
 /* Stupid hack; __WINDOWS__ clashes with wx/defs.h */
 #ifndef __WINDOWS__
 #undef __WINDOWS__


@@ -107,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


@@ -206,6 +216,11 @@
 */
 #define wxUSE_POPUPWIN 0
 
 */
 #define wxUSE_POPUPWIN 0
 

+/*
+   Use wxTipWindow
+ */
+#define wxUSE_TIPWINDOW 0
+

 /*
  * Use accelerators
  */
 /*
  * Use accelerators
  */


@@ -493,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
  */


@@ -543,13 +563,16 @@
  */
 #define wxUSE_INTL 0
 /*
  */
 #define wxUSE_INTL 0
 /*

- * Use streams
+ * Use wxProtocol and related classes

  */
  */

-#define wxUSE_STREAMS 0
+#define wxUSE_PROTOCOL 0
+#define wxUSE_PROTOCOL_FILE 0
+#define wxUSE_PROTOCOL_FTP 0
+#define wxUSE_PROTOCOL_HTTP 0

 /*
 /*

- * Use class serialization
+ * Use streams

  */
  */

-#define wxUSE_SERIAL 0
+#define wxUSE_STREAMS 0

 /*
  * Use sockets
  */
 /*
  * Use sockets
  */


@@ -567,6 +590,10 @@
  * wxLibrary class
  */
 #define wxUSE_DYNLIB_CLASS 0
  * wxLibrary class
  */
 #define wxUSE_DYNLIB_CLASS 0

+/*
+ * Use wxObjectLoader
+ */
+#define wxUSE_DYNAMIC_LOADER 0

 
 /*
  * Use wxTimer
 
 /*
  * Use wxTimer


@@ -598,6 +625,16 @@
  */
 #define wxUSE_UNICODE 0
 
  */
 #define wxUSE_UNICODE 0
 

+/*
+ * Use MS Layer for Unicode on Win9X (Win32 only)?
+ */
+#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.
  *


@@ -646,10 +683,6 @@
  * Use spline
  */
 #define wxUSE_SPLINES 0
  * Use spline
  */
 #define wxUSE_SPLINES 0

-/*
- * Use wxLibrary class
- */
-#define wxUSE_DYNLIB_CLASS 0

 
 /*
  * Use the mdi architecture
 
 /*
  * Use the mdi architecture


@@ -797,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
  */


@@ -807,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.


@@ -839,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
 


@@ -959,6 +999,12 @@
 /* Define if you have the inet_aton function.  */
 #undef HAVE_INET_ATON
 
 /* Define if you have the inet_aton function.  */
 #undef HAVE_INET_ATON
 

+/* Define if you have the mktemp function.  */
+#undef HAVE_MKTEMP
+
+/* Define if you have the mkstemp function.  */
+#undef HAVE_MKSTEMP
+

 /* Define if you have the nanosleep function.  */
 #undef HAVE_NANOSLEEP
 
 /* Define if you have the nanosleep function.  */
 #undef HAVE_NANOSLEEP
 


@@ -1019,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