use typed containers in wxHtmlParser instead of type-unsafe wxList/wxHashTable

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

diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index 8f691d649c02e9be7a065dfe8afb34b0c0d00818..2a69ec8bb377c1402b287bc1fe44778d4a7fc040 100644 (file)
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -26,15 +26,17 @@
 // compatibility settings
 // ----------------------------------------------------------------------------
 
 // compatibility settings
 // ----------------------------------------------------------------------------
 

-// This setting determines the compatibility with 2.4 API: set it to 1 to
-// enable it
+// This setting determines the compatibility with 2.6 API: set it to 0 to
+// flag all cases of using deprecated functions.

 //
 //

-// Default is 0.
+// Default is 1 but please try building your code with 0 as the default will
+// change to 0 in the next version and the deprecated functions will disappear
+// in the version after it completely.

 //
 //

-// Recommended setting: 0 (please update your code instead!)
-#define WXWIN_COMPATIBILITY_2_4 0
+// Recommended setting: 0 (please update your code)
+#define WXWIN_COMPATIBILITY_2_6 0

 
 

-// This setting determines the compatibility with 2.6 API: set it to 0 to
+// This setting determines the compatibility with 2.8 API: set it to 0 to

 // flag all cases of using deprecated functions.
 //
 // Default is 1 but please try building your code with 0 as the default will
 // flag all cases of using deprecated functions.
 //
 // Default is 1 but please try building your code with 0 as the default will


@@ -42,7 +44,7 @@
 // in the version after it completely.
 //
 // Recommended setting: 0 (please update your code)
 // in the version after it completely.
 //
 // Recommended setting: 0 (please update your code)

-#define WXWIN_COMPATIBILITY_2_6 1
+#define WXWIN_COMPATIBILITY_2_8 1

 
 // Set to 0 for accurate dialog units, else 1 to be as per 2.1.16 and before.
 // If migrating between versions, your dialogs may seem to shrink.
 
 // Set to 0 for accurate dialog units, else 1 to be as per 2.1.16 and before.
 // If migrating between versions, your dialogs may seem to shrink.


@@ -140,11 +142,11 @@
 // doesn't support it and the programs compiled in Unicode mode will not run
 // under 9x).
 //
 // doesn't support it and the programs compiled in Unicode mode will not run
 // under 9x).
 //

-// Default is 0
+// Default is 1

 //
 //

-// Recommended setting: 0 (unless you only plan to use Windows NT/2000/XP)
+// Recommended setting: 1

 #ifndef wxUSE_UNICODE
 #ifndef wxUSE_UNICODE

-    #define wxUSE_UNICODE 0
+    #define wxUSE_UNICODE 1

 #endif
 
 // Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWidgets in Unicode mode
 #endif
 
 // Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWidgets in Unicode mode


@@ -258,6 +260,23 @@
     #define wxUSE_STD_IOSTREAM 0
 #endif
 
     #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
 // 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


@@ -342,15 +361,6 @@
 // Recommended setting: 1
 #define wxUSE_DATETIME 1
 
 // Recommended setting: 1
 #define wxUSE_DATETIME 1
 

-// wxUSE_TIMEDATE enables compilation of the old wxDate and wxTime classes (not
-// the same as wxDateTime!). These classes are obsolete and shouldn't be used
-// in new code
-//
-// Default is 0
-//
-// Recommended setting: 0 unless you have legacy code which uses these classes
-#define wxUSE_TIMEDATE 0
-

 // Set wxUSE_TIMER to 1 to compile wxTimer class
 //
 // Default is 1
 // Set wxUSE_TIMER to 1 to compile wxTimer class
 //
 // Default is 1


@@ -435,12 +445,18 @@
 // 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 wxTarInput/OutputStream classes.
+#define wxUSE_TARSTREAM     1
+

 // Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
 // wxUSE_LIBPNG
 #define wxUSE_ZLIB          1
 // Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
 // wxUSE_LIBPNG
 #define wxUSE_ZLIB          1


@@ -518,20 +534,6 @@
 // Recommended setting: 1
 #define wxUSE_MEDIACTRL     1
 
 // Recommended setting: 1
 #define wxUSE_MEDIACTRL     1
 

-// Use QuickTime
-//
-// Default is 0
-//
-// Recommended setting: 1 if you have the QT SDK installed and you need it, else 0
-#define wxUSE_QUICKTIME     0
-
-// Use DirectShow
-//
-// Default is 0
-//
-// Recommended setting: 1 if the DirectX 7 SDK is installed (highly recommended), else 0
-#define wxUSE_DIRECTSHOW    0
-

 // Use wxWidget's XRC XML-based resource system.  Recommended.
 //
 // Default is 1
 // Use wxWidget's XRC XML-based resource system.  Recommended.
 //
 // Default is 1


@@ -558,6 +560,13 @@
 // Recommended setting: 1
 #define wxUSE_AUI       1
 
 // Recommended setting: 1
 #define wxUSE_AUI       1
 

+// Use wxStyledTextCtrl, a wxWidgets implementation of Scintilla.
+//
+// Default is 1
+//
+// Recommended setting: 1
+#define wxUSE_STC 1
+

 
 // Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
 // 2D drawing API.  (Still somewhat experimental)
 
 // Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
 // 2D drawing API.  (Still somewhat experimental)


@@ -576,10 +585,6 @@
 // Set to 1 to compile MS Windows XP theme engine support
 #define wxUSE_UXTHEME           0
 
 // Set to 1 to compile MS Windows XP theme engine support
 #define wxUSE_UXTHEME           0
 

-// Set to 1 to auto-adapt to MS Windows XP themes where possible
-// (notably, wxNotebook pages)
-#define wxUSE_UXTHEME_AUTO      0
-

 // ----------------------------------------------------------------------------
 // Individual GUI controls
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Individual GUI controls
 // ----------------------------------------------------------------------------


@@ -617,26 +622,29 @@
 // Default is 1
 //
 // Recommended setting: 1
 // Default is 1
 //
 // Recommended setting: 1

+#define wxUSE_ANIMATIONCTRL    1    // wxAnimationCtrl

 #define wxUSE_BUTTON           1    // wxButton
 #define wxUSE_BMPBUTTON        1    // wxBitmapButton
 #define wxUSE_CALENDARCTRL     1    // wxCalendarCtrl
 #define wxUSE_CHECKBOX         1    // wxCheckBox
 #define wxUSE_CHECKLISTBOX     1    // wxCheckListBox
 #define wxUSE_CHOICE           1    // wxChoice
 #define wxUSE_BUTTON           1    // wxButton
 #define wxUSE_BMPBUTTON        1    // wxBitmapButton
 #define wxUSE_CALENDARCTRL     1    // wxCalendarCtrl
 #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_RADIOBTN         1    // wxRadioButton
 #define wxUSE_SCROLLBAR        1    // wxScrollBar
 #define wxUSE_LISTBOX          1    // wxListBox
 #define wxUSE_LISTCTRL         1    // wxListCtrl
 #define wxUSE_RADIOBOX         1    // wxRadioBox
 #define wxUSE_RADIOBTN         1    // wxRadioButton
 #define wxUSE_SCROLLBAR        1    // wxScrollBar

+#define wxUSE_SEARCHCTRL       1    // wxSearchCtrl

 #define wxUSE_SLIDER           1    // wxSlider
 #define wxUSE_SPINBTN          1    // wxSpinButton
 #define wxUSE_SPINCTRL         1    // wxSpinCtrl
 #define wxUSE_SLIDER           1    // wxSlider
 #define wxUSE_SPINBTN          1    // wxSpinButton
 #define wxUSE_SPINCTRL         1    // wxSpinCtrl


@@ -734,9 +742,6 @@
 //
 #define wxUSE_GRID 1
 
 //
 #define wxUSE_GRID 1
 

-// wxProperty[Value/Form/List] classes, used by Dialog Editor
-#define wxUSE_PROPSHEET 1
-

 // wxComboCtrl and related classes: combobox with custom popup window and
 // not necessarily a listbox.
 //
 // wxComboCtrl and related classes: combobox with custom popup window and
 // not necessarily a listbox.
 //


@@ -835,10 +840,6 @@
 // wxDC cacheing implementation
 #define wxUSE_DC_CACHEING 1
 
 // wxDC cacheing implementation
 #define wxUSE_DC_CACHEING 1
 

-// Set this to 1 to enable the use of DIB's for wxBitmap to support
-// bitmaps > 16MB on Win95/98/Me.  Set to 0 to use DDB's only.
-#define wxUSE_DIB_FOR_BITMAP 0
-

 // ----------------------------------------------------------------------------
 // common dialogs
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // common dialogs
 // ----------------------------------------------------------------------------


@@ -1016,9 +1017,6 @@
 // smaller library.
 #define wxUSE_RICHTEXT       1
 
 // smaller library.
 #define wxUSE_RICHTEXT       1
 

-// wxTreeLayout class
-#define wxUSE_TREELAYOUT 1
-

 // ----------------------------------------------------------------------------
 // Data transfer
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Data transfer
 // ----------------------------------------------------------------------------


@@ -1095,9 +1093,6 @@
 // Use wxHTML-based help controller
 #define wxUSE_WXHTML_HELP 1
 
 // Use wxHTML-based help controller
 #define wxUSE_WXHTML_HELP 1
 

-// Use resources
-#define wxUSE_RESOURCES 0
-

 // Window layout constraint system
 #define wxUSE_CONSTRAINTS 1
 
 // Window layout constraint system
 #define wxUSE_CONSTRAINTS 1
 


@@ -1279,10 +1274,6 @@
 // unknown settings
 // ----------------------------------------------------------------------------
 
 // unknown settings
 // ----------------------------------------------------------------------------
 

-// If 1, enables provision of run-time type information.
-// NOW MANDATORY: don't change.
-#define wxUSE_DYNAMIC_CLASSES 1
-

 //??????
 #if defined(__WIN32__)
     #define wxUSE_DDE_FOR_IPC 0
 //??????
 #if defined(__WIN32__)
     #define wxUSE_DDE_FOR_IPC 0