attempts to fix wxStaticBitmap::SetBitmap() - still doesn't work

[wxWidgets.git] / acconfig.h

diff --git a/acconfig.h b/acconfig.h
index dab575373574dfced3ff698c8fa2267043e86ba7..f0b87b500b819c4582ee23fcfb4a1c0dc5c88310 100644 (file)
--- 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,16 @@
  */
 #define wxUSE_TEXTDLG 0
 
+/*
+ * Use startup tips
+ */
+#define wxUSE_STARTUP_TIPS 0
+
+/*
+ * Use progress dialog
+ */
+#define wxUSE_PROGRESSDLG 0
+
 /*
  * Use directory chooser dialog
  */
@@ -175,6 +188,10 @@
  * Use this control
  */
 #define wxUSE_COMBOBOX 0
+/*
+ * Use this control
+ */
+#define wxUSE_CHOICE 0
 /*
  * Use this control
  */
@@ -285,11 +302,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
  */
@@ -314,7 +335,7 @@
  * Use standard C++ streams if 1. If 0, use wxWin
  * streams implementation.
  */
-#define wxUSE_STD_IOSTREAM  1
+#define wxUSE_STD_IOSTREAM  0
 /*
  * wxLibrary class
  */