adjusting to SetLabel migration

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index a8fd75a244aa4615f8ea2fb14f3885beb56ff61d..41bd481b2bdc05454789ca339f4ea4bc62001668 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -3,10 +3,6 @@
 #ifndef __WX_SETUP_H__
 #define __WX_SETUP_H__
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 /* never undefine inline or const keywords for C++ compilation */
 #ifndef __cplusplus
 
@@ -152,10 +148,10 @@
 #endif
 
 
-#define WXWIN_COMPATIBILITY_2_2 0
-
 #define WXWIN_COMPATIBILITY_2_4 0
 
+#define WXWIN_COMPATIBILITY_2_6 0
+
 #define wxDIALOG_UNIT_COMPATIBILITY   0
 
 
@@ -333,6 +329,8 @@
 
 #define wxUSE_CHOICEBOOK 0
 
+#define wxUSE_TREEBOOK 0
+
 #define wxUSE_TAB_DIALOG    0
 
 #define wxUSE_GRID         0
@@ -412,6 +410,8 @@
 
 #define wxUSE_GLCANVAS       0
 
+#define wxUSE_RICHTEXT       0
+
 
 #define wxUSE_CLIPBOARD     0
 
@@ -493,6 +493,8 @@
  * the common values automatically */
 #if (defined(__WIN95__) && !defined(__WXUNIVERSAL__)) || defined(__WXPM__)
 #define wxUSE_OWNER_DRAWN 1
+#else
+#define wxUSE_OWNER_DRAWN 0
 #endif
 
 #if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
@@ -505,6 +507,10 @@
 
 #define wxUSE_UNICODE_MSLU 0
 
+#define wxUSE_DC_CACHEING 0
+
+#define wxUSE_GADGETS 0
+
 /*
  * Supports bool type
  */
@@ -687,7 +693,7 @@
 #undef WX_TIMEZONE
 
 /* The type of 3rd argument to getsockname() - usually size_t or int */
-#undef SOCKLEN_T
+#undef WX_SOCKLEN_T
 
 /* The type of 5th argument to getsockopt() - usually size_t or int */
 #undef SOCKOPTLEN_T
@@ -741,12 +747,18 @@
 /* Define if you have pthread_mutexattr_t and functions to work with it */
 #undef HAVE_PTHREAD_MUTEXATTR_T
 
+/* Define if you have pthread_mutexattr_settype() declaration */
+#undef HAVE_PTHREAD_MUTEXATTR_SETTYPE_DECL
+
 /* Define if you have PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP */
 #undef HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER
 
 /* Define if you have pthread_cancel */
 #undef HAVE_PTHREAD_CANCEL
 
+/* Define if you have pthread_attr_setstacksize */
+#undef HAVE_PTHREAD_ATTR_SETSTACKSIZE
+
 /* Define if you have sigaction() */
 #undef HAVE_SIGACTION
 
@@ -756,15 +768,31 @@
 /* Define if you have shl_load() */
 #undef HAVE_SHL_LOAD
 
+/* Define if you have snprintf() */
+#undef HAVE_SNPRINTF
+
+/* Define if you have snprintf() declaration in the header */
+#undef HAVE_SNPRINTF_DECL
+
+/* Define if you have a _broken_ snprintf() declaration in the header,
+ * with 'char*' for the 3rd parameter instead of 'const char*' */
+#undef HAVE_BROKEN_SNPRINTF_DECL
+
 /* define if you have statfs function */
 #undef HAVE_STATFS
 
+/* define if you have statfs prototype */
+#undef HAVE_STATFS_DECL
+
 /* define if you have statvfs function */
 #undef HAVE_STATVFS
 
 /* Define if you have strptime() */
 #undef HAVE_STRPTIME
 
+/* Define if strptime() is declared in headers */
+#undef HAVE_STRPTIME_DECL
+
 /* Define if you have all functions to set thread priority */
 #undef HAVE_THREAD_PRIORITY_FUNCTIONS
 
@@ -777,6 +805,10 @@
 /* Define if you have vsnprintf() declaration in the header */
 #undef HAVE_VSNPRINTF_DECL
 
+/* Define if you have a _broken_ vsnprintf() declaration in the header,
+ * with 'char*' for the 3rd parameter instead of 'const char*' */
+#undef HAVE_BROKEN_VSNPRINTF_DECL
+
 /* Define if you have usleep() */
 #undef HAVE_USLEEP