// This setting determines the compatibility with 2.0 API: set it to 1 to
// enable it
//
-// Default is 0.
+// Default is 1.
//
// Recommended setting: 0 (please update your code instead!)
-#define WXWIN_COMPATIBILITY_2_2 0
+#define WXWIN_COMPATIBILITY_2_2 1
// in wxMSW version 2.1.11 and earlier, wxIcon always derives from wxBitmap,
// but this is very dangerous because you can mistakenly pass an icon instead
// defined as wchar_t, wxString will use Unicode internally. If you set this
// to 1, you must use wxT() macro for all literal strings in the program.
//
-// Unicode is currently only fully supported under Windows NT/2000 (Windows 9x
+// Unicode is currently only fully supported under Windows NT/2000/XP (Windows 9x
// doesn't support it and the programs compiled in Unicode mode will not run
// under 9x).
//
// Default is 0
//
-// Recommended setting: 0 (unless you only plan to use Windows NT/2000)
+// Recommended setting: 0 (unless you only plan to use Windows NT/2000/XP)
#define wxUSE_UNICODE 0
+// 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
+// setting enables use of unicows.dll from MSLU (MS Layer for Unicode, see
+// http://www.microsoft.com/globaldev/Articles/mslu_announce.asp). Note that you
+// will have to modify the makefiles to include unicows.lib import library as the first
+// library.
+//
+// If your compiler doesn't have unicows.lib, you can get a version of it at
+// http://www.volny.cz/v.slavik/libunicows/
+//
+// Default is 0
+//
+// Recommended setting: 0
+#define wxUSE_UNICODE_MSLU 0
+
// Setting wxUSE_WCHAR_T to 1 gives you some degree of Unicode support without
// compiling the program in Unicode mode. More precisely, it will be possible
// to construct wxString from a wide (Unicode) string and convert any wxString
// Recommended setting: 1 (always)
#define wxUSE_LOG 1
-// Recommended setting: 1 (always)
+// Support for command line parsing using wxCmdLineParser class.
+//
+// Default is 1
+//
+// Recommended setting: 1 (can be set to 0 if you don't use the cmd line)
+#define wxUSE_CMDLINE_PARSER 1
+
+// Recommended setting: 1
#define wxUSE_LOGWINDOW 1
-// Recommended setting: 1 (always)
+// Recommended setting: 1
#define wxUSE_LOGGUI 1
+// Recommended setting: 1
+#define wxUSE_LOG_DIALOG 1
+
// Support for multithreaded applications: if 1, compile in thread classes
// (thread.h) and make the library a bit more thread safe. Although thread
// support is quite stable by now, you may still consider recompiling the
// Use standard C++ streams if 1. If 0, use wxWin streams implementation.
#define wxUSE_STD_IOSTREAM 0
-// Use serialization (requires utils/serialize)
-#define wxUSE_SERIAL 0
-
// ----------------------------------------------------------------------------
// non GUI features selection
// ----------------------------------------------------------------------------
#define wxUSE_FILE 1
#define wxUSE_FFILE 1
-// use wxTextFile class: requires wxFile, required by wxFileConfig
+// Use wxFSVolume class providing access to the configured/active mount points
+//
+// Default is 1
+//
+// Recommended setting: 1 (but may be safely disabled if you don't use it)
+#define wxUSE_FSVOLUME 1
+
+// use wxTextBuffer class: required by wxTextFile
+#define wxUSE_TEXTBUFFER 1
+
+// use wxTextFile class: requires wxFile and wxTextBuffer, required by
+// wxFileConfig
#define wxUSE_TEXTFILE 1
// i18n support: _() macro, wxLocale class. Requires wxTextFile.
// If wxUSE_DIALUP_MANAGER is 1, compile in wxDialUpManager class which allows
// to connect/disconnect from the network and be notified whenever the dial-up
-// network connection is established/terminated. Requires wxUSE_DYNLIB_CLASS.
+// network connection is established/terminated. Requires wxUSE_DYNAMIC_LOADER.
//
// Default is 1.
//
// Recommended setting: 1
#define wxUSE_DIALUP_MANAGER 1
-// Compile in wxLibrary class for run-time DLL loading and function calling.
+// Compile in classes for run-time DLL loading and function calling.
// Required by wxUSE_DIALUP_MANAGER.
//
// This setting is for Win32 only
// Default is 1.
//
// Recommended setting: 1
-#define wxUSE_DYNLIB_CLASS 1
+#define wxUSE_DYNLIB_CLASS 1
+
+// experimental, don't use for now
+#define wxUSE_DYNAMIC_LOADER 1
// Set to 1 to use socket classes
#define wxUSE_SOCKETS 1
// wxMimeTypesManager class
#define wxUSE_MIMETYPE 1
+// wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP
+// or wxURL you need to set this to 1.
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_PROTOCOL 1
+
+// The settings for the individual URL schemes
+#define wxUSE_PROTOCOL_FILE 1
+#define wxUSE_PROTOCOL_FTP 1
+#define wxUSE_PROTOCOL_HTTP 1
+
+// Define this to use wxURL class.
+#define wxUSE_URL 1
+
+// Support for regular expression matching via wxRegEx class: enable this to
+// use POSIX regular expressions in your code. You need to compile regex
+// library from src/regex to use it under Windows.
+//
+// Default is 0
+//
+// Recommended setting: 1 if your compiler supports it, if it doesn't please
+// contribute us a makefile for src/regex for it
+#define wxUSE_REGEX 1
+
+// wxSystemOptions class
+#define wxUSE_SYSTEM_OPTIONS 1
+
+// wxWave class
+#define wxUSE_WAVE 1
+
// ----------------------------------------------------------------------------
// Individual GUI controls
// ----------------------------------------------------------------------------
// Recommended setting: 1 (don't change except for very special programs)
#define wxUSE_CONTROLS 1
-// wxPopupWindow class is not used currently by wxMSW
+// wxPopupWindow class is a top level transient window. It is currently used
+// to implement wxTipWindow
//
-// Default is 0
+// Default is 1
//
-// Recommended setting: 0
-#define wxUSE_POPUPWIN 0
+// Recommended setting: 1 (may be set to 0 if you don't wxUSE_TIPWINDOW)
+#define wxUSE_POPUPWIN 1
+
+// wxTipWindow allows to implement the custom tooltips, it is used by the
+// context help classes. Requires wxUSE_POPUPWIN.
+//
+// Default is 1
+//
+// Recommended setting: 1 (may be set to 0)
+#define wxUSE_TIPWINDOW 1
// Each of the settings below corresponds to one wxWindows control. They are
// all switched on by default but may be disabled if you are sure that your
#define wxUSE_GRID 1
#define wxUSE_NEW_GRID 1
+// wxProperty[Value/Form/List] classes, used by Dialog Editor
+#define wxUSE_PROPSHEET 0
+
// ----------------------------------------------------------------------------
// Miscellaneous GUI stuff
// ----------------------------------------------------------------------------
// wxValidator class and related methods
#define wxUSE_VALIDATORS 1
+// wxDC cacheing implementation
+#define wxUSE_DC_CACHEING 1
+
// ----------------------------------------------------------------------------
// common dialogs
// ----------------------------------------------------------------------------
// Recommended setting: 1 (used in the library itself)
#define wxUSE_CHOICEDLG 1
+// Use colour picker dialog
+//
+// Default is 1
+//
+// Recommended setting: 1
+#define wxUSE_COLOURDLG 1
+
// wxDirDlg class for getting a directory name from user
#define wxUSE_DIRDLG 1
// Recommended setting: 1 (used in many places in the library itself)
#define wxUSE_FILEDLG 1
+// Use find/replace dialogs.
+//
+// Default is 1
+//
+// Recommended setting: 1 (but may be safely set to 0)
+#define wxUSE_FINDREPLDLG 1
+
// Use font picker dialog
//
// Default is 1
// number entry dialog
#define wxUSE_NUMBERDLG 1
+// splash screen class
+#define wxUSE_SPLASH 1
+
// wizards
#define wxUSE_WIZARDDLG 1
// Set to 1 for PCX format support
#define wxUSE_PCX 1
+// Set to 1 for IFF format support (Amiga format)
+#define wxUSE_IFF 0
+
// Set to 1 for XPM format support
#define wxUSE_XPM 1
+// Set to 1 for MS Icons and Cursors format support
+#define wxUSE_ICO_CUR 1
+
+// Set to 1 to compile in wxPalette class
+#define wxUSE_PALETTE 1
+
// ----------------------------------------------------------------------------
// Windows-only settings
// ----------------------------------------------------------------------------
#define wxUSE_DEBUG_NEW_ALWAYS 0
#endif // wxUSE_MFC
-// ODBC classes aren't Unicode-compatible yet
-#if wxUSE_UNICODE
-#undef wxUSE_ODBC
-#define wxUSE_ODBC 0
-#endif
-
#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
projects / wxWidgets.git / blobdiff