reimplemented wxBitmap::ConvertToImage() using wxDIB

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 4fcf5acb97cfdb1ec74519182fda553a103597c2..f8df8e47e4c82132dc7f3245c03c551576cae5e5 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -173,9 +173,25 @@
  */
 #undef HAVE_STD_WSTRING
 /*
- * Define if your compiler has compilant std::string::compare
+ * Define if your compiler has compliant std::string::compare
  */
 #undef HAVE_STD_STRING_COMPARE
+/*
+ * Define if your compiler has <hash_map>
+ */
+#undef HAVE_HASH_MAP
+/*
+ * Define if your compiler has <ext/hash_map>
+ */
+#undef HAVE_EXT_HASH_MAP
+/*
+ * Define if your compiler has std::hash_map/hash_set
+ */
+#undef HAVE_STD_HASH_MAP
+/*
+ * Define if your compiler has __gnu_cxx::hash_map/hash_set
+ */
+#undef HAVE_GNU_CXX_HASH_MAP
 
 /*
  * use STL for containers and wxString
@@ -776,13 +792,13 @@
 #define wxUSE_SPLINES 0
 
 /*
- * Use the mdi architecture
+ * Use MDI.
  */
-#define wxUSE_MDI_ARCHITECTURE 0
+#define wxUSE_MDI 0
 /*
- * Use MDI
+ * Use the mdi architecture
  */
-#define wxUSE_MDI 0
+#define wxUSE_MDI_ARCHITECTURE 0
 /*
  * Use the document/view architecture
  */
@@ -891,6 +907,11 @@
  */
 #define wxUSE_HTML 0
 
+/*
+ * wxWebKitCtrl
+ */
+#define wxUSE_WEBKIT 0
+
 /*
  * (virtual) filesystems code
  */
@@ -1208,8 +1229,17 @@
 /* Define if you have wcsrtombs() function */
 #undef HAVE_WCSRTOMBS
 
-/* Define this if you have fputws() and putwc() */
-#undef HAVE_FPUTWC
+/* Define this if you have wputc() */
+#undef HAVE_WPUTC
+
+/* Define this if you have wputchar() */
+#undef HAVE_WPUTCHAR
+
+/* Define this if you have putws() */
+#undef HAVE_PUTWS
+
+/* Define this if you have fputws() */
+#undef HAVE_FPUTWS
 
 /* Define this if you have strcasecmp() function in <string.h> */
 #undef HAVE_STRCASECMP_IN_STRING_H
@@ -1229,9 +1259,15 @@
 /* Define this if you are using gtk and gdk contains support for X11R6 XIM */
 #undef HAVE_XIM
 
-/* Define this is you have X11/extensions/shape.h */
+/* Define this if you have X11/extensions/shape.h */
 #undef HAVE_XSHAPE
 
+/* Define this if you have type SPBCDATA */
+#undef HAVE_SPBCDATA
+
+/* Define if you have pango_font_family_is_monospace() (Pango >= 1.3.3) */
+#undef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
+
 /* -------------------------------------------------------------------------
    Win32 adjustments section
    ------------------------------------------------------------------------- */