Corrected assertion

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

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 640a8fc72e83b006c16d233573fac6e36ebdad9e..5e46995445819d16b3800a0bdf581cfebb94fced 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -36,6 +36,22 @@
 // so there is little advantage to setting it to 1.
 #define WXWIN_COMPATIBILITY  0
 
 // 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 1.
+//
+// Recommended setting: 0 (please update your code instead!)
+#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
 // of a bitmap to a function taking "const wxBitmap&" - which will *not* work
 // 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
 // of a bitmap to a function taking "const wxBitmap&" - which will *not* work


@@ -88,7 +104,7 @@
 // Default is 1.
 //
 // Recommended setting: 1 but see comment above
 // Default is 1.
 //
 // Recommended setting: 1 but see comment above

-#define wxUSE_DEBUG_CONTEXT 0
+#define wxUSE_DEBUG_CONTEXT 1

 
 // If 1, enables debugging versions of wxObject::new and wxObject::delete *IF*
 // __WXDEBUG__ is also defined.
 
 // If 1, enables debugging versions of wxObject::new and wxObject::delete *IF*
 // __WXDEBUG__ is also defined.


@@ -99,7 +115,7 @@
 // Default is 1
 //
 // Recommended setting: 1 but see comment in the beginning of this section
 // Default is 1
 //
 // Recommended setting: 1 but see comment in the beginning of this section

-#define wxUSE_MEMORY_TRACING 0
+#define wxUSE_MEMORY_TRACING 1

 
 // In debug mode, cause new and delete to be redefined globally.
 // If this causes problems (e.g. link errors), set this to 0.
 
 // In debug mode, cause new and delete to be redefined globally.
 // If this causes problems (e.g. link errors), set this to 0.


@@ -108,7 +124,7 @@
 // Default is 1
 //
 // Recommended setting: 1 but see comment in the beginning of this section
 // Default is 1
 //
 // Recommended setting: 1 but see comment in the beginning of this section

-#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
+#define wxUSE_GLOBAL_MEMORY_OPERATORS 1

 
 // In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If
 // this causes problems (e.g. link errors), set this to 0. You may need to set
 
 // In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If
 // this causes problems (e.g. link errors), set this to 0. You may need to set


@@ -118,7 +134,7 @@
 // Default is 1
 //
 // Recommended setting: 1 but see comment in the beginning of this section
 // Default is 1
 //
 // Recommended setting: 1 but see comment in the beginning of this section

-#define wxUSE_DEBUG_NEW_ALWAYS 0
+#define wxUSE_DEBUG_NEW_ALWAYS 1

 
 // wxHandleFatalExceptions() may be used to catch the program faults at run
 // time and, instead of terminating the program with a usual GPF message box,
 
 // wxHandleFatalExceptions() may be used to catch the program faults at run
 // time and, instead of terminating the program with a usual GPF message box,


@@ -145,15 +161,30 @@
 // 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.
 //
 // 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
 //
 // 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
 
 #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
 // 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


@@ -177,12 +208,20 @@
 // Recommended setting: 1 (always)
 #define wxUSE_LOG 1
 
 // Recommended setting: 1 (always)
 #define wxUSE_LOG 1
 

+// 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
 
 #define wxUSE_LOGWINDOW 1
 

-// Recommended setting: 1 (always)
+// Recommended setting: 1

 #define wxUSE_LOGGUI 1
 
 #define wxUSE_LOGGUI 1
 

-// Recommended setting: 1 (always)
+// Recommended setting: 1

 #define wxUSE_LOG_DIALOG 1
 
 // Support for multithreaded applications: if 1, compile in thread classes
 #define wxUSE_LOG_DIALOG 1
 
 // Support for multithreaded applications: if 1, compile in thread classes


@@ -204,9 +243,6 @@
 // Use standard C++ streams if 1. If 0, use wxWin streams implementation.
 #define wxUSE_STD_IOSTREAM  0
 
 // 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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // non GUI features selection
 // ----------------------------------------------------------------------------


@@ -234,13 +270,24 @@
 #define wxUSE_FILE          1
 #define wxUSE_FFILE         1
 
 #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.
 #define wxUSE_INTL          1
 
 #define wxUSE_TEXTFILE      1
 
 // i18n support: _() macro, wxLocale class. Requires wxTextFile.
 #define wxUSE_INTL          1
 

-// Set wxUSE_TIMEDATE to 1 to compile the wxDateTime and related classes which
+// Set wxUSE_DATETIME to 1 to compile the wxDateTime and related classes which

 // allow to manipulate dates, times and time intervals. wxDateTime replaces the
 // old wxTime and wxDate classes which are still provided for backwards
 // compatibility (and implemented in terms of wxDateTime).
 // allow to manipulate dates, times and time intervals. wxDateTime replaces the
 // old wxTime and wxDate classes which are still provided for backwards
 // compatibility (and implemented in terms of wxDateTime).


@@ -252,9 +299,20 @@
 //
 // Requires: wxUSE_LONGLONG
 //
 //
 // Requires: wxUSE_LONGLONG
 //

+// Default is 1
+//

 // 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


@@ -294,14 +352,14 @@
 
 // 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
 
 // 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
 
 //
 // 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
 // Required by wxUSE_DIALUP_MANAGER.
 //
 // This setting is for Win32 only


@@ -309,7 +367,10 @@
 // Default is 1.
 //
 // Recommended setting: 1
 // 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
 
 // Set to 1 to use socket classes
 #define wxUSE_SOCKETS       1


@@ -330,8 +391,6 @@
 // wxUSE_LIBPNG.
 #define wxUSE_ZLIB          1
 
 // wxUSE_LIBPNG.
 #define wxUSE_ZLIB          1
 

-#define wxUSE_REGEX 1
-

 // If enabled, the code written by Apple will be used to write, in a portable
 // way, float on the disk. See extended.c for the license which is different
 // from wxWindows one.
 // If enabled, the code written by Apple will be used to write, in a portable
 // way, float on the disk. See extended.c for the license which is different
 // from wxWindows one.


@@ -350,6 +409,38 @@
 // wxMimeTypesManager class
 #define wxUSE_MIMETYPE 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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Individual GUI controls
 // ----------------------------------------------------------------------------


@@ -362,12 +453,21 @@
 // Recommended setting: 1 (don't change except for very special programs)
 #define wxUSE_CONTROLS     1
 
 // 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
 
 // 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


@@ -469,6 +569,9 @@
 #define wxUSE_GRID         1
 #define wxUSE_NEW_GRID     1
 
 #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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Miscellaneous GUI stuff
 // ----------------------------------------------------------------------------


@@ -527,6 +630,9 @@
 // wxValidator class and related methods
 #define wxUSE_VALIDATORS 1
 
 // wxValidator class and related methods
 #define wxUSE_VALIDATORS 1
 

+// wxDC cacheing implementation
+#define wxUSE_DC_CACHEING 1
+

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


@@ -549,6 +655,29 @@
 // Recommended setting: 1 (unless it really doesn't work)
 #define wxUSE_COMMON_DIALOGS 1
 
 // Recommended setting: 1 (unless it really doesn't work)
 #define wxUSE_COMMON_DIALOGS 1
 

+// wxBusyInfo displays window with message when app is busy. Works in same way
+// as wxBusyCursor
+#define wxUSE_BUSYINFO      1
+
+// Use single/multiple choice dialogs.
+//
+// Default is 1
+//
+// 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
+
+// TODO: setting to choose the generic or native one
+

 // Use file open/save dialogs.
 //
 // Default is 1
 // Use file open/save dialogs.
 //
 // Default is 1


@@ -556,6 +685,11 @@
 // Recommended setting: 1 (used in many places in the library itself)
 #define wxUSE_FILEDLG       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
 #define wxUSE_FINDREPLDLG       1
 
 // Use font picker dialog


@@ -572,38 +706,22 @@
 // Recommended setting: 1 (used in the library itself)
 #define wxUSE_MSGDLG        1
 
 // Recommended setting: 1 (used in the library itself)
 #define wxUSE_MSGDLG        1
 

-// Use single/multiple choice dialogs.
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in the library itself)
-#define wxUSE_CHOICEDLG     1
+// progress dialog class for lengthy operations
+#define wxUSE_PROGRESSDLG 1

 
 

-// Use colour picker dialog
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_COLOURDLG     1
+// support for startup tips (wxShowTip &c)
+#define wxUSE_STARTUP_TIPS 1

 
 // text entry dialog and wxGetTextFromUser function
 #define wxUSE_TEXTDLG 1
 
 
 // text entry dialog and wxGetTextFromUser function
 #define wxUSE_TEXTDLG 1
 

+// number entry dialog

 #define wxUSE_NUMBERDLG 1
 
 #define wxUSE_NUMBERDLG 1
 

-// progress dialog class for lengthy operations
-#define wxUSE_PROGRESSDLG 1
-
-// wxBusyInfo displays window with message when app is busy. Works in same way
-// as wxBusyCursor
-#define wxUSE_BUSYINFO      1
-
-// wxDirDlg class for getting a directory name from user
-#define wxUSE_DIRDLG 1
-
-// support for startup tips (wxShowTip &c)
-#define wxUSE_STARTUP_TIPS 1
+// splash screen class
+#define wxUSE_SPLASH 1

 
 

+// wizards

 #define wxUSE_WIZARDDLG 1
 
 // ----------------------------------------------------------------------------
 #define wxUSE_WIZARDDLG 1
 
 // ----------------------------------------------------------------------------


@@ -704,7 +822,10 @@
                                 // 0 for no help facility
 #define wxUSE_MS_HTML_HELP 0
                                 // 0 for no MS HTML Help
                                 // 0 for no help facility
 #define wxUSE_MS_HTML_HELP 0
                                 // 0 for no MS HTML Help

+
+// Use wxHTML-based help controller?

 #define wxUSE_WXHTML_HELP 1
 #define wxUSE_WXHTML_HELP 1

+

 #define wxUSE_RESOURCES   1
                                 // 0 for no wxGetResource/wxWriteResource
 #define wxUSE_CONSTRAINTS 1
 #define wxUSE_RESOURCES   1
                                 // 0 for no wxGetResource/wxWriteResource
 #define wxUSE_CONSTRAINTS 1


@@ -820,9 +941,16 @@
 // Set to 1 for PCX format support
 #define wxUSE_PCX           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 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
 
 // ----------------------------------------------------------------------------
 #define wxUSE_PALETTE       1
 
 // ----------------------------------------------------------------------------


@@ -958,12 +1086,6 @@
 #define wxUSE_DEBUG_NEW_ALWAYS          0
 #endif // wxUSE_MFC
 
 #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
 #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


@@ -1108,7 +1230,7 @@
 // you need to modify setup.h and rebuild everything
 // ----------------------------------------------------------------------------
 
 // you need to modify setup.h and rebuild everything
 // ----------------------------------------------------------------------------
 

-#if wxUSE_TIMEDATE && !wxUSE_LONGLONG
+#if wxUSE_DATETIME && !wxUSE_LONGLONG

     #error wxDateTime requires wxLongLong
 #endif
 
     #error wxDateTime requires wxLongLong
 #endif