Improved cell highlighting when in-place editing is disabled

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index c1e76db2dff43eacf3432e858e1203ed766dc8b0..c47f9abb77d27aa37cccc287a236fd26a4216a45 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -1,5 +1,5 @@
 
-/* 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__
@@ -8,9 +8,11 @@
     #pragma interface
 #endif
 
-
+/* never undefine inline keyword for C++ compilation */
+#ifndef __cplusplus
 /* Define to empty if the keyword does not work.  */
 #undef const
+#endif
 
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef gid_t
@@ -107,10 +109,6 @@
  * Use libjpeg
  */
 #define wxUSE_LIBJPEG 0
-/*
- * Use libgif
- */
-#define wxUSE_LIBGIF 0
 /*
  * Use iODBC
  */
@@ -135,11 +133,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
@@ -216,6 +214,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
@@ -341,6 +344,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.
@@ -367,10 +374,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.
  *
@@ -541,6 +558,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
@@ -630,6 +661,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