X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bae2dc62af49b5a870bbabd9473a92921736a6f0..dc484d491b15355285a89da275c58c2ef247d1f4:/include/wx/univ/setup0.h

diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index 282f444ef2..10c4288ac2 100644
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -258,6 +258,23 @@
     #define wxUSE_STD_IOSTREAM 0
 #endif
 
+// Enable conversion to standard C++ string if 1.
+//
+// Default is 1 for most compilers.
+//
+// Currently the Digital Mars and Watcom compilers come without standard C++
+// library headers by default, wxUSE_STD_STRING can be set to 1 if you do have
+// them (e.g. from STLPort).
+//
+// VC++ 5.0 does include standard C++ library header, however they produce
+// many warnings that can't be turned off when compiled at warning level 4.
+#if defined(__DMC__) || defined(__WATCOMC__) \
+        || (defined(_MSC_VER) && _MSC_VER < 1200)
+    #define wxUSE_STD_STRING  0
+#else
+    #define wxUSE_STD_STRING  1
+#endif
+
 // Support for positional parameters (e.g. %1$d, %2$s ...) in wxVsnprintf.
 // Note that if the system's implementation does not support positional
 // parameters, setting this to 1 forces the use of the wxWidgets implementation
@@ -435,14 +452,17 @@
 // Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM)
 #define wxUSE_FS_ZIP 1
 
+// Set to 1 to enable virtual archive filesystem (requires wxUSE_FILESYSTEM)
+#define wxUSE_FS_ARCHIVE    1
+
 // wxArchive classes for accessing archives such as zip and tar
 #define wxUSE_ARCHIVE_STREAMS 1
 
 // Set to 1 to compile wxZipInput/OutputStream classes.
 #define wxUSE_ZIPSTREAM 1
 
-// Set to 1 to compile wxBackingFile and wxBackedInputStream
-#define wxUSE_BACKINGFILE   1
+// Set to 1 to compile wxTarInput/OutputStream classes.
+#define wxUSE_TARSTREAM     1
 
 // Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
 // wxUSE_LIBPNG
@@ -627,15 +647,16 @@
 #define wxUSE_CHECKBOX         1    // wxCheckBox
 #define wxUSE_CHECKLISTBOX     1    // wxCheckListBox
 #define wxUSE_CHOICE           1    // wxChoice
+#define wxUSE_COLLPANE         1    // wxCollapsiblePane
 #define wxUSE_COLOURPICKERCTRL 1    // wxColourPickerCtrl
 #define wxUSE_COMBOBOX         1    // wxComboBox
 #define wxUSE_DATAVIEWCTRL     1    // wxDataViewCtrl
 #define wxUSE_DATEPICKCTRL     1    // wxDatePickerCtrl
-#define wxUSE_DIRPICKERCTRL    1   // wxDirPickerCtrl
-#define wxUSE_FILEPICKERCTRL   1  // wxFilePickerCtrl
-#define wxUSE_FONTPICKERCTRL   1  // wxFontPickerCtrl
+#define wxUSE_DIRPICKERCTRL    1    // wxDirPickerCtrl
+#define wxUSE_FILEPICKERCTRL   1    // wxFilePickerCtrl
+#define wxUSE_FONTPICKERCTRL   1    // wxFontPickerCtrl
 #define wxUSE_GAUGE            1    // wxGauge
-#define wxUSE_HYPERLINKCTRL    1   // wxHyperlinkCtrl
+#define wxUSE_HYPERLINKCTRL    1    // wxHyperlinkCtrl
 #define wxUSE_LISTBOX          1    // wxListBox
 #define wxUSE_LISTCTRL         1    // wxListCtrl
 #define wxUSE_RADIOBOX         1    // wxRadioBox