// compatibility settings
// ----------------------------------------------------------------------------
-// This setting determines the compatibility with 1.68 API:
-// Level 0: no backward compatibility, all new features
-// Level 1: some extra methods are defined for compatibility.
-//
-// Default is 0.
-//
-// Recommended setting: 0 (in fact the compatibility code is now very minimal
-// so there is little advantage to setting it to 1.
-#define WXWIN_COMPATIBILITY 0
-
-// This setting determines the compatibility with 2.0 API: set it to 1 to
-// enable it
-//
-// Default is 0.
-//
-// Recommended setting: 0 (please update your code instead!)
-#define WXWIN_COMPATIBILITY_2 0
-
// This setting determines the compatibility with 2.0 API: set it to 1 to
// enable it
//
// Default is 0
//
// Recommended setting: 0 (unless you only plan to use Windows NT/2000/XP)
-#define wxUSE_UNICODE 0
+#ifndef wxUSE_UNICODE
+ #define wxUSE_UNICODE 0
+#endif
// Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWindows in Unicode mode
// and be able to run compiled apps under Windows 9x as well as NT/2000/XP. This
// global features
// ----------------------------------------------------------------------------
+// Compile library in exception-safe mode? If set to 1, the library will try to
+// behave correctly in presence of exceptions (even though it still will not
+// use the exceptions itself) and notify the user code about any unhandled
+// exceptions. If set to 0, propagation of the exceptions through the library
+// code will lead to undefined behaviour -- but the code itself will be
+// slightly smaller and faster.
+//
+// Default is 1
+//
+// Recommended setting: depends on whether you intend to use C++ exceptions
+// in your own code (1 if you do, 0 if you don't)
+#define wxUSE_EXCEPTIONS 1
+
+// Set wxUSE_STL to 1 to derive wxList(Foo) and wxArray(Foo) from
+// std::list<Foo*> and std::vector<Foo*>, with a compatibility interface,
+// and for wxHashMap to be implemented with templates.
+//
+// Default is 0
+//
+// Recommended setting: YMMV
+#define wxUSE_STL 0
+
+// Set wxUSE_EXTENDED_RTTI to 1 to use extended RTTI
+//
+// Default is 0
+//
+// Recommended setting: 0
+#define wxUSE_EXTENDED_RTTI 0
+
// Support for message/error logging. This includes wxLogXXX() functions and
// wxLog and derived classes. Don't set this to 0 unless you really know what
// you are doing.
#define wxUSE_ZIPSTREAM 1
// Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
-// wxUSE_LIBPNG.
-#define wxUSE_ZLIB 1
+// wxUSE_LIBPNG and wxUSE_GZSTREAM.
+#define wxUSE_ZLIB 1
+
+// Set to 1 to compile wxGzipInput/OutputStream classes. Requires wxUSE_ZLIB.
+#define wxUSE_GZSTREAM 1
// Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM)
#define wxUSE_FS_INET 1
// wxSystemOptions class
#define wxUSE_SYSTEM_OPTIONS 1
-// wxWave class
-#define wxUSE_WAVE 1
+// wxSound class
+#define wxUSE_SOUND 1
+
+// XML parsing classes. Note that their API will change in the future, so
+// using wxXmlDocument and wxXmlNode in your app is not recommended.
+//
+// Default is 1
+//
+// Recommended setting: 1 (needed by XRC)
+#define wxUSE_XML 1
+
+// 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
// wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar
// classes at all. Otherwise, use the native toolbar class unless
-// wxUSE_TOOLBAR_NATIVE is 0. Additionally, the generic toolbar class which
-// supports some features which might not be supported by the native wxToolBar
-// class may be compiled in if wxUSE_TOOLBAR_SIMPLE is 1.
+// wxUSE_TOOLBAR_NATIVE is 0.
//
// Default is 0 for all settings.
//
-// Recommended setting: 1 for wxUSE_TOOLBAR and 0 for wxUSE_TOOLBAR_NATIVE and
-// wxUSE_TOOLBAR_SIMPLE.
+// Recommended setting: 1 for wxUSE_TOOLBAR and 0 for wxUSE_TOOLBAR_NATIVE.
#define wxUSE_TOOLBAR 1
#define wxUSE_TOOLBAR_NATIVE 0
-#define wxUSE_TOOLBAR_SIMPLE 1
// this setting is obsolete, value is ignored
#define wxUSE_BUTTONBAR 0
// Recommended setting: 1
#define wxUSE_NOTEBOOK 1
+// wxListbook control is similar to wxNotebook but uses wxListCtrl instead of
+// the tabs
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_LISTBOOK 1
+
// wxTabDialog is a generic version of wxNotebook but it is incompatible with
// the new class. It shouldn't be used in new code.
//
// Recommended setting: 0 (use wxNotebook)
#define wxUSE_TAB_DIALOG 0
-// wxGrid class comes in two flavours: the original (pre wxWin 2.2) one and
-// the new, much imporved and enhanced version. The new version is backwards
-// compatible with the old one and should be used whenever possible, i.e. if
-// you set wxUSE_GRID to 1, set wxUSE_NEW_GRID to 1 too.
+// wxGrid class.
//
-// Default is 1 for both options.
-//
-// Recommended setting: 1 for wxUSE_NEW_GRID, 0 if you have an old code using
-// wxGrid and 100% backwards compatibality (with all old wxGrid quirks) is
-// essential.
-//
-// WIN16/BC++ resets wxUSE_NEW_GRID to 0 because it exceeds the data limit.
+// Default is 1.
#define wxUSE_GRID 1
-#define wxUSE_NEW_GRID 1
// wxProperty[Value/Form/List] classes, used by Dialog Editor
#define wxUSE_PROPSHEET 1
#define wxUSE_MDI_ARCHITECTURE 1
// Set to 0 to disable print/preview architecture code
+//
#define wxUSE_PRINTING_ARCHITECTURE 1
// wxHTML sublibrary allows to display HTML in wxWindow programs and much,
// Splines
#define wxUSE_SPLINES 1
-// Use XPM support in wxBitmap
-//
-// Default is 1, as XPM is now fully supported this makes easier the issue
-// of portable icons and bitmaps
-#if defined(__WIN32__)
- #define wxUSE_XPM_IN_MSW 1
-#else
- #define wxUSE_XPM_IN_MSW 0
-#endif
-
-// Use dynamic DIB loading/saving code in utils/dib under MSW.
-#define wxUSE_IMAGE_LOADING_IN_MSW 0
-
-// Use dynamic icon/cursor loading/saving code under MSW.
-#define wxUSE_RESOURCE_LOADING_IN_MSW 0
-
-// use wxExpr (a.k.a. PrologIO)
-#define wxUSE_PROLOGIO 0
-
-// Use .wxr resource mechanism (requires PrologIO library)
-#define wxUSE_WX_RESOURCES 0
-
// Include mouse wheel support
#define wxUSE_MOUSEWHEEL 1
// Default is 1.
//
// Recommended setting: 1 for WIN32
-#if defined(__WIN32__)
#define wxUSE_OLE 1
-#else
- #define wxUSE_OLE 0
-#endif
// Set this to 1 to use Microsoft CTL3D library for "3D-look" under Win16 or NT
// 3.x. This setting is ignored under Win9x and NT 4.0+.
//
// Recommended setting: 1, only set it to 0 if your compiler doesn't have
// or can't compile <richedit.h>
-#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__)
+#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
// TODO: This should be ifdef'ed for any compilers that don't support
// RichEdit 2.0 but do have RichEdit 1.0...
#define wxUSE_RICHEDIT 0 // currently not supported
#endif
-// ----------------------------------------------------------------------------
-// disable the settings which don't work for some compilers
-// ----------------------------------------------------------------------------
-
-#ifndef wxUSE_NORLANDER_HEADERS
- #if (defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))
- #define wxUSE_NORLANDER_HEADERS 1
- #else
- #define wxUSE_NORLANDER_HEADERS 0
- #endif
-#endif
-
-// wxUSE_DEBUG_NEW_ALWAYS doesn't work with CodeWarrior
-#if defined(__MWERKS__)
- #undef wxUSE_DEBUG_NEW_ALWAYS
- #define wxUSE_DEBUG_NEW_ALWAYS 0
-#endif
-
-#if defined(__GNUWIN32__)
-// These don't work as expected for mingw32 and cygwin32
- #undef wxUSE_MEMORY_TRACING
- #define wxUSE_MEMORY_TRACING 0
-
- #undef wxUSE_GLOBAL_MEMORY_OPERATORS
- #define wxUSE_GLOBAL_MEMORY_OPERATORS 0
-
- #undef wxUSE_DEBUG_NEW_ALWAYS
- #define wxUSE_DEBUG_NEW_ALWAYS 0
-
-// Cygwin betas don't have wcslen
- #if defined(__CYGWIN__) || defined(__CYGWIN32__)
- #if ! ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))
- #undef wxUSE_WCHAR_T
- #define wxUSE_WCHAR_T 0
- #endif
- #endif
-
-#endif // __GNUWIN32__
-
-// MFC duplicates these operators
-#if wxUSE_MFC
- #undef wxUSE_GLOBAL_MEMORY_OPERATORS
- #define wxUSE_GLOBAL_MEMORY_OPERATORS 0
-
- #undef wxUSE_DEBUG_NEW_ALWAYS
- #define wxUSE_DEBUG_NEW_ALWAYS 0
-#endif // wxUSE_MFC
-
-#if (!defined(WIN32) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS)
-// Can't use OLE drag and drop in Windows 3.1 because we don't know how
-// to implement UUIDs
-// GnuWin32 doesn't have appropriate headers for e.g. IUnknown.
- #undef wxUSE_DRAG_AND_DROP
- #define wxUSE_DRAG_AND_DROP 0
-#endif
-
-// Only WIN32 supports wxStatusBar95
-#if !defined(__WIN32__) && wxUSE_NATIVE_STATUSBAR
- #undef wxUSE_NATIVE_STATUSBAR
- #define wxUSE_NATIVE_STATUSBAR 0
-#endif
-
-// Salford C++ doesn't like some of the memory operator definitions
-#ifdef __SALFORDC__
- #undef wxUSE_MEMORY_TRACING
- #define wxUSE_MEMORY_TRACING 0
-
- #undef wxUSE_GLOBAL_MEMORY_OPERATORS
- #define wxUSE_GLOBAL_MEMORY_OPERATORS 0
-
- #undef wxUSE_DEBUG_NEW_ALWAYS
- #define wxUSE_DEBUG_NEW_ALWAYS 0
-
- #undef wxUSE_THREADS
- #define wxUSE_THREADS 0
-
- #undef wxUSE_OWNER_DRAWN
- #define wxUSE_OWNER_DRAWN 0
-#endif // __SALFORDC__
-
-#ifdef __TWIN32__
- #undef wxUSE_THREADS
- #define wxUSE_THREADS 0
-
- #undef wxUSE_ODBC
- #define wxUSE_ODBC 0
-#endif // __TWIN32__
-
-// BC++/Win16 can't cope with the amount of data in resource.cpp
-#if defined(__WIN16__) && defined(__BORLANDC__)
- #undef wxUSE_WX_RESOURCES
- #define wxUSE_WX_RESOURCES 0
-
- #undef wxUSE_ODBC
- #define wxUSE_ODBC 0
-
- #undef wxUSE_NEW_GRID
- #define wxUSE_NEW_GRID 0
-#endif
-
-#if defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
-// BC++ 4.0 can't compile JPEG library
- #undef wxUSE_LIBJPEG
- #define wxUSE_LIBJPEG 0
-#endif
-
-// wxUSE_DEBUG_NEW_ALWAYS = 1 not compatible with BC++ in DLL mode
-#if defined(__BORLANDC__) && (defined(WXMAKINGDLL) || defined(WXUSINGDLL))
- #undef wxUSE_DEBUG_NEW_ALWAYS
- #define wxUSE_DEBUG_NEW_ALWAYS 0
-#endif
-
-#if defined(__WXMSW__) && defined(__WATCOMC__)
- /*
- #undef wxUSE_GLCANVAS
- #define wxUSE_GLCANVAS 0
- */
-
- #undef wxUSE_WCHAR_T
- #define wxUSE_WCHAR_T 0
-#endif
-
-#if defined(__WXMSW__) && !defined(__WIN32__)
- #undef wxUSE_SOCKETS
- #define wxUSE_SOCKETS 0
-
- #undef wxUSE_THREADS
- #define wxUSE_THREADS 0
-
- #undef wxUSE_TOOLTIPS
- #define wxUSE_TOOLTIPS 0
-
- #undef wxUSE_SPINCTRL
- #define wxUSE_SPINCTRL 0
-
- #undef wxUSE_SPINBTN
- #define wxUSE_SPINBTN 0
-
- #undef wxUSE_LIBPNG
- #define wxUSE_LIBPNG 0
-
- #undef wxUSE_LIBJPEG
- #define wxUSE_LIBJPEG 0
-
- #undef wxUSE_LIBTIFF
- #define wxUSE_LIBTIFF 0
-
- #undef wxUSE_GIF
- #define wxUSE_GIF 0
-
- #undef wxUSE_PNM
- #define wxUSE_PNM 0
-
- #undef wxUSE_PCX
- #define wxUSE_PCX 0
-
- #undef wxUSE_GLCANVAS
- #define wxUSE_GLCANVAS 0
-
- #undef wxUSE_MS_HTML_HELP
- #define wxUSE_MS_HTML_HELP 0
-
- #undef wxUSE_WCHAR_T
- #define wxUSE_WCHAR_T 0
-
-#endif // Win16
-
// ----------------------------------------------------------------------------
// unknown settings
// ----------------------------------------------------------------------------
#define wxUSE_DDE_FOR_IPC 0
#endif
-//??????
-#define wxUSE_SPAWNBROWSER 0
-
#endif // _WX_UNIV_SETUP_H_