don't define WINVER as 0x0400 in configure, it's defined in the headers as 0x0600...

[wxWidgets.git] / include / wx / univ / setup0.h

diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index 282f444ef20ab4bc2f703f221b04a58019cd685a..bfd0e24022b3cc015ef5f1eb4f5dbc77a0f017d5 100644 (file)
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -435,14 +435,17 @@
 // Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM)
 #define wxUSE_FS_ZIP 1
 
 // 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
 
 // 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
 
 // Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
 // wxUSE_LIBPNG


@@ -627,15 +630,16 @@
 #define wxUSE_CHECKBOX         1    // wxCheckBox
 #define wxUSE_CHECKLISTBOX     1    // wxCheckListBox
 #define wxUSE_CHOICE           1    // wxChoice
 #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_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_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
 #define wxUSE_LISTBOX          1    // wxListBox
 #define wxUSE_LISTCTRL         1    // wxListCtrl
 #define wxUSE_RADIOBOX         1    // wxRadioBox