X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3d2afb7abec64fc601ff7ab622a865ef5ec68d10..0f90ec936573acad29a7050eb607e3b372953c7a:/acconfig.h

diff --git a/acconfig.h b/acconfig.h
index ff06fcf9d3..8a6cd9cff9 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -15,9 +15,6 @@
 /* wxWindows version (not used but required by autoheader)                  */
 /* ------------------------------------------------------------------------ */
 
-#undef PACKAGE
-#undef VERSION
-
 /* needed for older automake? */
 #undef WITH_SYMBOL_UNDERSCORE
 
@@ -53,6 +50,12 @@
 #undef __VMS__
 #undef __ULTRIX__
 #undef __DATA_GENERAL__
+#undef __EMX__
+
+#undef __WINDOWS__
+#undef __WIN95__
+#undef __WIN32__
+#undef __GNUWIN32__
 
 /* ------------------------------------------------------------------------ */
 /* compiler options                                                         */
@@ -141,6 +144,11 @@
  */
 #define wxUSE_TEXTDLG 0
 
+/*
+ * Use progress dialog
+ */
+#define wxUSE_PROGRESSDLG 0
+
 /*
  * Use directory chooser dialog
  */
@@ -175,6 +183,10 @@
  * Use this control
  */
 #define wxUSE_COMBOBOX 0
+/*
+ * Use this control
+ */
+#define wxUSE_CHOICE 0
 /*
  * Use this control
  */
@@ -256,7 +268,7 @@
 
 #ifdef __WXWINE__
   #if wxUSE_TOOLBAR
-    #define wxUSE_BUTTONBAR
+    #define wxUSE_BUTTONBAR 1
   #endif
 #endif
 
@@ -270,7 +282,7 @@
 /* ------------------------------------------------------------------------ */
 
 /*
- * Use wXLongLong (a.k.a. int64) class
+ * Use wxLongLong (a.k.a. int64) class
  */
 #define wxUSE_LONGLONG 0
 
@@ -285,11 +297,15 @@
 /*
  * Use log classes and logging functions
  */
-#define wxUSE_LOG 1
+#define wxUSE_LOG 0
 /*
  * Use time and date classes
  */
 #define wxUSE_TIMEDATE 0
+/*
+ * Use wave class
+ */
+#define wxUSE_WAVE 0
 /*
  * Use config system
  */
@@ -364,6 +380,13 @@
  */
 #define wxUSE_SIZE_T_STRING_OPERATOR 0
 
+/*
+ * Use the new experimental implementation of wxString::Printf()?
+ *
+ * Warning: enabling this may cause internal compiler errors with gcc!
+ */
+#define wxUSE_EXPERIMENTAL_PRINTF 0
+
 /* ------------------------------------------------------------------------ */
 /* misc options                                                             */
 /* ------------------------------------------------------------------------ */