added wxDataObject related files and regenerated the makefiles

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index f72174165e6549344d94ebcd6e648948ae6474bc..bee58e8a1c3716e5a6bedb4abf37ab36e0f9a680 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
 
@@ -131,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
@@ -212,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
@@ -367,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.
  *
@@ -460,17 +479,7 @@
  * 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.
- */
-#define WXWIN_COMPATIBILITY_2 1
+
 /*
  * Enables debugging: memory tracing, assert, etc., contains debug level
  */
@@ -644,6 +653,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