Committing in .

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index ba394ebb0c8fb249566f7ecca9f3f3cb050e4776..e417a7e4c858d026c48c8cd629ceb7aeb98508c9 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -1,17 +1,24 @@
 
-/* This define (__WX_SETUP_H__) is used both to insure setup.h is included 
+/* This define (__WX_SETUP_H__) is used both to insure setup.h is included
  * only once and to indicate that we are building using configure. */
 #ifndef __WX_SETUP_H__
 #define __WX_SETUP_H__
 
 #ifdef __GNUG__
-    #pragma interface
+#pragma interface
 #endif
 
+/* never undefine inline or const keywords for C++ compilation */
+#ifndef __cplusplus
 
 /* Define to empty if the keyword does not work.  */
 #undef const
 
+/* Define as __inline if that's what the C compiler calls it.  */
+#undef inline
+
+#endif /* __cplusplus */
+
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef gid_t
 
@@ -21,9 +28,6 @@
 /* Define if you have the vprintf function.  */
 #undef HAVE_VPRINTF
 
-/* Define as __inline if that's what the C compiler calls it.  */
-#undef inline
-
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef mode_t
 
@@ -79,10 +83,15 @@
 #undef __EMX__
 #undef _GNU_SOURCE
 
+/* Stupid hack; __WINDOWS__ clashes with wx/defs.h */
+#ifndef __WINDOWS__
 #undef __WINDOWS__
+#endif
+
 #undef __WIN95__
 #undef __WIN32__
 #undef __GNUWIN32__
+#undef STRICT
 #undef WINVER
 
 /*
@@ -102,10 +111,6 @@
  * Use libjpeg
  */
 #define wxUSE_LIBJPEG 0
-/*
- * Use libgif
- */
-#define wxUSE_LIBGIF 0
 /*
  * Use iODBC
  */
@@ -130,11 +135,11 @@
 /*
  * Use GUI
  */
-#define wxUSE_GUI 1
+#define wxUSE_GUI 0
 /*
- * Defined if !wxUSE_GUI
+ * Don't use GUI (defined to 1 when compiling/using base only)
  */
-#undef wxUSE_NOGUI
+#define wxUSE_NOGUI 0
 
 /*
  * Use constraints mechanism
@@ -211,6 +216,11 @@
 /*
  * Use this control
  */
+#define wxUSE_NEW_GRID 0
+/*
+ * Use the new prototype wxGrid classes
+ * (wxUSE_GRID must also be defined)
+ */
 #define wxUSE_IMAGLIST 0
 /*
  * Use this control
@@ -280,6 +290,7 @@
 #define wxUSE_TOOLBAR 0
 
 #if defined(__WXWINE__) || defined(__GNUWIN32__)
+#define wxUSE_OWNER_DRAWN 1 
   #if wxUSE_TOOLBAR
     #define wxUSE_BUTTONBAR 1
   #endif
@@ -335,6 +346,10 @@
  * Use sockets
  */
 #define wxUSE_SOCKETS 0
+/*
+ * Use dialup manager
+ */
+#define wxUSE_DIALUP_MANAGER 0
 /*
  * Use standard C++ streams if 1. If 0, use wxWin
  * streams implementation.
@@ -361,10 +376,20 @@
 #define wxUSE_POSTSCRIPT 0
 
 /*
- * Compile wxString with wide character (Unicode) support?
+ * Compile wxString with some Unicode support?
+ */
+#define wxUSE_WCHAR_T 0
+
+/*
+ * Compile wxString in wide character (Unicode) mode?
  */
 #define wxUSE_UNICODE 0
 
+/*
+ * Compile wxString with (limited) multibyte char support?
+ */
+#define wxUSE_MULTIBYTE 0
+
 /*
  * Work around a bug in GNU libc 5.x wcstombs() implementation.
  *
@@ -374,13 +399,6 @@
  */
 #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.
- */
-#define wxUSE_SIZE_T_STRING_OPERATOR 0
-
 /*
  * Use the new experimental implementation of wxString::Printf()?
  *
@@ -454,13 +472,6 @@
  * Use Apple Ieee-double converter
  */
 #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
- */
-#define WXWIN_COMPATIBILITY 0
 /*
  * Compatibility with 2.0 API.
  */
@@ -535,6 +546,20 @@
  */
 #define wxUSE_ZIPSTREAM 0
 
+/*
+ * GIF image format support
+ */
+#define wxUSE_GIF 0
+
+/*
+ * PCX image format support
+ */
+#define wxUSE_PCX 0
+
+/*
+ * PNM image format support
+ */
+#define wxUSE_PNM 0
  
 /*
  * Disable this if your compiler can't cope
@@ -555,9 +580,22 @@
 /* The type of 3rd argument to getsockname() - usually size_t or int */
 #undef SOCKLEN_T
 
+/* gettimeofday() usually takes 2 arguments, but some really old systems might
+ * have only one, in which case define WX_GETTIMEOFDAY_NO_TZ */
+#undef WX_GETTIMEOFDAY_NO_TZ
+
 /* Define if you have dlopen() */
 #undef HAVE_DLOPEN
 
+/* Define if you have gettimeofday() */
+#undef HAVE_GETTIMEOFDAY
+
+/* Define if you have ftime() */
+#undef HAVE_FTIME
+
+/* Define if you have localtime() */
+#undef HAVE_LOCALTIME
+
 /* Define if you have nanosleep() */
 #undef HAVE_NANOSLEEP
 
@@ -624,6 +662,9 @@
 /* Define if you have the shl_load function.  */
 #undef HAVE_SHL_LOAD
 
+/* Define if you have strtok_r function. */
+#undef HAVE_STRTOK_R
+
 /* Define if you have the uname function.  */
 #undef HAVE_UNAME
 
@@ -633,9 +674,6 @@
 /* Define if you have the vfork function.  */
 #undef HAVE_VFORK
 
-/* Define if you have the vsnprintf function.  */
-#undef HAVE_VSNPRINTF
-
 /* Define if you have the <X11/XKBlib.h> header file.  */
 #undef HAVE_X11_XKBLIB_H