Compilation fix for VC++ 5 and 6

[wxWidgets.git] / include / wx / setup_inc.h

diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h
index a91c756a9e7a24ef2f1f65f4650e56319ad2435c..eea5cf1dffd03ab725c13a8eb254604db7359a49 100644 (file)
--- a/include/wx/setup_inc.h
+++ b/include/wx/setup_inc.h
@@ -1,3 +1,13 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/setup_inc.h
+// Purpose:     setup.h settings
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:
+// RCS-ID:      $Id$
+// Copyright:   (c) Vadim Zeitlin
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////

 
 // ----------------------------------------------------------------------------
 // global settings
 
 // ----------------------------------------------------------------------------
 // global settings


@@ -123,8 +133,9 @@
 //
 // Default is 1 if supported by the compiler.
 //
 //
 // Default is 1 if supported by the compiler.
 //

-// Recommended setting: 0, it is still experimental and API may change
-#define wxUSE_DEBUGREPORT 0
+// Recommended setting: 1, it is compiled into a separate library so there
+//                         is no overhead if you don't use it
+#define wxUSE_DEBUGREPORT 1

 
 // ----------------------------------------------------------------------------
 // Unicode support
 
 // ----------------------------------------------------------------------------
 // Unicode support


@@ -250,9 +261,12 @@
 // If enabled (1), compiles wxWidgets streams classes
 #define wxUSE_STREAMS       1
 
 // If enabled (1), compiles wxWidgets streams classes
 #define wxUSE_STREAMS       1
 

-// Use standard C++ streams if 1. If 0, use wxWin streams implementation.
+// Use standard C++ streams if 1. If 0, use wxWin streams implementation only.

 #define wxUSE_STD_IOSTREAM  0
 
 #define wxUSE_STD_IOSTREAM  0
 

+// Enable conversion to standard C++ string if 1.
+#define wxUSE_STD_STRING  0
+

 // ----------------------------------------------------------------------------
 // non GUI features selection
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // non GUI features selection
 // ----------------------------------------------------------------------------