merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

setup.h.in

@@ -61,6 +61,9 @@
 /* Define this if your version of GTK+ is greater than 1.2 */
 #undef __WXGTK12__
 
+/* Define this if your version of GTK+ is greater than 1.2.7 */
+#undef __WXGTK127__
+
 /* Define this if your version of GTK+ is greater than 1.3 */
 #undef __WXGTK13__
 
@@ -83,6 +86,7 @@
 #undef __OSF__
 #undef __BSD__
 #undef __FREEBSD__
+#undef __NETBSD__
 #undef __VMS__
 #undef __ULTRIX__
 #undef __DATA_GENERAL__
@@ -138,6 +142,7 @@
  */
 #define wxUSE_ODBC 0
 #define wxODBC_FWD_ONLY_CURSORS 1
+#define wxODBC_BACKWARD_COMPATABILITY 0
 /*
  * Use Threads
  */
@@ -425,20 +430,15 @@
 #define wxUSE_POSTSCRIPT 0
 
 /*
- * Compile wxString with some Unicode support?
+ * Compile wxString with some Unicode (wide character) support?
  */
 #define wxUSE_WCHAR_T 0
 
 /*
- * Compile wxString in wide character (Unicode) mode?
+ * Compile wxWindows in Unicode mode (Win32 only for now)?
  */
 #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.
  *
@@ -633,6 +633,9 @@
 /* The type of 3rd argument to getsockname() - usually size_t or int */
 #undef SOCKLEN_T
 
+/* The signal handler prototype */
+#undef wxTYPE_SA_HANDLER
+
 /* 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
@@ -718,6 +721,9 @@
 /* Define if you have the dlopen function.  */
 #undef HAVE_DLOPEN
 
+/* Define if you have the dlerror function.  */
+#undef HAVE_DLERROR
+
 /* Define if you have the gethostname function.  */
 #undef HAVE_GETHOSTNAME