Use correct GTK macro in wx_gtk_widget_get_sensitive().

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

diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h
index 27d017ecd3cee39874f7b9090403ca7b2719d3d3..66cb3e25d89d3f8fc0a94c409cab20c1615b3990 100644 (file)
--- a/include/wx/setup_inc.h
+++ b/include/wx/setup_inc.h
@@ -299,11 +299,20 @@
 // usually more limited) implementations are used which allows to avoid the
 // dependency on the C++ run-time library.
 //
-// Default is 1 if compiler supports it.
+// Default is 1 if compiler supports it. Currently this means not one of the
+// compilers mentioned in wxUSE_STD_DEFAULT comment and also not VC6 as it
+// needs non-default options for such build to avoid getting "fatal error
+// C1076: compiler limit : internal heap limit reached; use /Zm to specify a
+// higher limit" in its own standard headers, so you need to ensure you do
+// increase the heap size before enabling this option for this compiler.
 //
 // Recommended setting: 1 unless you use a system without good implementation
 // of STL.
-#define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT
+#if defined(_MSC_VER) && _MSC_VER < 1300
+    #define wxUSE_STD_CONTAINERS 0
+#else
+    #define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT
+#endif
 
 // Use standard C++ streams if 1 instead of wx streams in some places. If
 // disabled, wx streams are used everywhere and wxWidgets doesn't depend on the
@@ -345,6 +354,17 @@
 // wxWidgets.
 #define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL
 
+// VC++ 4.2 and above allows <iostream> and <iostream.h> but you can't mix
+// them. Set this option to 1 to use <iostream.h>, 0 to use <iostream>.
+//
+// Note that newer compilers (including VC++ 7.1 and later) don't support
+// wxUSE_IOSTREAMH == 1 and so <iostream> will be used anyhow.
+//
+// Default is 0.
+//
+// Recommended setting: 0, only set to 1 if you use a really old compiler
+#define wxUSE_IOSTREAMH     0
+
 
 // ----------------------------------------------------------------------------
 // non GUI features selection
@@ -1339,28 +1359,15 @@
 // to create files in SVG (Scalable Vector Graphics) format.
 #define wxUSE_SVG 1
 
-// ----------------------------------------------------------------------------
-// other compiler (mis)features
-// ----------------------------------------------------------------------------
-
-// Set this to 0 if your compiler can't cope with omission of prototype
-// parameters.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (should never need to set this to 0)
-#define REMOVE_UNUSED_ARG   1
-
-// VC++ 4.2 and above allows <iostream> and <iostream.h> but you can't mix
-// them. Set this option to 1 to use <iostream.h>, 0 to use <iostream>.
+// Should wxDC provide SetTransformMatrix() and related methods?
 //
-// Note that newer compilers (including VC++ 7.1 and later) don't support
-// wxUSE_IOSTREAMH == 1 and so <iostream> will be used anyhow.
+// Default is 1 but can be set to 0 if this functionality is not used. Notice
+// that currently only wxMSW supports this so setting this to 0 doesn't change
+// much for non-MSW platforms (although it will still save a few bytes
+// probably).
 //
-// Default is 0.
-//
-// Recommended setting: 0, only set to 1 if you use a really old compiler
-#define wxUSE_IOSTREAMH     0
+// Recommended setting: 1.
+#define wxUSE_DC_TRANSFORM_MATRIX 1
 
 // ----------------------------------------------------------------------------
 // image format support