mingw compilation fix

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

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 0021a80906f925e588bacd2a424d6bab3d0d607c..640a8fc72e83b006c16d233573fac6e36ebdad9e 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -36,22 +36,6 @@
 // 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 0.
-//
-// Recommended setting: 0 (please update your code instead!)
-#define WXWIN_COMPATIBILITY_2_2 0
-

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


@@ -104,7 +88,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 1
+#define wxUSE_DEBUG_CONTEXT 0

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


@@ -115,7 +99,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 1
+#define wxUSE_MEMORY_TRACING 0

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


@@ -124,7 +108,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 1
+#define wxUSE_GLOBAL_MEMORY_OPERATORS 0

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


@@ -134,7 +118,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 1
+#define wxUSE_DEBUG_NEW_ALWAYS 0

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


@@ -193,20 +177,12 @@
 // 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
+// Recommended setting: 1 (always)

 #define wxUSE_LOGGUI 1
 
 #define wxUSE_LOGGUI 1
 

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

 #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


@@ -264,7 +240,7 @@
 // i18n support: _() macro, wxLocale class. Requires wxTextFile.
 #define wxUSE_INTL          1
 
 // i18n support: _() macro, wxLocale class. Requires wxTextFile.
 #define wxUSE_INTL          1
 

-// Set wxUSE_DATETIME to 1 to compile the wxDateTime and related classes which
+// Set wxUSE_TIMEDATE 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).


@@ -276,20 +252,9 @@
 //
 // 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


@@ -365,6 +330,8 @@
 // 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.


@@ -383,22 +350,6 @@
 // wxMimeTypesManager class
 #define wxUSE_MIMETYPE 1
 
 // wxMimeTypesManager class
 #define wxUSE_MIMETYPE 1
 

-// wxSystemOptions class
-#define wxUSE_SYSTEM_OPTIONS 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       0
-
-// wxWave class
-#define wxUSE_WAVE      1
-

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


@@ -576,9 +527,6 @@
 // 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
 // ----------------------------------------------------------------------------


@@ -601,29 +549,6 @@
 // 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


@@ -631,11 +556,6 @@
 // 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


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

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

 
 

-// support for startup tips (wxShowTip &c)
-#define wxUSE_STARTUP_TIPS 1
+// Use colour picker dialog
+//
+// Default is 1
+//
+// Recommended setting: 1
+#define wxUSE_COLOURDLG     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
 

-// splash screen class
-#define wxUSE_SPLASH 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

 
 

-// wizards

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


@@ -768,10 +704,7 @@
                                 // 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


@@ -890,7 +823,6 @@
 // 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 to compile in wxPalette class

 #define wxUSE_PALETTE       1
 
 // ----------------------------------------------------------------------------
 #define wxUSE_PALETTE       1
 
 // ----------------------------------------------------------------------------


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

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

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