no message

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

diff --git a/include/wx/msw/setup.h b/include/wx/msw/setup.h
index 8612237321a0fd415961f8678967150cb98e3a23..b59284a7382d87f0c4c7c6479555e05205f963f3 100644 (file)
--- a/include/wx/msw/setup.h
+++ b/include/wx/msw/setup.h
@@ -22,11 +22,12 @@
 #define _WX_GOODCOMPILER__
                                 // gcc can have problems, but Windows compilers
                                 // are generally OK.
-#define WXWIN_COMPATIBILITY  1
-                                // Compatibility with 1.66 API.
+#define WXWIN_COMPATIBILITY  0
+                                // Compatibility with 1.68 API.
                                 // Level 0: no backward compatibility, all new features
-                                // Level 1: wxDC, OnSize (etc.) compatibility, but
-                                //          some new features such as event tables
+                                // Level 1: Some compatibility. In fact
+                                // the compatibility code is now very minimal so there
+                                // is little advantage to setting it to 1.
 
 #define wxUSE_AUTOTRANS   1
                                 // Define wxTString
@@ -120,7 +121,7 @@
                                   // since you may well need to output
                                   // an error log in a production
                                   // version (or non-debugging beta)
-#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
+#define wxUSE_GLOBAL_MEMORY_OPERATORS 1
                                   // In debug mode, cause new and delete to be redefined globally.
                                   // If this causes problems (e.g. link errors), set this to 0.
 
@@ -135,9 +136,6 @@
                                   // Set this to 0 if your compiler can't cope
                                   // with omission of prototype parameters.
 
-#define wxUSE_C_MAIN 0
-                                  // Set to 1 to use main.c instead of main.cpp (UNIX only)
-
 #define wxUSE_ODBC                   1
                                     // Define 1 to use ODBC classes
 
@@ -158,6 +156,14 @@
                                   // support for multithreaded applications: if
                                   // 1, compile in thread classes (thread.h)
                                   // and make the library thread safe
+#define wxUSE_ZLIB          1
+                                  // Use zlib for compression in streams and PNG code
+#define wxUSE_LIBPNG        1
+                                  // Use PNG bitmap code
+#define wxUSE_STD_IOSTREAM  1
+                                  // Use standard C++ streams if 1. If 0, use wxWin
+                                  // streams implementation.
+
 /*
  * Finer detail
  *
@@ -241,6 +247,18 @@
 #define wxUSE_NATIVE_STATUSBAR 0
 #endif
 
+// Salford C++ doesn't like some of the memory operator definitions
+#ifdef __SALFORDC__
+#undef  wxUSE_MEMORY_TRACING
+#define wxUSE_MEMORY_TRACING      0
+
+#undef wxUSE_GLOBAL_MEMORY_OPERATORS
+#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
+
+#undef wxUSE_DEBUG_NEW_ALWAYS
+#define wxUSE_DEBUG_NEW_ALWAYS 0
+#endif
+
 // Minimal setup e.g. for compiling small utilities
 #define MINIMAL_WXWINDOWS_SETUP 0