merged in from Mahogany

[wxWidgets.git] / acconfig.h

diff --git a/acconfig.h b/acconfig.h
index c1839ecc6d20f7d7cc0c94a43c703cf3927e0747..8a6cd9cff930efd4bd981137bda10965413c8519 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -15,11 +15,6 @@
 /* wxWindows version (not used but required by autoheader)                  */
 /* ------------------------------------------------------------------------ */
 
-#if 0
-#undef PACKAGE
-#undef VERSION
-#endif
-
 /* needed for older automake? */
 #undef WITH_SYMBOL_UNDERSCORE
 
@@ -149,6 +144,11 @@
  */
 #define wxUSE_TEXTDLG 0
 
+/*
+ * Use progress dialog
+ */
+#define wxUSE_PROGRESSDLG 0
+
 /*
  * Use directory chooser dialog
  */
@@ -183,6 +183,10 @@
  * Use this control
  */
 #define wxUSE_COMBOBOX 0
+/*
+ * Use this control
+ */
+#define wxUSE_CHOICE 0
 /*
  * Use this control
  */
@@ -293,7 +297,7 @@
 /*
  * Use log classes and logging functions
  */
-#define wxUSE_LOG 1
+#define wxUSE_LOG 0
 /*
  * Use time and date classes
  */