merged 2 overloaded functions into a single membersections

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index ab759d6ee534c47a85063cea17536b8bfb3781e7..deffca77b9379cd15eb059c8f60732b263d372aa 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -61,6 +61,9 @@
 /* Define this if your version of GTK+ is greater than 1.3 */
 #undef __WXGTK20__
 
+/* Define this if your version of Motif is greater than 2.0 */
+#undef __WXMOTIF20__
+
 /*
  * Define to 1 for Unix[-like] system
  */
@@ -94,6 +97,7 @@
 
 /* PowerPC Darwin & Mac OS X */
 #undef __POWERPC__
+#undef TARGET_CARBON
 
 /* MS-DOS with DJGPP */
 #undef __DOS__
@@ -103,13 +107,21 @@
 #undef __WINDOWS__
 #endif
 
+#ifndef __WIN95__
 #undef __WIN95__
+#endif
 #ifndef __WIN32__
 #undef __WIN32__
 #endif
+#ifndef __GNUWIN32__
 #undef __GNUWIN32__
+#endif
+#ifndef STRICT
 #undef STRICT
+#endif
+#ifndef WINVER
 #undef WINVER
+#endif
 
 /* enable native status bar under Win32 */
 #if defined(__WIN95__) && !defined(__WXUNIVERSAL__)
@@ -138,6 +150,11 @@
  */
 #undef HAVE_EXPLICIT
 
+/*
+ * Define if your compiler supports const_cast<>()
+ */
+#undef HAVE_CONST_CAST
+
 /*
  * Use regex support
  */
@@ -358,6 +375,10 @@
  * Use this control
  */
 #define wxUSE_CHOICE 0
+/*
+ * Use wxDisplay class
+ */
+#define wxUSE_DISPLAY 0
 /*
  * Use this control
  */
@@ -367,12 +388,12 @@
  */
 #define wxUSE_GRID 0
 /*
- * Use this control
+ * Use the new prototype wxGrid classes
+ * (wxUSE_GRID must also be defined)
  */
 #define wxUSE_NEW_GRID 0
 /*
- * Use the new prototype wxGrid classes
- * (wxUSE_GRID must also be defined)
+ * Use wxImageList class
  */
 #define wxUSE_IMAGLIST 0
 /*