wxUSE_SIZE_T_STRING_OPERATOR fix

[wxWidgets.git] / setup / setup.hin

diff --git a/setup/setup.hin b/setup/setup.hin
index 00c77c8b6cd1916131f91d9fd8cf1c9325ccfeb0..3ae663ed69869037b0f2879d0003cf71e04c20cb 100644 (file)
--- a/setup/setup.hin
+++ b/setup/setup.hin
@@ -5,9 +5,9 @@
    Leave the following blank line there!!  Autoheader needs it.  */
 \f
 
-// ------------------------------------------------------------------------
-// Features as requested by configure
-// ------------------------------------------------------------------------
+/* ------------------------------------------------------------------------ */
+/* Features as requested by configure                                       */
+/* ------------------------------------------------------------------------ */
 
 #ifndef __GTKSETUPH__
 #define __GTKSETUPH__
@@ -35,9 +35,18 @@
 #undef __ULTRIX__
 #undef __DATA_GENERAL__
 
-//------------------------------------------------------------------------
-// library options
-//------------------------------------------------------------------------
+/* ------------------------------------------------------------------------ */
+/* compiler options                                                         */
+/* ------------------------------------------------------------------------ */
+
+/*
+ * Supports bool type
+ */
+#undef HAVE_BOOL
+
+/* ------------------------------------------------------------------------ */
+/* library options                                                          */
+/* ------------------------------------------------------------------------ */
 
 /*
  * Use zlib
@@ -63,11 +72,14 @@
  * Have glibc2
  */
 #define wxHAVE_GLIBC2 0
+/*
+ * Use libXpm
+ */
+#define wxHAVE_LIB_XPM 0
 
-//------------------------------------------------------------------------
-// GUI control options (always enabled in wxGTK)
-//------------------------------------------------------------------------
-
+/* ------------------------------------------------------------------------ */
+/* GUI control options (always enabled in wxGTK)                            */
+/* ------------------------------------------------------------------------ */
 /*
  * Use gauge item
  */
@@ -84,10 +96,14 @@
  * Use scrollbar item
  */
 #define wxUSE_RADIOBUTTON 1
+/*
+ * Use toolbar item
+ */
+#define wxUSE_TOOLBAR 1
 
-//------------------------------------------------------------------------
-// non-GUI options
-//------------------------------------------------------------------------
+/* ------------------------------------------------------------------------ */
+/* non-GUI options                                                          */
+/* ------------------------------------------------------------------------ */
 
 /*
  * Use time and date classes
@@ -109,6 +125,10 @@
  * Use class serialization
  */
 #define wxUSE_SERIAL 0
+/*
+ * Use sockets
+ */
+#define wxUSE_SOCKETS 0
 /*
  * Use standard C++ streams if 1. If 0, use wxWin
  * streams implementation.
@@ -119,9 +139,9 @@
  */
 #define wxUSE_CONSTRAINTS 1
 
-//------------------------------------------------------------------------
-// PS options
-//------------------------------------------------------------------------
+/* ------------------------------------------------------------------------ */
+/* PS options                                                               */
+/* ------------------------------------------------------------------------ */
 
 /*
  * Use font metric files in GetTextExtent for wxPostScriptDC
@@ -134,9 +154,9 @@
  */
 #define wxUSE_POSTSCRIPT 0
 
-//------------------------------------------------------------------------
-// wxString options
-//------------------------------------------------------------------------
+/* ------------------------------------------------------------------------ */
+/* wxString options                                                         */
+/* ------------------------------------------------------------------------ */
 
 /*
  * Compile wxString with wide character (Unicode) support?
@@ -148,13 +168,20 @@
  *
  * Note that you must link your programs with libc.a if you enable this and you
  * have libc 5 (you should enable this for libc6 where wcsrtombs() is
- * thread-safe version of wcstombs()). 
+ * thread-safe version of wcstombs()).
  */
 #define wxUSE_WCSRTOMBS 0
 
-//------------------------------------------------------------------------
-// misc options
-//------------------------------------------------------------------------
+/*
+ * On some platforms overloading on size_t/int doesn't work, yet we'd like
+ * to define both size_t and int version of wxString::operator[] because it
+ * should really be size_t, but a lot of old, broken code uses int indices.
+ */
+#define wxUSE_SIZE_T_STRING_OPERATOR 0
+
+/* ------------------------------------------------------------------------ */
+/* misc options                                                             */
+/* ------------------------------------------------------------------------ */
 
 /*
  * Use Interprocess communication
@@ -176,11 +203,15 @@
  * Use dnd
  */
 #define wxUSE_DRAG_AND_DROP 0
- 
-//------------------------------------------------------------------------
-// architecture options
-//------------------------------------------------------------------------
- 
+/*
+ * Use wxLibrary class
+ */
+#define wxUSE_DYNLIB_CLASS 0
+
+/* ------------------------------------------------------------------------ */
+/* architecture options                                                     */
+/* ------------------------------------------------------------------------ */
+
 /*
  * Use the mdi architecture
  */
@@ -194,9 +225,9 @@
  */
 #define wxUSE_PRINTING_ARCHITECTURE 0
 
-//------------------------------------------------------------------------
-// Prolog and wxWindows' resource system options
-//------------------------------------------------------------------------
+/* ------------------------------------------------------------------------ */
+/* Prolog and wxWindows' resource system options                            */
+/* ------------------------------------------------------------------------ */
 
 /*
  * Use Prolog IO
@@ -211,9 +242,9 @@
  */
 #define wxUSE_WX_RESOURCES 0
 
-//------------------------------------------------------------------------
-// the rest
-//------------------------------------------------------------------------
+/* ------------------------------------------------------------------------ */
+/* the rest                                                                 */
+/* ------------------------------------------------------------------------ */
 
 /*
  * Use wxWindows help facility (needs wxUSE_IPC 1)
@@ -231,7 +262,7 @@
    Level 0: no backward compatibility, all new features
    Level 1: wxDC, OnSize (etc.) compatibility, but
    some new features such as event tables */
-#define WXWIN_COMPATIBILITY  1
+#define WXWIN_COMPATIBILITY  0
 /*
  * Enables debugging: memory tracing, assert, etc., contains debug level
  */
@@ -247,10 +278,10 @@
  * Disable it, If this causes problems (e.g. link errors)
  */
 #define wxUSE_DEBUG_NEW_ALWAYS 1
-/* 
+/*
  * In debug mode, causes new to be defined to
- * be WXDEBUG_NEW (see object.h). If this causes 
- * problems (e.g. link errors), set this to 0. 
+ * be WXDEBUG_NEW (see object.h). If this causes
+ * problems (e.g. link errors), set this to 0.
  */
 #define wxUSE_GLOBAL_MEMORY_OPERATORS 0
 /*
@@ -281,9 +312,9 @@
  */
 #define CONST_COMPATIBILITY 0
 
-// ------------------------------------------------------------------------
-// System-specific stuff
-// ------------------------------------------------------------------------
+/* ------------------------------------------------------------------------ */
+/* System-specific stuff                                                    */
+/* ------------------------------------------------------------------------ */
 
 /* acconfig.h
    This file is in the public domain.
@@ -333,6 +364,9 @@
    Usually this is either `int' or `gid_t'.  */
 #undef GETGROUPS_T
 
+/* The type of 3rd argument to getsockname() - usually size_t or int */
+#undef SOCKLEN_T
+
 /* Define if the `getloadavg' function needs to be run setuid or setgid.  */
 #undef GETLOADAVG_PRIVILEGED
 
@@ -351,12 +385,48 @@
 /* Define if you don't have vprintf but do have _doprnt.  */
 #undef HAVE_DOPRNT
 
+/* Define if you have sched.h */
+#undef HAVE_SCHED_H
+
+/* Define if you have strings.h */
+#undef HAVE_STRINGS_H
+
 /* Define if you have vprintf() */
 #undef HAVE_VPRINTF
 
+/* Define if you have dlopen() */
+#undef HAVE_DLOPEN
+
+/* Define if you have shl_load() */
+#undef HAVE_SHL_LOAD
+
 /* Define if you have vsnprintf() */
 #undef HAVE_VSNPRINTF
 
+/* Define if you have usleep() */
+#undef HAVE_USLEEP
+
+/* Define if you have nanosleep() */
+#undef HAVE_NANOSLEEP
+
+/* Define if you have vfork() */
+#undef HAVE_VFORK
+
+/* Define if you have uname() */
+#undef HAVE_UNAME
+
+/* Define if you have gethostname() */
+#undef HAVE_GETHOSTNAME
+
+/* Define if you have sched_yield */
+#undef HAVE_SCHED_YIELD
+
+/* Define if you have pthread_cancel */
+#undef HAVE_PTHREAD_CANCEL
+
+/* Define if you have all functions to set thread priority */
+#undef HAVE_THREAD_PRIORITY_FUNCTIONS
+
 /* Define if your system has its own `getloadavg' function.  */
 #undef HAVE_GETLOADAVG
 
@@ -477,6 +547,7 @@
 #undef SIZEOF_INT
 #undef SIZEOF_INT_P
 #undef SIZEOF_LONG
+#undef SIZEOF_LONG_LONG
 
 /* Define to `unsigned' if <sys/types.h> doesn't define.  */
 #undef size_t