implemented (more) correct <pre> handling

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

diff --git a/include/wx/stubs/setup.h b/include/wx/stubs/setup.h
index 7f86b00cf27f665827b48ccf2da89b1140130f0c..566b0d414d3105cbdfba75fddb64b82ff20bb14c 100644 (file)
--- a/include/wx/stubs/setup.h
+++ b/include/wx/stubs/setup.h
@@ -87,6 +87,11 @@
                                   // 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.
 

+#define wxUSE_DEBUG_NEW_ALWAYS 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.
+

 #define REMOVE_UNUSED_ARG 1
                                   // Set this to 0 if your compiler can't cope
                                   // with omission of prototype parameters.
 #define REMOVE_UNUSED_ARG 1
                                   // Set this to 0 if your compiler can't cope
                                   // with omission of prototype parameters.


@@ -94,8 +99,26 @@
 #define wxUSE_C_MAIN 0
                                   // Set to 1 to use main.c instead of main.cpp (UNIX only)
 
 #define wxUSE_C_MAIN 0
                                   // Set to 1 to use main.c instead of main.cpp (UNIX only)
 

-#define wxUSE_ODBC                   0
-                                    // Define 1 to use ODBC classes
+#define wxUSE_ODBC                0
+                                  // Define 1 to use ODBC classes
+
+#define wxODBC_FWD_ONLY_CURSORS   1
+                                  // For backward compatibility reasons, this parameter now only
+                                  // controls the default scrolling method used by cursors.  This
+                                  // default behavior can be overriden by setting the second param
+                                  // of wxDB::GetDbConnection() to indicate whether the connection
+                                  // (and any wxTable()s that use the connection) should support
+                                  // forward only scrolling of cursors, or both forward and backward
+                                  // Support for backward scrolling cursors is dependent on the
+                                  // data source as well as the ODBC driver being used.
+
+#define wxODBC_BACKWARD_COMPATABILITY 0
+                                // Default is 0.  Set to 1 to use the deprecated classes, enum
+                                // types, function, member variables.  With a setting of 1, full
+                                // backward compatability with the 2.0.x release is possible.
+                                // It is STRONGLY recommended that this be set to 0, as 
+                                // future development will be done only on the non-deprecated
+                                // functions/classes/member variables/etc.

 
 #define wxUSE_IOSTREAMH     1
                                   // VC++ 4.2 and above allows <iostream> and <iostream.h>
 
 #define wxUSE_IOSTREAMH     1
                                   // VC++ 4.2 and above allows <iostream> and <iostream.h>


@@ -106,6 +129,33 @@
                                   // if enabled, compiles built-in OS independent wxConfig
                                   // class and it's file (any platform) and registry (Win)
                                   // based implementations
                                   // if enabled, compiles built-in OS independent wxConfig
                                   // class and it's file (any platform) and registry (Win)
                                   // based implementations

+#define wxUSE_TIMEDATE      1
+                                  // Use time and date
+#define wxUSE_THREADS       0
+                                  // Use threads
+
+#define wxUSE_ZLIB          1
+                                  // Use zlib for compression in streams and PNG code
+#define wxUSE_LIBPNG        1
+                                  // Use PNG bitmap code
+#define wxUSE_LIBPNG        0
+                                  // Use JPEG bitmap code
+#define wxUSE_LIBGIF        0
+                                  // Use GIF bitmap code
+#define wxUSE_STD_IOSTREAM  1
+                                  // Use standard C++ streams if 1. If 0, use wxWin
+                                  // streams implementation.
+
+#define wxUSE_SERIAL        0
+                                  // Use serialization
+
+#define wxUSE_TOOLTIPS      0
+                                  // Use tooltips
+
+#define wxUSE_DYNLIB_CLASS  0
+                                  // Use wxLibrary
+#define wxUSE_SOCKETS       1
+                                  // Set to 1 to use socket classes

 /*
  * Finer detail
  *
 /*
  * Finer detail
  *