wxUSE_SIZE_T_STRING_OPERATOR fix

[wxWidgets.git] / setup / setup.hin

diff --git a/setup/setup.hin b/setup/setup.hin
index dd9f0047b895e3e56568425eea4ee1ae19d734ec..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
 
    Leave the following blank line there!!  Autoheader needs it.  */
 \f
 

-// ------------------------------------------------------------------------
-// Features as requested by configure
-// ------------------------------------------------------------------------
+/* ------------------------------------------------------------------------ */
+/* Features as requested by configure                                       */
+/* ------------------------------------------------------------------------ */

 
 #ifndef __GTKSETUPH__
 #define __GTKSETUPH__
 
 #ifndef __GTKSETUPH__
 #define __GTKSETUPH__


@@ -35,247 +35,255 @@
 #undef __ULTRIX__
 #undef __DATA_GENERAL__
 
 #undef __ULTRIX__
 #undef __DATA_GENERAL__
 

-//------------------------------------------------------------------------
-// library options
-//------------------------------------------------------------------------
+/* ------------------------------------------------------------------------ */
+/* compiler options                                                         */
+/* ------------------------------------------------------------------------ */
+
+/*
+ * Supports bool type
+ */
+#undef HAVE_BOOL
+
+/* ------------------------------------------------------------------------ */
+/* library options                                                          */
+/* ------------------------------------------------------------------------ */

 
 /*
  * Use zlib
  */
 
 /*
  * Use zlib
  */

-#undef wxUSE_ZLIB
+#define wxUSE_ZLIB 0

 /*
  * Use libpng
  */
 /*
  * Use libpng
  */

-#undef wxUSE_LIBPNG
+#define wxUSE_LIBPNG 0

 /*
 /*

- * Use iODBC
+ * Use libjpeg

  */
  */

-#undef wxUSE_ODBC
+#define wxUSE_LIBJPEG 0

 /*
 /*

- * Use Threads
+ * Use iODBC

  */
  */

-#undef wxUSE_THREADS
-
-//------------------------------------------------------------------------
-// GUI control options
-//------------------------------------------------------------------------
-
+#define wxUSE_ODBC 0

 /*
 /*

- * Use gauge item
+ * Use Threads

  */
  */

-#undef wxUSE_GAUGE
+#define wxUSE_THREADS 0

 /*
 /*

- * Use combobox item
+ * Have glibc2

  */
  */

-#undef wxUSE_COMBOBOX
+#define wxHAVE_GLIBC2 0

 /*
 /*

- * Use scrollbar item
+ * Use libXpm

  */
  */

-#undef wxUSE_SCROLLBAR
+#define wxHAVE_LIB_XPM 0
+
+/* ------------------------------------------------------------------------ */
+/* GUI control options (always enabled in wxGTK)                            */
+/* ------------------------------------------------------------------------ */

 /*
 /*

- * Use notebook item
+ * Use gauge item

  */
  */

-#undef wxUSE_NOTEBOOK
+#define wxUSE_GAUGE 1

 /*
 /*

- * Use listctrl item
+ * Use combobox item

  */
  */

-#undef wxUSE_LISTCTRL
+#define wxUSE_COMBOBOX 1

 /*
 /*

- * Use treectrl item
+ * Use scrollbar item

  */
  */

-#undef wxUSE_TREECTRL
+#define wxUSE_SCROLLBAR 1

 /*
 /*

- * Use grid item
+ * Use scrollbar item

  */
  */

-#undef wxUSE_GRID
+#define wxUSE_RADIOBUTTON 1

 /*
 /*

- * Use tab dialog item
+ * Use toolbar item

  */
  */

-#undef wxUSE_TAB_DIALOG
+#define wxUSE_TOOLBAR 1

 
 

-//------------------------------------------------------------------------
-// non-GUI options
-//------------------------------------------------------------------------
+/* ------------------------------------------------------------------------ */
+/* non-GUI options                                                          */
+/* ------------------------------------------------------------------------ */

 
 

-/*
- * Use fraction class
- */
-#undef wxUSE_FRACTION

 /*
  * Use time and date classes
  */
 /*
  * Use time and date classes
  */

-#undef wxUSE_TIMEDATE
+#define wxUSE_TIMEDATE 0

 /*
  * Use config system
  */
 /*
  * Use config system
  */

-#undef wxUSE_CONFIG
+#define wxUSE_CONFIG 0

 /*
  * Use intl system
  */
 /*
  * Use intl system
  */

-#undef wxUSE_INTL
+#define wxUSE_INTL 0

 /*
  * Use streams
  */
 /*
  * Use streams
  */

-#undef wxUSE_STREAMS
+#define wxUSE_STREAMS 0

 /*
 /*

- * Use wxFile
+ * Use class serialization

  */
  */

-#undef wxUSE_FILE
+#define wxUSE_SERIAL 0

 /*
 /*

- * Use wxTextFile
+ * Use sockets

  */
  */

-#undef wxUSE_TEXTFILE
+#define wxUSE_SOCKETS 0

 /*
 /*

- * Use class serialization
+ * Use standard C++ streams if 1. If 0, use wxWin
+ * streams implementation.
+ */
+#define wxUSE_STD_IOSTREAM  1
+/*
+ * Use constraints mechanism

  */
  */

-#undef wxUSE_SERIAL
+#define wxUSE_CONSTRAINTS 1

 
 

-//------------------------------------------------------------------------
-// PS options
-//------------------------------------------------------------------------
+/* ------------------------------------------------------------------------ */
+/* PS options                                                               */
+/* ------------------------------------------------------------------------ */

 
 /*
  * Use font metric files in GetTextExtent for wxPostScriptDC
  * Use consistent PostScript fonts for AFM and printing (!)
  */
 
 /*
  * Use font metric files in GetTextExtent for wxPostScriptDC
  * Use consistent PostScript fonts for AFM and printing (!)
  */

-#undef wxUSE_AFM_FOR_POSTSCRIPT
-#undef WX_NORMALIZED_PS_FONTS
+#define wxUSE_AFM_FOR_POSTSCRIPT 0
+#define WX_NORMALIZED_PS_FONTS 0

 /*
  * Use PostScript device context
  */
 /*
  * Use PostScript device context
  */

-#undef wxUSE_POSTSCRIPT
+#define wxUSE_POSTSCRIPT 0

 
 

-//------------------------------------------------------------------------
-// wxString options
-//------------------------------------------------------------------------
+/* ------------------------------------------------------------------------ */
+/* wxString options                                                         */
+/* ------------------------------------------------------------------------ */

 
 /*
  * Compile wxString with wide character (Unicode) support?
  */
 
 /*
  * Compile wxString with wide character (Unicode) support?
  */

-#undef wxUSE_UNICODE
+#define wxUSE_UNICODE 0

 
 /*
  * Work around a bug in GNU libc 5.x wcstombs() implementation.
  *
  * 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
 
 /*
  * Work around a bug in GNU libc 5.x wcstombs() implementation.
  *
  * 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
+
+/*
+ * 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.

  */
  */

-#undef wxUSE_WCSRTOMBS
+#define wxUSE_SIZE_T_STRING_OPERATOR 0

 
 

-//------------------------------------------------------------------------
-// misc options
-//------------------------------------------------------------------------
+/* ------------------------------------------------------------------------ */
+/* misc options                                                             */
+/* ------------------------------------------------------------------------ */

 
 /*
  * Use Interprocess communication
  */
 
 /*
  * Use Interprocess communication
  */

-#undef wxUSE_IPC
+#define wxUSE_IPC 0

 /*
  * Use wxGetResource & wxWriteResource (change .Xdefaults)
  */
 /*
  * Use wxGetResource & wxWriteResource (change .Xdefaults)
  */

-#undef wxUSE_RESOURCES
+#define wxUSE_RESOURCES 0

 /*
  * Use clipboard
  */
 /*
  * Use clipboard
  */

-#undef wxUSE_CLIPBOARD
+#define wxUSE_CLIPBOARD 0
+/*
+ * Use tooltips
+ */
+#define wxUSE_TOOLTIPS 0

 /*
  * Use dnd
  */
 /*
  * Use dnd
  */

-#undef wxUSE_DND
+#define wxUSE_DRAG_AND_DROP 0

 /*
 /*

- * Use wxWindows layout constraint system
+ * Use wxLibrary class

  */
  */

-#undef wxUSE_CONSTRAINTS
- 
-//------------------------------------------------------------------------
-// architecture options
-//------------------------------------------------------------------------
- 
+#define wxUSE_DYNLIB_CLASS 0
+
+/* ------------------------------------------------------------------------ */
+/* architecture options                                                     */
+/* ------------------------------------------------------------------------ */
+

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

-#undef wxUSE_MDI_ARCHITECTURE
+#define wxUSE_MDI_ARCHITECTURE 0

 /*
  * Use the document/view architecture
  */
 /*
  * Use the document/view architecture
  */

-#undef wxUSE_DOC_VIEW_ARCHITECTURE
+#define wxUSE_DOC_VIEW_ARCHITECTURE 0

 /*
  * Use the print/preview architecture
  */
 /*
  * Use the print/preview architecture
  */

-#undef wxUSE_PRINTING_ARCHITECTURE
+#define wxUSE_PRINTING_ARCHITECTURE 0

 
 

-//------------------------------------------------------------------------
-// Prolog and wxWindows' resource system options
-//------------------------------------------------------------------------
+/* ------------------------------------------------------------------------ */
+/* Prolog and wxWindows' resource system options                            */
+/* ------------------------------------------------------------------------ */

 
 /*
  * Use Prolog IO
  */
 
 /*
  * Use Prolog IO
  */

-#undef wxUSE_PROLOGIO
+#define wxUSE_PROLOGIO 0

 /*
  * Use Remote Procedure Call (Needs wxUSE_IPC and wxUSE_PROLOGIO)
  */
 /*
  * Use Remote Procedure Call (Needs wxUSE_IPC and wxUSE_PROLOGIO)
  */

-#undef wxUSE_RPC
+#define wxUSE_RPC 0

 /*
  * Use wxWindows resource loading (.wxr-files) (Needs wxUSE_PROLOGIO 1)
  */
 /*
  * Use wxWindows resource loading (.wxr-files) (Needs wxUSE_PROLOGIO 1)
  */

-#undef wxUSE_WX_RESOURCES
+#define wxUSE_WX_RESOURCES 0

 
 

-//------------------------------------------------------------------------
-// the rest
-//------------------------------------------------------------------------
+/* ------------------------------------------------------------------------ */
+/* the rest                                                                 */
+/* ------------------------------------------------------------------------ */

 
 

-/*
- * Implement a GLCanvas class as an interface to OpenGL, using the GLX
- * extension to the X11 protocol.  You can use the (free) Mesa library
- * if you don't have a 'real' OpenGL.
- */
-#undef wxUSE_GLX

 /*
  * Use wxWindows help facility (needs wxUSE_IPC 1)
  */
 /*
  * Use wxWindows help facility (needs wxUSE_IPC 1)
  */

-#undef wxUSE_HELP
+#define wxUSE_HELP 0

 /*
  * Use iostream.h rather than iostream
  */
 /*
  * Use iostream.h rather than iostream
  */

-#undef wxUSE_IOSTREAMH
-/*
- * Use Metafile and Metafile device context
- */
-#undef wxUSE_METAFILE
-/*
- * Use wxGraph
- */
-#undef wxUSE_WXGRAPH
-/*
- * Use wxTree
- */
-#undef wxUSE_WXTREE
+#define wxUSE_IOSTREAMH 0

 /*
  * Use Apple Ieee-double converter
  */
 /*
  * Use Apple Ieee-double converter
  */

-#undef wxUSE_APPLE_IEEE
+#define wxUSE_APPLE_IEEE 0

 /* Compatibility with 1.66 API.
    Level 0: no backward compatibility, all new features
    Level 1: wxDC, OnSize (etc.) compatibility, but
    some new features such as event tables */
 /* Compatibility with 1.66 API.
    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
  */
 /*
  * Enables debugging: memory tracing, assert, etc., contains debug level
  */

-#undef WXDEBUG
+#define WXDEBUG 0

 /*
  * Enables debugging version of wxObject::new and wxObject::delete (IF WXDEBUG)
  * WARNING: this code may not work with all architectures, especially
  * if alignment is an issue.
  */
 /*
  * Enables debugging version of wxObject::new and wxObject::delete (IF WXDEBUG)
  * WARNING: this code may not work with all architectures, especially
  * if alignment is an issue.
  */

-#undef wxUSE_MEMORY_TRACING
+#define wxUSE_MEMORY_TRACING 0

 /*
  * Enable debugging version of global memory operators new and delete
  * Disable it, If this causes problems (e.g. link errors)
  */
 /*
  * Enable debugging version of global memory operators new and delete
  * Disable it, If this causes problems (e.g. link errors)
  */

-#undef wxUSE_GLOBAL_MEMORY_OPERATORS
+#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.
+ */
+#define wxUSE_GLOBAL_MEMORY_OPERATORS 0

 /*
  * Matthews garbage collection (used for MrEd?)
  */
 /*
  * Matthews garbage collection (used for MrEd?)
  */


@@ -304,9 +312,9 @@
  */
 #define CONST_COMPATIBILITY 0
 
  */
 #define CONST_COMPATIBILITY 0
 

-// ------------------------------------------------------------------------
-// System-specific stuff
-// ------------------------------------------------------------------------
+/* ------------------------------------------------------------------------ */
+/* System-specific stuff                                                    */
+/* ------------------------------------------------------------------------ */

 
 /* acconfig.h
    This file is in the public domain.
 
 /* acconfig.h
    This file is in the public domain.


@@ -356,6 +364,9 @@
    Usually this is either `int' or `gid_t'.  */
 #undef GETGROUPS_T
 
    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
 
 /* Define if the `getloadavg' function needs to be run setuid or setgid.  */
 #undef GETLOADAVG_PRIVILEGED
 


@@ -374,12 +385,48 @@
 /* Define if you don't have vprintf but do have _doprnt.  */
 #undef HAVE_DOPRNT
 
 /* 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 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 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
 
 /* Define if your system has its own `getloadavg' function.  */
 #undef HAVE_GETLOADAVG
 


@@ -500,6 +547,7 @@
 #undef SIZEOF_INT
 #undef SIZEOF_INT_P
 #undef SIZEOF_LONG
 #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
 
 /* Define to `unsigned' if <sys/types.h> doesn't define.  */
 #undef size_t