1. Empty() now doesn't free memory - Clear() does

[wxWidgets.git] / setup / setup.hin

diff --git a/setup/setup.hin b/setup/setup.hin
index d70f2652e3f3bb1898af0ae2a12e2ab11aa47233..7f9e36056d83f33a78fa4db3ad148e4e4909214b 100644 (file)
--- a/setup/setup.hin
+++ b/setup/setup.hin
@@ -43,10 +43,6 @@
  * Use zlib
  */
 #undef wxUSE_ZLIB
-/*
- * Use gdk_imlib
- */
-#undef wxUSE_GDK_IMLIB
 /*
  * Use libpng
  */
@@ -149,6 +145,24 @@
  */
 #undef wxUSE_POSTSCRIPT
 
+//------------------------------------------------------------------------
+// wxString options
+//------------------------------------------------------------------------
+
+/*
+ * Compile wxString with wide character (Unicode) support?
+ */
+#undef wxUSE_UNICODE
+
+/*
+ * Work around a bug in GNU libc 5.x wcstombs() implementation.
+ *
+ * Note that you must link your programs with libc.a if you enable this and you
+ * have libc 5 (you should enable this for libc6 where wcsrtombs() is
+ * thread-safe version of wcstombs()). 
+ */
+#undef wxUSE_WCSRTOMBS
+
 //------------------------------------------------------------------------
 // misc options
 //------------------------------------------------------------------------