X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6dee824f1b731e9869f2068bcc56caada16bbf3f..4d223b670407f32abd3ca962ec08fdc0da2df3f8:/acconfig.h

diff --git a/acconfig.h b/acconfig.h
index c27c455c42..72918fca30 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -2,8 +2,10 @@
 /*                                                                         */
 /* Version: $Id$                                                           */
 
-#ifndef __GTKSETUPH__
-#define __GTKSETUPH__
+/* This define (__WX_SETUP_H__) is used both to insure setup.h is included 
+ * only once and to indicate that we are building using configure. */
+#ifndef __WX_SETUP_H__
+#define __WX_SETUP_H__
 
 #ifdef __GNUG__
     #pragma interface
@@ -15,11 +17,6 @@
 /* wxWindows version (not used but required by autoheader)                  */
 /* ------------------------------------------------------------------------ */
 
-#if 0
-#undef PACKAGE
-#undef VERSION
-#endif
-
 /* needed for older automake? */
 #undef WITH_SYMBOL_UNDERSCORE
 
@@ -36,7 +33,7 @@
 /*
  * Define to 1 for Unix[-like] system
  */
-#define wxUSE_UNIX 1
+#define wxUSE_UNIX 0
 
 #undef __UNIX__
 #undef __LINUX__
@@ -55,6 +52,13 @@
 #undef __VMS__
 #undef __ULTRIX__
 #undef __DATA_GENERAL__
+#undef __EMX__
+
+#undef __WINDOWS__
+#undef __WIN95__
+#undef __WIN32__
+#undef __GNUWIN32__
+#undef WINVER
 
 /* ------------------------------------------------------------------------ */
 /* compiler options                                                         */
@@ -143,6 +147,16 @@
  */
 #define wxUSE_TEXTDLG 0
 
+/*
+ * Use startup tips
+ */
+#define wxUSE_STARTUP_TIPS 0
+
+/*
+ * Use progress dialog
+ */
+#define wxUSE_PROGRESSDLG 0
+
 /*
  * Use directory chooser dialog
  */
@@ -177,6 +191,10 @@
  * Use this control
  */
 #define wxUSE_COMBOBOX 0
+/*
+ * Use this control
+ */
+#define wxUSE_CHOICE 0
 /*
  * Use this control
  */
@@ -256,7 +274,7 @@
  */
 #define wxUSE_TOOLBAR 0
 
-#ifdef __WXWINE__
+#if defined(__WXWINE__) || defined(__GNUWIN32__)
   #if wxUSE_TOOLBAR
     #define wxUSE_BUTTONBAR 1
   #endif
@@ -287,7 +305,7 @@
 /*
  * Use log classes and logging functions
  */
-#define wxUSE_LOG 1
+#define wxUSE_LOG 0
 /*
  * Use time and date classes
  */
@@ -320,7 +338,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
  */
@@ -459,15 +477,15 @@
  * Use Apple Ieee-double converter
  */
 #define wxUSE_APPLE_IEEE 0
-/* 
+/*
  * Compatibility with 1.66 API.
  * Level 0: no backward compatibility, all new features
  * Level 1: wxDC, OnSize (etc.) compatibility, but
- * some new features such as event tables 
+ * some new features such as event tables
  */
 #define WXWIN_COMPATIBILITY 0
-/* 
- * Compatibility with 2.0 API. 
+/*
+ * Compatibility with 2.0 API.
  */
 #define WXWIN_COMPATIBILITY_2 1
 /*
@@ -518,6 +536,28 @@
  */
 #define wxUSE_MINIFRAME 0
 
+/*
+ * wxHTML
+ */
+#define wxUSE_HTML 0
+
+/*
+ * (virtual) filesystems code
+ */
+#define wxUSE_FS_INET 0
+#define wxUSE_FS_ZIP 0
+
+/*
+ * A class that shows info window when app is busy
+ * (works exactly like wxBusyCursor)
+ */
+#define wxUSE_BUSYINFO 0 
+
+/*
+ * Zip stream for accessing files stored inside .zip archives
+ */
+#define wxUSE_ZIPSTREAM 0
+ 
 /*
  * Disable this if your compiler can't cope
  * with omission of prototype parameters.
@@ -526,11 +566,11 @@
 /*
  * The const keyword is being introduced more in wxWindows.
  * You can use this setting to maintain backward compatibility.
- * If 0:	will use const wherever possible.
- * If 1:	will use const only where necessary
- *              for precompiled headers to work.
- * If 2:	will be totally backward compatible, but precompiled
- *	headers may not work and program size will be larger.
+ * If 0: will use const wherever possible.
+ * If 1: will use const only where necessary
+ *       for precompiled headers to work.
+ * If 2: will be totally backward compatible, but precompiled
+ *       headers may not work and program size will be larger.
  */
 #define CONST_COMPATIBILITY 0
 
@@ -573,4 +613,4 @@
 
 @BOTTOM@
 
-#endif /* __GTKSETUPH__ */
+#endif /* __WX_SETUP_H__ */